diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index ef493d86cb..d8f06f87bd 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -41,7 +41,6 @@ "symfony/security-http": "^3.4|^4.0|^5.0", "symfony/stopwatch": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/web-link": "^4.4|^5.0", "symfony/workflow": "^4.3|^5.0", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 46b1cd80e1..a8d0066ec9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -55,7 +55,6 @@ "symfony/templating": "^3.4|^4.0|^5.0", "symfony/twig-bundle": "^4.4|^5.0", "symfony/validator": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", "symfony/workflow": "^4.3.6|^5.0", "symfony/yaml": "^3.4|^4.0|^5.0", "symfony/property-info": "^3.4|^4.0|^5.0", @@ -86,7 +85,6 @@ "symfony/twig-bridge": "<4.1.1", "symfony/twig-bundle": "<4.4", "symfony/validator": "<4.4", - "symfony/var-dumper": "<4.4", "symfony/workflow": "<4.3.6" }, "suggest": { diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index c9202bad57..33f4c5c447 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -27,30 +27,28 @@ "symfony/security-http": "^4.4" }, "require-dev": { + "doctrine/doctrine-bundle": "^1.5|^2.0", "symfony/asset": "^3.4|^4.0|^5.0", "symfony/browser-kit": "^4.2|^5.0", "symfony/console": "^3.4|^4.0|^5.0", "symfony/css-selector": "^3.4|^4.0|^5.0", "symfony/dom-crawler": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/form": "^3.4|^4.0|^5.0", "symfony/framework-bundle": "^4.4|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", "symfony/serializer": "^4.4|^5.0", "symfony/translation": "^3.4|^4.0|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", "symfony/twig-bridge": "^3.4|^4.0|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", + "symfony/twig-bundle": "^4.4|^5.0", "symfony/validator": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^3.4|^4.0|^5.0", "symfony/yaml": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "doctrine/doctrine-bundle": "^1.5|^2.0", "twig/twig": "^1.41|^2.10|^3.0" }, "conflict": { "symfony/browser-kit": "<4.2", "symfony/twig-bundle": "<4.4", - "symfony/var-dumper": "<3.4", "symfony/framework-bundle": "<4.4", "symfony/console": "<3.4", "symfony/ldap": "<4.4" diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index e3f7bc0107..deadcf4b9b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -21,7 +21,6 @@ "symfony/http-kernel": "^4.4", "symfony/routing": "^3.4|^4.0|^5.0", "symfony/twig-bundle": "^4.2|^5.0", - "symfony/var-dumper": "^3.4|^4.0|^5.0", "twig/twig": "^1.41|^2.10|^3.0" }, "require-dev": { @@ -32,7 +31,6 @@ "conflict": { "symfony/dependency-injection": "<3.4", "symfony/messenger": "<4.2", - "symfony/var-dumper": "<3.4", "symfony/form": "<4.3" }, "autoload": { diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index 83aecc0d48..bd8f7389dd 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -36,12 +36,12 @@ "psr/simple-cache": "^1.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.1|^5.0", - "symfony/var-dumper": "^4.1.1|^5.0" + "symfony/var-dumper": "^4.4|^5.0" }, "conflict": { "doctrine/dbal": "<2.5", "symfony/dependency-injection": "<3.4", - "symfony/var-dumper": "<3.4" + "symfony/var-dumper": "<4.4" }, "autoload": { "psr-4": { "Symfony\\Component\\Cache\\": "" }, diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 0e040811e1..aaf5574384 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -77,9 +77,6 @@ abstract class DataCollector implements DataCollectorInterface return $var; } if (null === $this->cloner) { - if (!class_exists(CutStub::class)) { - throw new \LogicException(sprintf('The VarDumper component is needed for the %s() method. Install symfony/var-dumper version 3.4 or above.', __METHOD__)); - } $this->cloner = new VarCloner(); $this->cloner->setMaxItems(-1); $this->cloner->addCasters($this->getCasters()); @@ -105,11 +102,7 @@ abstract class DataCollector implements DataCollectorInterface return $a; }, - ]; - - if (method_exists(ReflectionCaster::class, 'unsetClosureFileInfo')) { - $casters += ReflectionCaster::UNSET_CLOSURE_FILE_INFO; - } + ] + ReflectionCaster::UNSET_CLOSURE_FILE_INFO; return $casters; } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index ba6ab33de8..13b5e1fc72 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -49,6 +49,7 @@ "symfony/browser-kit": "<4.3", "symfony/config": "<3.4", "symfony/console": ">=5", + "symfony/debug": "<4.4", "symfony/dependency-injection": "<4.3", "symfony/translation": "<4.2", "twig/twig": "<1.34|<2.4,>=2" diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 62b5240b82..c12ace10f5 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -32,8 +32,7 @@ "symfony/serializer": "^3.4|^4.0|^5.0", "symfony/service-contracts": "^1.1|^2", "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/validator": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^3.4|^4.0|^5.0" + "symfony/validator": "^3.4|^4.0|^5.0" }, "conflict": { "symfony/event-dispatcher": "<4.3",