From 3230fc7e700f19649a17fbb3258d66c84f066565 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Wed, 17 May 2017 11:20:42 +0200 Subject: [PATCH 1/3] Fix kernel.project_dir extensibility --- src/Symfony/Component/HttpKernel/Kernel.php | 3 +- .../Component/HttpKernel/Tests/KernelTest.php | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 8d4953886e..b5df6c6cdb 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -82,7 +82,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface $this->environment = $environment; $this->debug = (bool) $debug; $this->rootDir = $this->getRootDir(); - $this->projectDir = $this->getProjectDir(); $this->name = $this->getName(); if ($this->debug) { @@ -604,7 +603,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface return array_merge( array( 'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir, - 'kernel.project_dir' => realpath($this->projectDir) ?: $this->projectDir, + 'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(), 'kernel.environment' => $this->environment, 'kernel.debug' => $this->debug, 'kernel.name' => $this->name, diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php index 4cc31d4990..d2a27d03aa 100644 --- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpKernel\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\BundleInterface; use Symfony\Component\HttpKernel\Config\EnvParametersResource; @@ -761,6 +762,15 @@ EOF; unset($_SERVER['SYMFONY__FOO__BAR']); } + public function testProjectDirExtension() + { + $kernel = new CustomProjectDirKernel('test', true); + $kernel->boot(); + + $this->assertSame('foo', $kernel->getProjectDir()); + $this->assertSame('foo', $kernel->getContainer()->getParameter('kernel.project_dir')); + } + /** * Returns a mock for the BundleInterface. * @@ -857,3 +867,34 @@ class TestKernel implements HttpKernelInterface { } } + +class CustomProjectDirKernel extends Kernel +{ + private $baseDir; + + public function __construct() + { + parent::__construct('test', false); + + $this->baseDir = 'foo'; + } + + public function registerBundles() + { + return array(); + } + + public function registerContainerConfiguration(LoaderInterface $loader) + { + } + + public function getProjectDir() + { + return $this->baseDir; + } + + public function getRootDir() + { + return __DIR__.'/Fixtures'; + } +} From c3e1646af8217f81041b1cdea8fb0a8879136d94 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 24 May 2017 11:02:43 +0200 Subject: [PATCH 2/3] [3.4] Allow 4.* deps --- src/Symfony/Bridge/Doctrine/composer.json | 22 +++---- src/Symfony/Bridge/Monolog/composer.json | 8 +-- src/Symfony/Bridge/ProxyManager/composer.json | 4 +- src/Symfony/Bridge/Twig/composer.json | 28 ++++----- src/Symfony/Bundle/DebugBundle/composer.json | 12 ++-- .../Bundle/FrameworkBundle/composer.json | 58 +++++++++---------- .../Bundle/SecurityBundle/composer.json | 38 ++++++------ src/Symfony/Bundle/TwigBundle/composer.json | 22 +++---- .../Bundle/WebProfilerBundle/composer.json | 16 ++--- .../Bundle/WebServerBundle/composer.json | 6 +- src/Symfony/Component/Asset/composer.json | 4 +- .../Component/BrowserKit/composer.json | 6 +- .../Component/ClassLoader/composer.json | 2 +- src/Symfony/Component/Config/composer.json | 6 +- src/Symfony/Component/Console/composer.json | 12 ++-- src/Symfony/Component/Debug/composer.json | 2 +- .../DependencyInjection/composer.json | 6 +- .../Component/DomCrawler/composer.json | 2 +- src/Symfony/Component/Dotenv/composer.json | 2 +- .../Component/EventDispatcher/composer.json | 8 +-- .../ExpressionLanguage/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 24 ++++---- .../Component/HttpFoundation/composer.json | 2 +- .../Component/HttpKernel/composer.json | 34 +++++------ src/Symfony/Component/Intl/composer.json | 2 +- src/Symfony/Component/Ldap/composer.json | 2 +- .../Component/PropertyAccess/composer.json | 4 +- .../Component/PropertyInfo/composer.json | 8 +-- src/Symfony/Component/Routing/composer.json | 10 ++-- .../Component/Security/Core/composer.json | 10 ++-- .../Component/Security/Csrf/composer.json | 4 +- .../Component/Security/Guard/composer.json | 4 +- .../Component/Security/Http/composer.json | 14 ++--- src/Symfony/Component/Security/composer.json | 18 +++--- .../Component/Serializer/composer.json | 14 ++--- .../Component/Translation/composer.json | 6 +- src/Symfony/Component/Validator/composer.json | 16 ++--- src/Symfony/Component/WebLink/composer.json | 6 +- src/Symfony/Component/Workflow/composer.json | 10 ++-- src/Symfony/Component/Yaml/composer.json | 2 +- 40 files changed, 228 insertions(+), 228 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 28fb8491d4..6558860588 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -21,17 +21,17 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/form": "^3.2.5|~4.0.0", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0", - "symfony/property-access": "~2.8|~3.0|~4.0.0", - "symfony/property-info": "~2.8|3.0|~4.0.0", - "symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0.0", - "symfony/security": "~2.8|~3.0|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/validator": "^3.2.5|~4.0.0", - "symfony/translation": "~2.8|~3.0|~4.0.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/form": "^3.2.5|~4.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0", + "symfony/property-access": "~2.8|~3.0|~4.0", + "symfony/property-info": "~2.8|3.0|~4.0", + "symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0", + "symfony/security": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/validator": "^3.2.5|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", "doctrine/orm": "^2.4.5" diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 5622ce1b88..b627abad0a 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -18,12 +18,12 @@ "require": { "php": ">=5.5.9", "monolog/monolog": "~1.19", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/console": "~2.8|~3.0|~4.0.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/var-dumper": "~3.3|~4.0.0" + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0" }, "conflict": { "symfony/http-foundation": "<3.3" diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index a13589816c..510257552d 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": ">=5.5.9", - "symfony/dependency-injection": "~2.8|~3.0|~4.0.0", + "symfony/dependency-injection": "~2.8|~3.0|~4.0", "ocramius/proxy-manager": "~0.4|~1.0|~2.0" }, "require-dev": { - "symfony/config": "~2.8|~3.0|~4.0.0" + "symfony/config": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }, diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index bbeeb4df45..fd86e83fb2 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -21,22 +21,22 @@ }, "require-dev": { "fig/link-util": "^1.0", - "symfony/asset": "~2.8|~3.0|~4.0.0", - "symfony/finder": "~2.8|~3.0|~4.0.0", - "symfony/form": "^3.2.7|~4.0.0", - "symfony/http-kernel": "~3.2|~4.0.0", + "symfony/asset": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/form": "^3.2.7|~4.0", + "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/templating": "~2.8|~3.0|~4.0.0", - "symfony/translation": "~2.8|~3.0|~4.0.0", - "symfony/yaml": "~2.8|~3.0|~4.0.0", - "symfony/security": "~2.8|~3.0|~4.0.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/yaml": "~2.8|~3.0|~4.0", + "symfony/security": "~2.8|~3.0|~4.0", "symfony/security-acl": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", - "symfony/console": "~2.8|~3.0|~4.0.0", - "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/web-link": "~3.3|~4.0.0" + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/web-link": "~3.3|~4.0" }, "suggest": { "symfony/finder": "", diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json index e910d4d927..89376a9b8b 100644 --- a/src/Symfony/Bundle/DebugBundle/composer.json +++ b/src/Symfony/Bundle/DebugBundle/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=5.5.9", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0", - "symfony/twig-bridge": "~2.8|~3.0|~4.0.0", - "symfony/var-dumper": "~2.8|~3.0|~4.0.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0", + "symfony/twig-bridge": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/config": "~3.3|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/web-profiler-bundle": "~2.8|~3.0|~4.0.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/web-profiler-bundle": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/config": "For service container configuration", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 5355f61f31..038ef7e4bc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -18,42 +18,42 @@ "require": { "php": ">=5.5.9", "ext-xml": "*", - "symfony/cache": "~3.3|~4.0.0", + "symfony/cache": "~3.3|~4.0", "symfony/class-loader": "~3.2", - "symfony/dependency-injection": "~3.3-beta2|~4.0.0", - "symfony/config": "~3.3|~4.0.0", - "symfony/event-dispatcher": "~3.3|~4.0.0", - "symfony/http-foundation": "~3.3|~4.0.0", - "symfony/http-kernel": "~3.3|~4.0.0", + "symfony/dependency-injection": "~3.3-beta2|~4.0", + "symfony/config": "~3.3|~4.0", + "symfony/event-dispatcher": "~3.3|~4.0", + "symfony/http-foundation": "~3.3|~4.0", + "symfony/http-kernel": "~3.3|~4.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/filesystem": "~2.8|~3.0|~4.0.0", - "symfony/finder": "~2.8|~3.0|~4.0.0", - "symfony/routing": "~3.3|~4.0.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", + "symfony/filesystem": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/routing": "~3.3|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", "doctrine/cache": "~1.0" }, "require-dev": { "fig/link-util": "^1.0", - "symfony/asset": "~3.3|~4.0.0", - "symfony/browser-kit": "~2.8|~3.0|~4.0.0", - "symfony/console": "~3.3|~4.0.0", - "symfony/css-selector": "~2.8|~3.0|~4.0.0", - "symfony/dom-crawler": "~2.8|~3.0|~4.0.0", + "symfony/asset": "~3.3|~4.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", + "symfony/console": "~3.3|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/security": "~2.8|~3.0|~4.0.0", - "symfony/form": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/process": "~2.8|~3.0|~4.0.0", - "symfony/security-core": "~3.2|~4.0.0", - "symfony/security-csrf": "~2.8|~3.0|~4.0.0", - "symfony/serializer": "~3.3|~4.0.0", - "symfony/translation": "~3.2|~4.0.0", - "symfony/templating": "~2.8|~3.0|~4.0.0", - "symfony/validator": "~3.3|~4.0.0", - "symfony/workflow": "~3.3|~4.0.0", - "symfony/yaml": "~3.2|~4.0.0", - "symfony/property-info": "~3.3|~4.0.0", - "symfony/web-link": "~3.3|~4.0.0", + "symfony/security": "~2.8|~3.0|~4.0", + "symfony/form": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/security-core": "~3.2|~4.0", + "symfony/security-csrf": "~2.8|~3.0|~4.0", + "symfony/serializer": "~3.3|~4.0", + "symfony/translation": "~3.2|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/validator": "~3.3|~4.0", + "symfony/workflow": "~3.3|~4.0", + "symfony/yaml": "~3.2|~4.0", + "symfony/property-info": "~3.3|~4.0", + "symfony/web-link": "~3.3|~4.0", "doctrine/annotations": "~1.0", "phpdocumentor/reflection-docblock": "^3.0", "twig/twig": "~1.26|~2.0", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 275c7bbfce..30b8f474b4 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -17,29 +17,29 @@ ], "require": { "php": ">=5.5.9", - "symfony/security": "~3.3|~4.0.0", - "symfony/dependency-injection": "~3.3-beta2|~4.0.0", - "symfony/http-kernel": "~3.3|~4.0.0", + "symfony/security": "~3.3|~4.0", + "symfony/dependency-injection": "~3.3-beta2|~4.0", + "symfony/http-kernel": "~3.3|~4.0", "symfony/polyfill-php70": "~1.0" }, "require-dev": { - "symfony/asset": "~2.8|~3.0|~4.0.0", - "symfony/browser-kit": "~2.8|~3.0|~4.0.0", - "symfony/console": "~3.2|~4.0.0", - "symfony/css-selector": "~2.8|~3.0|~4.0.0", - "symfony/dom-crawler": "~2.8|~3.0|~4.0.0", - "symfony/form": "^2.8.18|^3.2.5|~4.0.0", - "symfony/framework-bundle": "^3.2.8|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", + "symfony/asset": "~2.8|~3.0|~4.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", + "symfony/console": "~3.2|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", + "symfony/form": "^2.8.18|^3.2.5|~4.0", + "symfony/framework-bundle": "^3.2.8|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", "symfony/security-acl": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0|~4.0.0", - "symfony/twig-bundle": "~2.8|~3.0|~4.0.0", - "symfony/twig-bridge": "~2.8|~3.0|~4.0.0", - "symfony/process": "~2.8|~3.0|~4.0.0", - "symfony/validator": "^3.2.5|~4.0.0", - "symfony/var-dumper": "~3.3|~4.0.0", - "symfony/yaml": "~2.8|~3.0|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/twig-bundle": "~2.8|~3.0|~4.0", + "symfony/twig-bridge": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/validator": "^3.2.5|~4.0", + "symfony/var-dumper": "~3.3|~4.0", + "symfony/yaml": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", "doctrine/doctrine-bundle": "~1.4", "twig/twig": "~1.28|~2.0" }, diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index ece1c91602..c16d1dc6bd 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -24,17 +24,17 @@ "twig/twig": "^1.32|^2.2" }, "require-dev": { - "symfony/asset": "~2.8|~3.0|~4.0.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/finder": "~2.8|~3.0|~4.0.0", - "symfony/form": "~2.8|~3.0|~4.0.0", - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/templating": "~2.8|~3.0|~4.0.0", - "symfony/yaml": "~2.8|~3.0|~4.0.0", - "symfony/framework-bundle": "^3.2.8|~4.0.0", - "symfony/web-link": "~3.3|~4.0.0", + "symfony/asset": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/form": "~2.8|~3.0|~4.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/yaml": "~2.8|~3.0|~4.0", + "symfony/framework-bundle": "^3.2.8|~4.0", + "symfony/web-link": "~3.3|~4.0", "doctrine/annotations": "~1.0" }, "conflict": { diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index e1c148baf5..2769fc3d11 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -17,18 +17,18 @@ ], "require": { "php": ">=5.5.9", - "symfony/http-kernel": "~3.2|~4.0.0", + "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-php70": "~1.0", - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/twig-bridge": "~2.8|~3.0|~4.0.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/twig-bridge": "~2.8|~3.0|~4.0", "twig/twig": "~1.28|~2.0", - "symfony/var-dumper": "~3.3|~4.0.0" + "symfony/var-dumper": "~3.3|~4.0" }, "require-dev": { - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/console": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "conflict": { "symfony/dependency-injection": "<3.3", diff --git a/src/Symfony/Bundle/WebServerBundle/composer.json b/src/Symfony/Bundle/WebServerBundle/composer.json index cf6222295c..9583782bbf 100644 --- a/src/Symfony/Bundle/WebServerBundle/composer.json +++ b/src/Symfony/Bundle/WebServerBundle/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.5.9", - "symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2|~4.0.0", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0", - "symfony/process": "~2.8|~3.0|~4.0.0" + "symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2|~4.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Bundle\\WebServerBundle\\": "" }, diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json index ffdb80b0d4..5966220dcc 100644 --- a/src/Symfony/Component/Asset/composer.json +++ b/src/Symfony/Component/Asset/composer.json @@ -22,8 +22,8 @@ "symfony/http-foundation": "" }, "require-dev": { - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0" + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Asset\\": "" }, diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 6a78ee846b..14fea2567b 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": ">=5.5.9", - "symfony/dom-crawler": "~2.8|~3.0|~4.0.0" + "symfony/dom-crawler": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/process": "~2.8|~3.0|~4.0.0", - "symfony/css-selector": "~2.8|~3.0|~4.0.0" + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/process": "" diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index 690032cbcc..b8eeecdfa5 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -20,7 +20,7 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/finder": "~2.8|~3.0|~4.0.0", + "symfony/finder": "~2.8|~3.0|~4.0", "symfony/polyfill-apcu": "~1.1" }, "suggest": { diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 5ba594cb34..0e14ef8d93 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": ">=5.5.9", - "symfony/filesystem": "~2.8|~3.0|~4.0.0" + "symfony/filesystem": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/yaml": "~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0" + "symfony/yaml": "~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0" }, "conflict": { "symfony/dependency-injection": "<3.3" diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 97cf6ae90b..db73b1f371 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -18,14 +18,14 @@ "require": { "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0", - "symfony/debug": "~2.8|~3.0|~4.0.0" + "symfony/debug": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/filesystem": "~2.8|~3.0|~4.0.0", - "symfony/process": "~2.8|~3.0|~4.0.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/filesystem": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index 3fb492be41..310fbaf006 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -23,7 +23,7 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" }, diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index a682bfd007..4b3e63385e 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -20,9 +20,9 @@ "psr/container": "^1.0" }, "require-dev": { - "symfony/yaml": "~3.3|~4.0.0", - "symfony/config": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0" + "symfony/yaml": "~3.3|~4.0", + "symfony/config": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/yaml": "", diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index dce2585d70..765a08c0ef 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0|~4.0.0" + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/css-selector": "" diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json index 48210c7bc3..90fc80cbf5 100644 --- a/src/Symfony/Component/Dotenv/composer.json +++ b/src/Symfony/Component/Dotenv/composer.json @@ -19,7 +19,7 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/process": "~3.2|~4.0.0" + "symfony/process": "~3.2|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Dotenv\\": "" }, diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index c9fb559fb6..cc79a3141d 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -19,10 +19,10 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json index ffa6c0bc21..47f8eb4902 100644 --- a/src/Symfony/Component/ExpressionLanguage/composer.json +++ b/src/Symfony/Component/ExpressionLanguage/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.5.9", - "symfony/cache": "~3.1|~4.0.0" + "symfony/cache": "~3.1|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" }, diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index a1e42ca025..c9e646c6b2 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -17,22 +17,22 @@ ], "require": { "php": ">=5.5.9", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0.0", - "symfony/options-resolver": "~2.8|~3.0|~4.0.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/options-resolver": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/property-access": "~2.8|~3.0|~4.0.0" + "symfony/property-access": "~2.8|~3.0|~4.0" }, "require-dev": { "doctrine/collections": "~1.0", - "symfony/validator": "^3.2.5|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/config": "~2.7|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/http-kernel": "~2.8|~3.0|~4.0.0", - "symfony/security-csrf": "~2.8|~3.0|~4.0.0", - "symfony/translation": "~2.8|~3.0|~4.0.0", - "symfony/var-dumper": "~3.3|~4.0.0" + "symfony/validator": "^3.2.5|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/config": "~2.7|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~2.8|~3.0|~4.0", + "symfony/security-csrf": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0" }, "conflict": { "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 7e0994993f..44192dfe17 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { - "symfony/expression-language": "~2.8|~3.0|~4.0.0" + "symfony/expression-language": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index fd5938b3b3..7983e8b3bc 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,27 +17,27 @@ ], "require": { "php": ">=5.5.9", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~3.3|~4.0.0", - "symfony/debug": "~2.8|~3.0|~4.0.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~3.3|~4.0", + "symfony/debug": "~2.8|~3.0|~4.0", "psr/log": "~1.0" }, "require-dev": { - "symfony/browser-kit": "~2.8|~3.0|~4.0.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/console": "~2.8|~3.0|~4.0.0", - "symfony/css-selector": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/dom-crawler": "~2.8|~3.0|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/finder": "~2.8|~3.0|~4.0.0", - "symfony/process": "~2.8|~3.0|~4.0.0", - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0.0", - "symfony/templating": "~2.8|~3.0|~4.0.0", - "symfony/translation": "~2.8|~3.0|~4.0.0", - "symfony/var-dumper": "~3.3|~4.0.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0", "psr/cache": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index 9bc914765c..477eea64be 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -28,7 +28,7 @@ "symfony/polyfill-intl-icu": "~1.0" }, "require-dev": { - "symfony/filesystem": "~2.8|~3.0|~4.0.0" + "symfony/filesystem": "~2.8|~3.0|~4.0" }, "suggest": { "ext-intl": "to use the component with locales other than \"en\"" diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json index 886cb502a0..b6fd70cafd 100644 --- a/src/Symfony/Component/Ldap/composer.json +++ b/src/Symfony/Component/Ldap/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.5.9", "symfony/polyfill-php56": "~1.0", - "symfony/options-resolver": "~2.8|~3.0|~4.0.0", + "symfony/options-resolver": "~2.8|~3.0|~4.0", "ext-ldap": "*" }, "autoload": { diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json index b2dbedb1af..127bd19d8a 100644 --- a/src/Symfony/Component/PropertyAccess/composer.json +++ b/src/Symfony/Component/PropertyAccess/composer.json @@ -18,10 +18,10 @@ "require": { "php": ">=5.5.9", "symfony/polyfill-php70": "~1.0", - "symfony/inflector": "~3.1|~4.0.0" + "symfony/inflector": "~3.1|~4.0" }, "require-dev": { - "symfony/cache": "~3.1|~4.0.0" + "symfony/cache": "~3.1|~4.0" }, "suggest": { "psr/cache-implementation": "To cache access methods." diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json index 508b308dae..8a0eab0816 100644 --- a/src/Symfony/Component/PropertyInfo/composer.json +++ b/src/Symfony/Component/PropertyInfo/composer.json @@ -24,12 +24,12 @@ ], "require": { "php": ">=5.5.9", - "symfony/inflector": "~3.1|~4.0.0" + "symfony/inflector": "~3.1|~4.0" }, "require-dev": { - "symfony/serializer": "~2.8|~3.0|~4.0.0", - "symfony/cache": "~3.1|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", + "symfony/serializer": "~2.8|~3.0|~4.0", + "symfony/cache": "~3.1|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", "phpdocumentor/reflection-docblock": "^3.0", "doctrine/annotations": "~1.0" }, diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index a9f192cd12..d09aff5932 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,11 +19,11 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/yaml": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0" diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 1fa423cd44..c9864c5b87 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -20,11 +20,11 @@ "symfony/polyfill-php56": "~1.0" }, "require-dev": { - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/ldap": "~3.1|~4.0.0", - "symfony/validator": "^3.2.5|~4.0.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/ldap": "~3.1|~4.0", + "symfony/validator": "^3.2.5|~4.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json index f23354377d..4cdf318174 100644 --- a/src/Symfony/Component/Security/Csrf/composer.json +++ b/src/Symfony/Component/Security/Csrf/composer.json @@ -19,10 +19,10 @@ "php": ">=5.5.9", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", - "symfony/security-core": "~2.8|~3.0|~4.0.0" + "symfony/security-core": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/http-foundation": "~2.8|~3.0|~4.0.0" + "symfony/http-foundation": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/http-foundation": "For using the class SessionTokenStorage." diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json index 07d29f4df5..a44bd86d6c 100644 --- a/src/Symfony/Component/Security/Guard/composer.json +++ b/src/Symfony/Component/Security/Guard/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=5.5.9", - "symfony/security-core": "~2.8|~3.0|~4.0.0", - "symfony/security-http": "~3.1|~4.0.0" + "symfony/security-core": "~2.8|~3.0|~4.0", + "symfony/security-http": "~3.1|~4.0" }, "require-dev": { "psr/log": "~1.0" diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index fc9aeec1d4..357ccc00f4 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -17,17 +17,17 @@ ], "require": { "php": ">=5.5.9", - "symfony/security-core": "~3.2|~4.0.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/http-kernel": "~3.3|~4.0.0", + "symfony/security-core": "~3.2|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.3|~4.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", - "symfony/property-access": "~2.8|~3.0|~4.0.0" + "symfony/property-access": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/security-csrf": "~2.8|~3.0|~4.0.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/security-csrf": "~2.8|~3.0|~4.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 2d7c69b985..65c731b678 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -17,13 +17,13 @@ ], "require": { "php": ">=5.5.9", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/http-kernel": "~3.3|~4.0.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.3|~4.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "symfony/property-access": "~2.8|~3.0|~4.0.0" + "symfony/property-access": "~2.8|~3.0|~4.0" }, "replace": { "symfony/security-core": "self.version", @@ -32,12 +32,12 @@ "symfony/security-http": "self.version" }, "require-dev": { - "symfony/finder": "~2.8|~3.0|~4.0.0", + "symfony/finder": "~2.8|~3.0|~4.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "~2.8|~3.0|~4.0.0", - "symfony/validator": "^3.2.5|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/ldap": "~3.1|~4.0.0", + "symfony/routing": "~2.8|~3.0|~4.0", + "symfony/validator": "^3.2.5|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/ldap": "~3.1|~4.0", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index fac63187e1..3219ac0805 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -19,14 +19,14 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/yaml": "~3.3|~4.0.0", - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/property-access": "~2.8|~3.0|~4.0.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/cache": "~3.1|~4.0.0", - "symfony/property-info": "~3.1|~4.0.0", + "symfony/yaml": "~3.3|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/property-access": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/cache": "~3.1|~4.0", + "symfony/property-info": "~3.1|~4.0", "doctrine/annotations": "~1.0", - "symfony/dependency-injection": "~3.2|~4.0.0", + "symfony/dependency-injection": "~3.2|~4.0", "doctrine/cache": "~1.0", "phpdocumentor/reflection-docblock": "~3.0" }, diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 966c41f23a..4b4897e8e3 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -20,9 +20,9 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0.0", - "symfony/yaml": "~3.3|~4.0.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/yaml": "~3.3|~4.0", "psr/log": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index ff44ba9126..21c0a8a7cd 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -18,16 +18,16 @@ "require": { "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation": "~2.8|~3.0|~4.0.0" + "symfony/translation": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/http-foundation": "~2.8|~3.0|~4.0.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0.0", - "symfony/yaml": "~3.3|~4.0.0", - "symfony/config": "~2.8|~3.0|~4.0.0", - "symfony/dependency-injection": "~3.3|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/cache": "~3.1|~4.0.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/yaml": "~3.3|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/cache": "~3.1|~4.0", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", "egulias/email-validator": "^1.2.8|~2.0" diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json index 8db660c676..4940f33751 100644 --- a/src/Symfony/Component/WebLink/composer.json +++ b/src/Symfony/Component/WebLink/composer.json @@ -24,9 +24,9 @@ "symfony/http-kernel": "" }, "require-dev": { - "symfony/event-dispatcher": "^2.8|^3.0|~4.0.0", - "symfony/http-foundation": "^2.8|^3.0|~4.0.0", - "symfony/http-kernel": "^2.8|^3.0|~4.0.0" + "symfony/event-dispatcher": "^2.8|^3.0|~4.0", + "symfony/http-foundation": "^2.8|^3.0|~4.0", + "symfony/http-kernel": "^2.8|^3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\WebLink\\": "" }, diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json index 918bda4b99..8a111dbd67 100644 --- a/src/Symfony/Component/Workflow/composer.json +++ b/src/Symfony/Component/Workflow/composer.json @@ -21,14 +21,14 @@ ], "require": { "php": ">=5.5.9", - "symfony/property-access": "~2.3|~3.0|~4.0.0" + "symfony/property-access": "~2.3|~3.0|~4.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/dependency-injection": "~2.8|~3.0|~4.0.0", - "symfony/event-dispatcher": "~2.1|~3.0|~4.0.0", - "symfony/expression-language": "~2.8|~3.0|~4.0.0", - "symfony/security-core": "~2.8|~3.0|~4.0.0" + "symfony/dependency-injection": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~2.1|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/security-core": "~2.8|~3.0|~4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Workflow\\": "" } diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 8c218ac9ac..d05cb7fb4d 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -19,7 +19,7 @@ "php": ">=5.5.9" }, "require-dev": { - "symfony/console": "~2.8|~3.0|~4.0.0" + "symfony/console": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" From b8c68da0107a4f433dd414a355ea5589da0da0e8 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Thu, 25 May 2017 08:46:02 +0200 Subject: [PATCH 3/3] [DI] Deprecate XML services without ID --- UPGRADE-3.4.md | 11 +++++--- UPGRADE-4.0.md | 2 ++ .../Resources/config/services.xml | 4 +-- .../DependencyInjection/CHANGELOG.md | 1 + .../Loader/XmlFileLoader.php | 2 ++ .../xml/nested_service_without_id.xml | 10 ++++++++ .../Tests/Fixtures/xml/services28.xml | 2 +- .../Tests/Fixtures/xml/services5.xml | 2 +- .../Fixtures/xml/services_without_id.xml | 11 ++++++++ .../Tests/Loader/XmlFileLoaderTest.php | 25 +++++++++++++++++-- 10 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/nested_service_without_id.xml create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md index 29a810c870..21db4d1ed6 100644 --- a/UPGRADE-3.4.md +++ b/UPGRADE-3.4.md @@ -1,15 +1,20 @@ UPGRADE FROM 3.3 to 3.4 ======================= +DependencyInjection +------------------- + + * Top-level anonymous services in XML are deprecated and will throw an exception in Symfony 4.0. + Finder ------ * The `Symfony\Component\Finder\Iterator\FilterIterator` class has been deprecated and will be removed in 4.0 as it used to fix a bug which existed - before version 5.5.23/5.6.7 + before version 5.5.23/5.6.7. Validator --------- - * not setting the `strict` option of the `Choice` constraint to `true` is - deprecated and will throw an exception in Symfony 4.0 + * Not setting the `strict` option of the `Choice` constraint to `true` is + deprecated and will throw an exception in Symfony 4.0. diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 70c6f8e7e6..448e7b235a 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -128,6 +128,8 @@ DependencyInjection * The ``strict`` attribute in service arguments has been removed. The attribute is ignored since 3.0, so you can simply remove it. + * Top-level anonymous services in XML are no longer supported. + EventDispatcher --------------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml index 7c935a6bd0..cecbdf8d85 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml @@ -66,12 +66,12 @@ - + - + diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md index 6ae0daa20e..594d62c0c7 100644 --- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md +++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * deprecated the ability to check for the initialization of a private service with the `Container::initialized()` method + * deprecated support for top-level anonymous services in XML 3.3.0 ----- diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 79c8fbf967..78dd38c673 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -413,6 +413,8 @@ class XmlFileLoader extends FileLoader // anonymous services "in the wild" if (false !== $nodes = $xpath->query('//container:services/container:service[not(@id)]')) { foreach ($nodes as $node) { + @trigger_error(sprintf('Top-level anonymous services are deprecated since Symfony 3.4, the "id" attribute will be required in version 4.0 in %s at line %d.', $file, $node->getLineNo()), E_USER_DEPRECATED); + // give it a unique name $id = sprintf('%d_%s', ++$count, hash('sha256', $file)); $node->setAttribute('id', $id); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/nested_service_without_id.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/nested_service_without_id.xml new file mode 100644 index 0000000000..f8eb009949 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/nested_service_without_id.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services28.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services28.xml index 9c3ba9bbb5..0076cc31eb 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services28.xml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services28.xml @@ -5,7 +5,7 @@ - + diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services5.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services5.xml index 347df977dd..721f028287 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services5.xml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services5.xml @@ -18,7 +18,7 @@ - + diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml new file mode 100644 index 0000000000..afabf3d891 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_without_id.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php index 41d1c48d54..9ffe5793e4 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php @@ -230,6 +230,28 @@ class XmlFileLoaderTest extends TestCase $this->assertSame($fooArgs[0], $barArgs[0]); } + /** + * @group legacy + * @expectedDeprecation Top-level anonymous services are deprecated since Symfony 3.4, the "id" attribute will be required in version 4.0 in %sservices_without_id.xml at line 4. + */ + public function testLoadAnonymousServicesWithoutId() + { + $container = new ContainerBuilder(); + $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')); + $loader->load('services_without_id.xml'); + } + + public function testLoadAnonymousNestedServices() + { + $container = new ContainerBuilder(); + $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')); + $loader->load('nested_service_without_id.xml'); + + $this->assertTrue($container->hasDefinition('FooClass')); + $arguments = $container->getDefinition('FooClass')->getArguments(); + $this->assertInstanceOf(Reference::class, array_shift($arguments)); + } + public function testLoadServices() { $container = new ContainerBuilder(); @@ -667,9 +689,8 @@ class XmlFileLoaderTest extends TestCase $this->assertSame('service_container', key($definitions)); array_shift($definitions); - $this->assertStringStartsWith('1_', key($definitions)); - $anonymous = current($definitions); + $this->assertSame('bar', key($definitions)); $this->assertTrue($anonymous->isPublic()); $this->assertTrue($anonymous->isAutowired()); $this->assertSame(array('foo' => array(array())), $anonymous->getTags());