diff --git a/common.php b/common.php index 6ff0d9d9b..8b8e7ca5b 100644 --- a/common.php +++ b/common.php @@ -45,6 +45,9 @@ $di->register(new \TorrentPier\ServiceProviders\SphinxServiceProvider, [ 'config.sphinx' => $di->config->sphinx->toArray() ]); +$di->register(new \TorrentPier\ServiceProviders\RequestServiceProvider()); +$di->register(new \TorrentPier\ServiceProviders\ResponseServiceProvider()); + $bb_cfg = $di->config->toArray(); $page_cfg = $di->config->page->toArray(); $tr_cfg = $di->config->tracker->toArray(); diff --git a/composer.json b/composer.json index 7d42defc8..a8f426b7e 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "zendframework/zend-loader": "^2.5", "zendframework/zend-mail": "^2.5", "zendframework/zend-session": "^2.5", - "zendframework/zend-version": "^2.5" + "symfony/http-foundation": "^3.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 64073c8c7..21e925000 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "e46f8da865b2faa0352586ebde1ddff4", - "content-hash": "348b73c472823deef7d81e9895d5d93b", + "hash": "89808e4ea1b75346cb4ffef6d5914f61", + "content-hash": "63ad8bc4e6a64502c06506b1a6c06eaf", "packages": [ { "name": "container-interop/container-interop", @@ -241,6 +241,58 @@ ], "time": "2014-01-13 00:34:03" }, + { + "name": "symfony/http-foundation", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "9344a87ceedfc50354a39653e54257ee9aa6a77d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9344a87ceedfc50354a39653e54257ee9aa6a77d", + "reference": "9344a87ceedfc50354a39653e54257ee9aa6a77d", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/expression-language": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "https://symfony.com", + "time": "2016-02-02 13:44:19" + }, { "name": "twbs/bootstrap", "version": "v4.0.0-alpha.2", @@ -740,16 +792,16 @@ }, { "name": "zendframework/zend-filter", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-filter.git", - "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8" + "reference": "202014ee64e2aae23140a1719f6d362a602713ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/8682c12e9870c431cf29cbb7010627f3fa88dec8", - "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/202014ee64e2aae23140a1719f6d362a602713ed", + "reference": "202014ee64e2aae23140a1719f6d362a602713ed", "shasum": "" }, "require": { @@ -792,7 +844,7 @@ "filter", "zf2" ], - "time": "2016-02-04 19:52:41" + "time": "2016-02-08 18:02:37" }, { "name": "zendframework/zend-hydrator", @@ -1338,56 +1390,6 @@ "zf2" ], "time": "2015-09-03 19:06:11" - }, - { - "name": "zendframework/zend-version", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-version.git", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-json": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5" - }, - "suggest": { - "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", - "zendframework/zend-json": "To check latest version hosted in GitHub" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Version\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-version", - "keywords": [ - "version", - "zf2" - ], - "time": "2015-06-04 15:41:05" } ], "packages-dev": [], diff --git a/src/ServiceProviders/RequestServiceProvider.php b/src/ServiceProviders/RequestServiceProvider.php new file mode 100644 index 000000000..2c9e6e816 --- /dev/null +++ b/src/ServiceProviders/RequestServiceProvider.php @@ -0,0 +1,17 @@ +prepare($container['request']); + return $response; + }; + } +} \ No newline at end of file