symfony · nicolas-grekas · Jun 9, 2019 · Jun 8, 2019
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * passing an `IdReader` to the `DoctrineChoiceLoader` when the query cannot be optimized with single id field, throws an exception; pass `null` instead
  * not explicitly passing an instance of `IdReader` to `DoctrineChoiceLoader` when it can optimize single id field, will not apply any optimization
+ * `DoctrineExtractor` now requires an `EntityManagerInterface` on instantiation
 
 4.4.0
 -----

diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\PropertyInfo;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
 use Doctrine\Common\Persistence\Mapping\MappingException;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\EntityManagerInterface;
@@ -33,19 +32,9 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
     private $entityManager;
     private $classMetadataFactory;
 
-    /**
-     * @param EntityManagerInterface $entityManager
-     */
-    public function __construct($entityManager)
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        if ($entityManager instanceof EntityManagerInterface) {
-            $this->entityManager = $entityManager;
-        } elseif ($entityManager instanceof ClassMetadataFactory) {
-            @trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);
-            $this->classMetadataFactory = $entityManager;
-        } else {
-            throw new \TypeError(sprintf('$entityManager must be an instance of "%s", "%s" given.', EntityManagerInterface::class, \is_object($entityManager) ? \get_class($entityManager) : \gettype($entityManager)));
-        }
+        $this->entityManager = $entityManager;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -24,7 +24,7 @@
  */
 class DoctrineExtractorTest extends TestCase
 {
-    private function createExtractor(bool $legacy = false)
+    private function createExtractor()
     {
         $config = Setup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
         $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
@@ -34,20 +34,10 @@ private function createExtractor(bool $legacy = false)
             $entityManager->getConnection()->getDatabasePlatform()->registerDoctrineTypeMapping('custom_foo', 'foo');
         }
 
-        return new DoctrineExtractor($legacy ? $entityManager->getMetadataFactory() : $entityManager);
+        return new DoctrineExtractor($entityManager);
     }
 
     public function testGetProperties()
-    {
-        $this->doTestGetProperties(false);
-    }
-
-    public function testLegacyGetProperties()
-    {
-        $this->doTestGetProperties(true);
-    }
-
-    private function doTestGetProperties(bool $legacy)
     {
         $this->assertEquals(
              [
@@ -69,21 +59,11 @@ private function doTestGetProperties(bool $legacy)
                 'indexedBar',
                 'indexedFoo',
             ],
-            $this->createExtractor($legacy)->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy')
+            $this->createExtractor()->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy')
         );
     }
 
     public function testTestGetPropertiesWithEmbedded()
-    {
-        $this->doTestGetPropertiesWithEmbedded(false);
-    }
-
-    public function testLegacyTestGetPropertiesWithEmbedded()
-    {
-        $this->doTestGetPropertiesWithEmbedded(true);
-    }
-
-    private function doTestGetPropertiesWithEmbedded(bool $legacy)
     {
         if (!class_exists('Doctrine\ORM\Mapping\Embedded')) {
             $this->markTestSkipped('@Embedded is not available in Doctrine ORM lower than 2.5.');
@@ -94,7 +74,7 @@ private function doTestGetPropertiesWithEmbedded(bool $legacy)
                 'id',
                 'embedded',
             ],
-            $this->createExtractor($legacy)->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineWithEmbedded')
+            $this->createExtractor()->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineWithEmbedded')
         );
     }
 
@@ -103,33 +83,10 @@ private function doTestGetPropertiesWithEmbedded(bool $legacy)
      */
     public function testExtract($property, array $type = null)
     {
-        $this->doTestExtract(false, $property, $type);
-    }
-
-    /**
-     * @dataProvider typesProvider
-     */
-    public function testLegacyExtract($property, array $type = null)
-    {
-        $this->doTestExtract(true, $property, $type);
-    }
-
-    private function doTestExtract(bool $legacy, $property, array $type = null)
-    {
-        $this->assertEquals($type, $this->createExtractor($legacy)->getTypes('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy', $property, []));
+        $this->assertEquals($type, $this->createExtractor()->getTypes('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy', $property, []));
     }
 
     public function testExtractWithEmbedded()
