diff --git a/phpBB/composer.json b/phpBB/composer.json index a11bcad391..46c0e9b361 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -25,36 +25,36 @@ "phpbb/phpbb-core": "self.version" }, "require": { - "php": ">=5.3.9", "lusitanian/oauth": "0.2.*", "patchwork/utf8": "1.1.*", + "php": ">=5.3.9", "s9e/text-formatter": "dev-release/php5.3", - "symfony/config": "2.7.*@dev", - "symfony/console": "2.7.*@dev", - "symfony/dependency-injection": "2.7.*@dev", - "symfony/event-dispatcher": "2.7.*@dev", - "symfony/filesystem": "2.7.*@dev", - "symfony/http-kernel": "2.7.*@dev", - "symfony/routing": "2.7.*@dev", - "symfony/security-core": "2.7.*@dev", - "symfony/security-csrf": "2.7.*@dev", - "symfony/twig-bridge": "2.7.*@dev", - "symfony/yaml": "2.7.*@dev", + "symfony/config": "2.8.*@dev", + "symfony/console": "2.8.*@dev", + "symfony/dependency-injection": "2.8.*@dev", + "symfony/event-dispatcher": "2.8.*@dev", + "symfony/filesystem": "2.8.*@dev", + "symfony/http-kernel": "2.8.*@dev", + "symfony/routing": "2.8.*@dev", + "symfony/security-core": "2.8.*@dev", + "symfony/security-csrf": "2.8.*@dev", + "symfony/twig-bridge": "2.8.*@dev", + "symfony/yaml": "2.8.*@dev", "twig/twig": "1.*" }, "require-dev": { "fabpot/goutte": "1.0.*", + "phing/phing": "2.4.*", "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", - "phing/phing": "2.4.*", "sami/sami": "1.*", "squizlabs/php_codesniffer": "1.*", - "symfony/browser-kit": "2.7.*@dev", - "symfony/css-selector": "2.7.*@dev", - "symfony/debug": "2.7.*@dev", - "symfony/dom-crawler": "2.7.*@dev", - "symfony/finder": "2.7.*@dev", - "symfony/http-foundation": "2.7.*@dev", - "symfony/process": "2.7.*@dev" + "symfony/browser-kit": "2.8.*@dev", + "symfony/css-selector": "2.8.*@dev", + "symfony/debug": "2.8.*@dev", + "symfony/dom-crawler": "2.8.*@dev", + "symfony/finder": "2.8.*@dev", + "symfony/http-foundation": "2.8.*@dev", + "symfony/process": "2.8.*@dev" } } diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 8a634a1ffd..8365acf5f3 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "25df57c9c90534dcc86d31175b248719", + "hash": "91cc998d47b703a7bc4f726217d7a3a9", "packages": [ { "name": "lusitanian/oauth", @@ -145,7 +145,7 @@ "Psr\\Log\\": "" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -223,27 +223,30 @@ }, { "name": "symfony/config", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "1624dd47e1f4dc89ae4e7ca4a0476325042f8e82" + "reference": "c9a779b0f02f0fdf41cc4decc4fb451005365086" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/1624dd47e1f4dc89ae4e7ca4a0476325042f8e82", - "reference": "1624dd47e1f4dc89ae4e7ca4a0476325042f8e82", + "url": "https://api.github.com/repos/symfony/Config/zipball/c9a779b0f02f0fdf41cc4decc4fb451005365086", + "reference": "c9a779b0f02f0fdf41cc4decc4fb451005365086", "shasum": "" }, "require": { "php": ">=5.3.9", "symfony/filesystem": "~2.3|~3.0.0" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -267,21 +270,21 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-11 08:55:16" }, { "name": "symfony/console", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "9f041fb5735b0d25d117e77ab8597a8376c74fbd" + "reference": "32f19477d488649a77227d57a7f5775b17cb336b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/9f041fb5735b0d25d117e77ab8597a8376c74fbd", - "reference": "9f041fb5735b0d25d117e77ab8597a8376c74fbd", + "url": "https://api.github.com/repos/symfony/Console/zipball/32f19477d488649a77227d57a7f5775b17cb336b", + "reference": "32f19477d488649a77227d57a7f5775b17cb336b", "shasum": "" }, "require": { @@ -290,6 +293,7 @@ "require-dev": { "psr/log": "~1.0", "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/process": "~2.1|~3.0.0" }, "suggest": { @@ -300,7 +304,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -324,21 +328,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2015-01-25 05:59:26" + "time": "2015-04-11 08:55:16" }, { "name": "symfony/debug", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d" + "reference": "2b867c246f3fb653611c9acdc3fdac9cc1957e3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d", - "reference": "39a94beb5ea7f5f39854e7c8ab8dfda95e831f5d", + "url": "https://api.github.com/repos/symfony/Debug/zipball/2b867c246f3fb653611c9acdc3fdac9cc1957e3f", + "reference": "2b867c246f3fb653611c9acdc3fdac9cc1957e3f", "shasum": "" }, "require": { @@ -349,9 +353,10 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.2", + "symfony/class-loader": "~2.2|~3.0.0", "symfony/http-foundation": "~2.1|~3.0.0", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0" + "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" }, "suggest": { "symfony/http-foundation": "", @@ -360,7 +365,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -384,21 +389,21 @@ ], "description": "Symfony Debug Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/dependency-injection", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "acf2e8e27c53b8af7963ca00809ccde1d1e977f4" + "reference": "ae47d9690326b0e970598a8f5b6710ece8f5fee4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/acf2e8e27c53b8af7963ca00809ccde1d1e977f4", - "reference": "acf2e8e27c53b8af7963ca00809ccde1d1e977f4", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/ae47d9690326b0e970598a8f5b6710ece8f5fee4", + "reference": "ae47d9690326b0e970598a8f5b6710ece8f5fee4", "shasum": "" }, "require": { @@ -410,6 +415,7 @@ "require-dev": { "symfony/config": "~2.2|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/yaml": "~2.1|~3.0.0" }, "suggest": { @@ -420,7 +426,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -444,21 +450,21 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/event-dispatcher", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7" + "reference": "15bbd5beed94cca89ffcce18fb76eeac38937240" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7a26717d431dfb092198d7c55f06788b2de5aaf7", - "reference": "7a26717d431dfb092198d7c55f06788b2de5aaf7", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/15bbd5beed94cca89ffcce18fb76eeac38937240", + "reference": "15bbd5beed94cca89ffcce18fb76eeac38937240", "shasum": "" }, "require": { @@ -469,6 +475,7 @@ "symfony/config": "~2.0,>=2.0.5|~3.0.0", "symfony/dependency-injection": "~2.6|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { @@ -478,7 +485,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -502,30 +509,33 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2015-01-16 15:11:56" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/filesystem", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "e681ca515e1e668a551b089177867e62e03d7d2d" + "reference": "59a58a369bafa7c2ded4e0b08d726482be7a7e6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e681ca515e1e668a551b089177867e62e03d7d2d", - "reference": "e681ca515e1e668a551b089177867e62e03d7d2d", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/59a58a369bafa7c2ded4e0b08d726482be7a7e6b", + "reference": "59a58a369bafa7c2ded4e0b08d726482be7a7e6b", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -549,33 +559,34 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2015-01-09 06:51:41" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/http-foundation", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb" + "reference": "75b824419347be1926b3bb9ad14bb3c09d0b5141" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb", - "reference": "ee7cee860e05ba4e12c9a8a1775d4e5ae3f790cb", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/75b824419347be1926b3bb9ad14bb3c09d0b5141", + "reference": "75b824419347be1926b3bb9ad14bb3c09d0b5141", "shasum": "" }, "require": { "php": ">=5.3.9" }, "require-dev": { - "symfony/expression-language": "~2.4|~3.0.0" + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -602,40 +613,44 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/http-kernel", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "37c51b8a642385cac387f9f913f47c0137effac7" + "reference": "53e7ff047f0b19edea9bae99bd1de6e1c35139c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/37c51b8a642385cac387f9f913f47c0137effac7", - "reference": "37c51b8a642385cac387f9f913f47c0137effac7", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/53e7ff047f0b19edea9bae99bd1de6e1c35139c5", + "reference": "53e7ff047f0b19edea9bae99bd1de6e1c35139c5", "shasum": "" }, "require": { "php": ">=5.3.9", "psr/log": "~1.0", - "symfony/debug": "~2.6,>=2.6.2|~3.0.0", + "symfony/debug": "~2.6,>=2.6.2", "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2|~3.0.0", "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0" }, + "conflict": { + "symfony/config": "<2.7" + }, "require-dev": { "symfony/browser-kit": "~2.3|~3.0.0", "symfony/class-loader": "~2.1|~3.0.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/config": "~2.7", "symfony/console": "~2.3|~3.0.0", "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", "symfony/dependency-injection": "~2.2|~3.0.0", "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "symfony/finder": "~2.0,>=2.0.5|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/process": "~2.0,>=2.0.5|~3.0.0", "symfony/routing": "~2.2|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0", @@ -655,7 +670,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -679,33 +694,37 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-11 08:55:16" }, { "name": "symfony/routing", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "0c68965f72d650be4f51f199f5d69469df75aa30" + "reference": "cc81fccd24bce7fde640d2e4b070fe76b60f0f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/0c68965f72d650be4f51f199f5d69469df75aa30", - "reference": "0c68965f72d650be4f51f199f5d69469df75aa30", + "url": "https://api.github.com/repos/symfony/Routing/zipball/cc81fccd24bce7fde640d2e4b070fe76b60f0f6a", + "reference": "cc81fccd24bce7fde640d2e4b070fe76b60f0f6a", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "conflict": { + "symfony/config": "<2.7" + }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.2|~3.0.0", + "symfony/config": "~2.7|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "symfony/http-foundation": "~2.3|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { @@ -717,7 +736,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -747,21 +766,21 @@ "uri", "url" ], - "time": "2015-01-23 17:16:45" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/security-core", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Security/Core", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "abe4db6553a89be8c827b7a86dac144e25726cda" + "reference": "992d40a1cd8b2647dce652b63a27fd18ff74e243" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/abe4db6553a89be8c827b7a86dac144e25726cda", - "reference": "abe4db6553a89be8c827b7a86dac144e25726cda", + "url": "https://api.github.com/repos/symfony/security-core/zipball/992d40a1cd8b2647dce652b63a27fd18ff74e243", + "reference": "992d40a1cd8b2647dce652b63a27fd18ff74e243", "shasum": "" }, "require": { @@ -773,6 +792,7 @@ "symfony/event-dispatcher": "~2.1|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", "symfony/http-foundation": "~2.4|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/translation": "~2.0,>=2.0.5|~3.0.0", "symfony/validator": "~2.5,>=2.5.5|~3.0.0" }, @@ -786,7 +806,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -810,21 +830,21 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/security-csrf", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Security/Csrf", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", - "reference": "3f875078e322bf1fb6a546a607fe9adaab212f6c" + "reference": "80cf46a34308e7374700889a3af115ef5d772d23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/3f875078e322bf1fb6a546a607fe9adaab212f6c", - "reference": "3f875078e322bf1fb6a546a607fe9adaab212f6c", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/80cf46a34308e7374700889a3af115ef5d772d23", + "reference": "80cf46a34308e7374700889a3af115ef5d772d23", "shasum": "" }, "require": { @@ -832,7 +852,8 @@ "symfony/security-core": "~2.4|~3.0.0" }, "require-dev": { - "symfony/http-foundation": "~2.1|~3.0.0" + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" }, "suggest": { "symfony/http-foundation": "For using the class SessionTokenStorage." @@ -840,7 +861,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -864,44 +885,46 @@ ], "description": "Symfony Security Component - CSRF Library", "homepage": "http://symfony.com", - "time": "2015-01-09 06:51:41" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/twig-bridge", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Bridge/Twig", "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge.git", - "reference": "bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7" + "reference": "f05d28fb139db14d9793aee9b01244dc654810c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7", - "reference": "bd5f5e3cde85eb2dfa074134bc9ac66b30ca6fc7", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/f05d28fb139db14d9793aee9b01244dc654810c2", + "reference": "f05d28fb139db14d9793aee9b01244dc654810c2", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/security-csrf": "~2.6|~3.0.0", "twig/twig": "~1.18" }, "require-dev": { - "symfony/console": "~2.4|~3.0.0", + "symfony/asset": "~2.7|~3.0.0", + "symfony/console": "~2.7|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", "symfony/finder": "~2.3|~3.0.0", - "symfony/form": "~2.6|~3.0.0", + "symfony/form": "~2.7|~3.0.0", "symfony/http-kernel": "~2.3|~3.0.0", "symfony/intl": "~2.3|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/routing": "~2.2|~3.0.0", "symfony/security": "~2.6|~3.0.0", "symfony/stopwatch": "~2.2|~3.0.0", "symfony/templating": "~2.1|~3.0.0", - "symfony/translation": "~2.2|~3.0.0", + "symfony/translation": "~2.7|~3.0.0", "symfony/var-dumper": "~2.6|~3.0.0", "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { + "symfony/asset": "For using the AssetExtension", "symfony/expression-language": "For using the ExpressionExtension", "symfony/finder": "", "symfony/form": "For using the FormExtension", @@ -917,7 +940,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -941,30 +964,33 @@ ], "description": "Symfony Twig Bridge", "homepage": "http://symfony.com", - "time": "2015-02-02 16:43:28" + "time": "2015-04-11 08:55:16" }, { "name": "symfony/yaml", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60" + "reference": "fdded56dde4ca9efce6322887bf5eaa7bb0aae3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60", - "reference": "02ba3dc638c5d3f0ab3b47ddb74f98c11dcc0c60", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/fdded56dde4ca9efce6322887bf5eaa7bb0aae3e", + "reference": "fdded56dde4ca9efce6322887bf5eaa7bb0aae3e", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -988,7 +1014,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" }, { "name": "twig/twig", @@ -1018,14 +1044,16 @@ "Twig_": "lib/" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Armin Ronacher", @@ -2330,17 +2358,17 @@ }, { "name": "symfony/browser-kit", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/BrowserKit", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "432c0593d5367b1bb8aa893cb2272172934ad371" + "reference": "e7ac73ecdd97f5b114152eb670607e96db7a2e17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/432c0593d5367b1bb8aa893cb2272172934ad371", - "reference": "432c0593d5367b1bb8aa893cb2272172934ad371", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/e7ac73ecdd97f5b114152eb670607e96db7a2e17", + "reference": "e7ac73ecdd97f5b114152eb670607e96db7a2e17", "shasum": "" }, "require": { @@ -2349,6 +2377,7 @@ }, "require-dev": { "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/process": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { @@ -2357,7 +2386,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2381,30 +2410,33 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2015-01-09 06:51:41" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/css-selector", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/CssSelector", "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "1f8617c67bef17192d28c0f2dda3a04b632629bb" + "reference": "c315f95be51278f548d36664d51a8425e19e2cda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/1f8617c67bef17192d28c0f2dda3a04b632629bb", - "reference": "1f8617c67bef17192d28c0f2dda3a04b632629bb", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/c315f95be51278f548d36664d51a8425e19e2cda", + "reference": "c315f95be51278f548d36664d51a8425e19e2cda", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2432,28 +2464,29 @@ ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2015-01-09 06:51:41" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/dom-crawler", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/DomCrawler", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "57ef66b6d806d9d1b9234e27da304ee5d1e54641" + "reference": "c7bd5b7d8444175f04e4278fa220fd3470c851fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/57ef66b6d806d9d1b9234e27da304ee5d1e54641", - "reference": "57ef66b6d806d9d1b9234e27da304ee5d1e54641", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c7bd5b7d8444175f04e4278fa220fd3470c851fe", + "reference": "c7bd5b7d8444175f04e4278fa220fd3470c851fe", "shasum": "" }, "require": { "php": ">=5.3.9" }, "require-dev": { - "symfony/css-selector": "~2.3|~3.0.0" + "symfony/css-selector": "~2.3|~3.0.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" }, "suggest": { "symfony/css-selector": "" @@ -2461,7 +2494,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2485,30 +2518,33 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2015-01-09 13:24:18" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/finder", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "0c737de96a94d14a51738d285ad426a102baac0e" + "reference": "ad159e0da47e9ffe719bafdc004159ad6e395567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/0c737de96a94d14a51738d285ad426a102baac0e", - "reference": "0c737de96a94d14a51738d285ad426a102baac0e", + "url": "https://api.github.com/repos/symfony/Finder/zipball/ad159e0da47e9ffe719bafdc004159ad6e395567", + "reference": "ad159e0da47e9ffe719bafdc004159ad6e395567", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2532,30 +2568,33 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2015-01-09 06:51:41" + "time": "2015-04-10 08:56:33" }, { "name": "symfony/process", - "version": "2.7.x-dev", + "version": "2.8.x-dev", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "f3ab493718070b936e21b202422466db35c1c298" + "reference": "5c73c03223e922c3c5f2c4128984e82a44089bbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/f3ab493718070b936e21b202422466db35c1c298", - "reference": "f3ab493718070b936e21b202422466db35c1c298", + "url": "https://api.github.com/repos/symfony/Process/zipball/5c73c03223e922c3c5f2c4128984e82a44089bbc", + "reference": "5c73c03223e922c3c5f2c4128984e82a44089bbc", "shasum": "" }, "require": { "php": ">=5.3.9" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2579,7 +2618,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2015-01-25 04:39:35" + "time": "2015-04-10 08:56:33" } ], "aliases": [], @@ -2590,6 +2629,7 @@ "symfony/console": 20, "symfony/dependency-injection": 20, "symfony/event-dispatcher": 20, + "symfony/filesystem": 20, "symfony/http-kernel": 20, "symfony/routing": 20, "symfony/security-core": 20, @@ -2600,12 +2640,12 @@ "symfony/css-selector": 20, "symfony/debug": 20, "symfony/dom-crawler": 20, - "symfony/filesystem": 20, "symfony/finder": 20, "symfony/http-foundation": 20, "symfony/process": 20 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": ">=5.3.9" }, diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 2a410db9bd..99576f9020 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -150,7 +150,7 @@ class container_builder $config_cache = new ConfigCache($container_filename, defined('DEBUG')); if ($this->dump_container && $config_cache->isFresh()) { - require($container_filename); + require($config_cache->getPath()); $this->container = new \phpbb_cache_container(); } else diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index 5313106b0a..7444f06253 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -262,7 +262,7 @@ class router implements RouterInterface $cache->write($dumper->dump($options), $this->get_routes()->getResources()); } - require_once($cache); + require_once($cache->getPath()); $this->matcher = new \phpbb_url_matcher($this->context); } @@ -310,7 +310,7 @@ class router implements RouterInterface $cache->write($dumper->dump($options), $this->get_routes()->getResources()); } - require_once($cache); + require_once($cache->getPath()); $this->generator = new \phpbb_url_generator($this->context); }