-    {
-        $this->doTestExtractWithEmbedded(false);
-    }
-
-    public function testLegacyExtractWithEmbedded()
-    {
-        $this->doTestExtractWithEmbedded(true);
-    }
-
-    private function doTestExtractWithEmbedded(bool $legacy)
     {
         if (!class_exists('Doctrine\ORM\Mapping\Embedded')) {
             $this->markTestSkipped('@Embedded is not available in Doctrine ORM lower than 2.5.');
@@ -141,7 +98,7 @@ private function doTestExtractWithEmbedded(bool $legacy)
             'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineEmbeddable'
         )];
 
-        $actualTypes = $this->createExtractor($legacy)->getTypes(
+        $actualTypes = $this->createExtractor()->getTypes(
             'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineWithEmbedded',
             'embedded',
             []
@@ -197,32 +154,12 @@ public function typesProvider()
 
     public function testGetPropertiesCatchException()
     {
-        $this->doTestGetPropertiesCatchException(false);
-    }
-
-    public function testLegacyGetPropertiesCatchException()
-    {
-        $this->doTestGetPropertiesCatchException(true);
-    }
-
-    private function doTestGetPropertiesCatchException(bool $legacy)
-    {
-        $this->assertNull($this->createExtractor($legacy)->getProperties('Not\Exist'));
+        $this->assertNull($this->createExtractor()->getProperties('Not\Exist'));
     }
 
     public function testGetTypesCatchException()
     {
-        return $this->doTestGetTypesCatchException(false);
-    }
-
-    public function testLegacyGetTypesCatchException()
-    {
-        return $this->doTestGetTypesCatchException(true);
-    }
-
-    private function doTestGetTypesCatchException(bool $legacy)
-    {
-        $this->assertNull($this->createExtractor($legacy)->getTypes('Not\Exist', 'baz'));
+        $this->assertNull($this->createExtractor()->getTypes('Not\Exist', 'baz'));
     }
 
     public function testGeneratedValueNotWritable()

diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.0.0
+-----
+
+ * removed `weak_vendor` mode, use `max[self]=0` instead
+
 4.3.0
 -----
 

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -21,11 +21,6 @@
  */
 class DeprecationErrorHandler
 {
-    /**
-     * @deprecated since Symfony 4.3, use max[self]=0 instead
-     */
-    const MODE_WEAK_VENDORS = 'weak_vendors';
-
     const MODE_DISABLED = 'disabled';
     const MODE_WEAK = 'max[total]=999999&verbose=0';
     const MODE_STRICT = 'max[total]=0';
@@ -227,13 +222,6 @@ private function getConfiguration()
         if ('weak' === $mode) {
             return $this->configuration = Configuration::inWeakMode();
         }
-        if (self::MODE_WEAK_VENDORS === $mode) {
-            ++$this->deprecations['remaining directCount'];
-            $msg = sprintf('Setting SYMFONY_DEPRECATIONS_HELPER to "%s" is deprecated in favor of "max[self]=0"', $mode);
-            $ref = &$this->deprecations['remaining direct'][$msg]['count'];
-            ++$ref;
-            $mode = 'max[self]=0';
-        }
         if (isset($mode[0]) && '/' === $mode[0]) {
             return $this->configuration = Configuration::fromRegex($mode);
         }

diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * removed `TwigEngine` class, use `\Twig\Environment` instead.
  * removed `transChoice` filter and token
+ * `HttpFoundationExtension` requires a `UrlHelper` on instantiation
 
 4.4.0
 -----

diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -12,9 +12,7 @@
 namespace Symfony\Bridge\Twig\Extension;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\UrlHelper;
-use Symfony\Component\Routing\RequestContext;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -27,32 +25,9 @@ class HttpFoundationExtension extends AbstractExtension
 {
     private $urlHelper;
 
-    /**
-     * @param UrlHelper $urlHelper
-     */
-    public function __construct($urlHelper)
+    public function __construct(UrlHelper $urlHelper)
     {
-        if ($urlHelper instanceof UrlHelper) {
-            $this->urlHelper = $urlHelper;
-
-            return;
-        }
-
-        if (!$urlHelper instanceof RequestStack) {
-            throw new \TypeError(sprintf('The first argument must be an instance of "%s" or an instance of "%s".', UrlHelper::class, RequestStack::class));
-        }
-
-        @trigger_error(sprintf('Passing a "%s" instance as the first argument to the "%s" constructor is deprecated since Symfony 4.3, pass a "%s" instance instead.', RequestStack::class, __CLASS__, UrlHelper::class), E_USER_DEPRECATED);
-
-        $requestContext = null;
-        if (2 === \func_num_args()) {
-            $requestContext = \func_get_arg(1);
-            if (null !== $requestContext && !$requestContext instanceof RequestContext) {
-                throw new \TypeError(sprintf('The second argument must be an instance of "%s".', RequestContext::class));
-            }
-        }
-
-        $this->urlHelper = new UrlHelper($urlHelper, $requestContext);
+        $this->urlHelper = $urlHelper;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -27,7 +27,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.2
+ * @final
  */
 class TranslationExtension extends AbstractExtension
 {
@@ -40,10 +40,7 @@ public function __construct(TranslatorInterface $translator = null, NodeVisitorI
         $this->translationNodeVisitor = $translationNodeVisitor;
     }
 
-    /**
-     * @return TranslatorInterface|null
-     */
-    public function getTranslator()
+    public function getTranslator(): ?TranslatorInterface
     {
         if (null === $this->translator) {
             if (!interface_exists(TranslatorInterface::class)) {

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
@@ -15,11 +15,9 @@
 use Symfony\Bridge\Twig\Extension\HttpFoundationExtension;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\UrlHelper;
 use Symfony\Component\Routing\RequestContext;
 
-/**
- * @group legacy
- */
 class HttpFoundationExtensionTest extends TestCase
 {
     /**
@@ -29,7 +27,7 @@ public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
     {
         $stack = new RequestStack();
         $stack->push(Request::create($pathinfo));
-        $extension = new HttpFoundationExtension($stack);
+        $extension = new HttpFoundationExtension(new UrlHelper($stack));
 
         $this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
     }
@@ -67,7 +65,7 @@ public function testGenerateAbsoluteUrlWithRequestContext($path, $baseUrl, $host
         }
 
         $requestContext = new RequestContext($baseUrl, 'GET', $host, $scheme, $httpPort, $httpsPort, $path);
-        $extension = new HttpFoundationExtension(new RequestStack(), $requestContext);
+        $extension = new HttpFoundationExtension(new UrlHelper(new RequestStack(), $requestContext));
 
         $this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
     }
@@ -81,7 +79,7 @@ public function testGenerateAbsoluteUrlWithoutRequestAndRequestContext($path)
             $this->markTestSkipped('The Routing component is needed to run tests that depend on its request context.');
         }
 
-        $extension = new HttpFoundationExtension(new RequestStack());
+        $extension = new HttpFoundationExtension(new UrlHelper(new RequestStack()));
 
         $this->assertEquals($path, $extension->generateAbsoluteUrl($path));
     }
@@ -107,7 +105,7 @@ public function testGenerateAbsoluteUrlWithScriptFileName()
 
         $stack = new RequestStack();
         $stack->push($request);
-        $extension = new HttpFoundationExtension($stack);
+        $extension = new HttpFoundationExtension(new UrlHelper($stack));
 
         $this->assertEquals(
             'http://localhost/app/web/bundles/framework/css/structure.css',
@@ -126,7 +124,7 @@ public function testGenerateRelativePath($expected, $path, $pathinfo)
 
         $stack = new RequestStack();
         $stack->push(Request::create($pathinfo));
-        $extension = new HttpFoundationExtension($stack);
+        $extension = new HttpFoundationExtension(new UrlHelper($stack));
 
         $this->assertEquals($expected, $extension->generateRelativePath($path));
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG
  * Removed the `cache.app.simple` service and its corresponding PSR-16 autowiring alias
  * Removed cache-related compiler passes and `RequestDataCollector`
  * Removed the `translator.selector` and `session.save_listener` services
+ * Removed `SecurityUserValueResolver`, use `UserValueResolver` instead
 
 4.4.0
 -----

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -17,7 +17,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class ControllerResolver extends ContainerControllerResolver
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -93,7 +93,6 @@
             </call>
 
             <tag name="console.command" command="messenger:consume" />
-            <tag name="console.command" command="messenger:consume-messages" />
             <tag name="monolog.logger" channel="messenger" />
         </service>
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -23,7 +23,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class DelegatingLoader extends BaseDelegatingLoader
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ CHANGELOG @@
      * passing an `IdReader` to the `DoctrineChoiceLoader` when the query cannot be optimized with single id field, throws an exception; pass `null` instead
      * not explicitly passing an instance of `IdReader` to `DoctrineChoiceLoader` when it can optimize single id field, will not apply any optimization
+     * `DoctrineExtractor` now requires an `EntityManagerInterface` on instantiation
 .4.0
     -----
@@ Expand Down @@