symfony · Guikingone · May 28, 2019 · May 28, 2019 · May 28, 2019 · May 28, 2019
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,17 +10,17 @@ init:
     - SET PATH=c:\php;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
     - SET SYMFONY_DEPRECATIONS_HELPER=strict
-    - SET "SYMFONY_REQUIRE=>=4.2"
+    - SET "SYMFONY_REQUIRE=>=4.4"
     - SET ANSICON=121x90 (121x90)
     - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
     - mkdir c:\php && cd c:\php
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
-    - 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.9-Win32-VC15-x86.zip
+    - 7z x php-7.2.9-Win32-VC15-x86.zip -y >nul
     - cd ext
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.8-7.1-ts-vc14-x86.zip
-    - 7z x php_apcu-5.1.8-7.1-ts-vc14-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
+    - 7z x php_apcu-5.1.17-7.2-ts-vc15-x86.zip -y >nul
     - cd ..
     - copy /Y php.ini-development php.ini-min
     - echo memory_limit=-1 >> php.ini-min

diff --git a/.travis.yml b/.travis.yml
@@ -17,14 +17,14 @@ addons:
 
 env:
     global:
-        - MIN_PHP=7.1.3
+        - MIN_PHP=7.2.9
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
         - MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
         - MESSENGER_REDIS_DSN=redis://127.0.0.1:7001/messages
 
 matrix:
     include:
-        - php: 7.1
+        - php: 7.2
         - php: 7.2
           env: deps=high
         - php: 7.3
@@ -215,7 +215,7 @@ install:
     - |
       # Install symfony/flex
       if [[ $deps = low ]]; then
-          export SYMFONY_REQUIRE='>=2.3'
+          export SYMFONY_REQUIRE='>=3.4'
       else
           export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
       fi

diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -220,6 +220,7 @@ FrameworkBundle
  * Support for the legacy directory structure in `translation:update` and `debug:translation` commands has been removed.
  * Removed the "Psr\SimpleCache\CacheInterface" / "cache.app.simple" service, use "Symfony\Contracts\Cache\CacheInterface" / "cache.app" instead.
  * Removed support for `templating` engine in `TemplateController`, use Twig instead
+ * Removed `ResolveControllerNameSubscriber`.
 
 HttpClient
 ----------
@@ -402,6 +403,25 @@ SecurityBundle
 Serializer
 ----------
 
+ * The default value of the `CsvEncoder` "as_collection" option was changed to `true`.
+ * Individual encoders & normalizers options as constructor arguments were removed. 
+   Use the default context instead.
+ * The following method and properties:
+     - `AbstractNormalizer::$circularReferenceLimit`
+     - `AbstractNormalizer::$circularReferenceHandler`
+     - `AbstractNormalizer::$callbacks`
+     - `AbstractNormalizer::$ignoredAttributes`
+     - `AbstractNormalizer::$camelizedAttributes` 
+     - `AbstractNormalizer::setCircularReferenceLimit()`
+     - `AbstractNormalizer::setCircularReferenceHandler()` 
+     - `AbstractNormalizer::setCallbacks()`
+     - `AbstractNormalizer::setIgnoredAttributes()`
+     - `AbstractObjectNormalizer::$maxDepthHandler`
+     - `AbstractObjectNormalizer::setMaxDepthHandler()`
+     - `XmlEncoder::setRootNodeName()`
+     - `XmlEncoder::getRootNodeName()`
+
+   were removed, use the default context instead.
  * The `AbstractNormalizer::handleCircularReference()` method has two new `$format` and `$context` arguments.
 
 Translation

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2.9",
         "ext-xml": "*",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "~1.0",
@@ -31,7 +31,6 @@
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-intl-idn": "^1.10",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php72": "~1.5",
         "symfony/polyfill-php73": "^1.11"
     },
     "replace": {
@@ -121,7 +120,7 @@
     },
     "conflict": {
         "masterminds/html5": "<2.6",
-        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
+        "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<0.3.0",
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
@@ -154,7 +153,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "4.4-dev"
+            "dev-master": "5.0-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.0.0
+-----
+
+ * 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
+
 4.4.0
 -----
 

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -50,20 +50,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
         $classMetadata = $manager->getClassMetadata($class);
 
         if ($idReader && !$idReader->isSingleId()) {
-            @trigger_error(sprintf('Passing an instance of "%s" to "%s" with an entity class "%s" that has a composite id is deprecated since Symfony 4.3 and will throw an exception in 5.0.', IdReader::class, __CLASS__, $class), E_USER_DEPRECATED);
-
-            // In Symfony 5.0
-            // throw new \InvalidArgumentException(sprintf('The second argument `$idReader` of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
-        }
-
-        if ((5 > \func_num_args() || false !== func_get_arg(4)) && null === $idReader) {
-            $idReader = new IdReader($manager, $classMetadata);
-
-            if ($idReader->isSingleId()) {
-                @trigger_error(sprintf('Not explicitly passing an instance of "%s" to "%s" when it can optimize single id entity "%s" has been deprecated in 4.3 and will not apply any optimization in 5.0.', IdReader::class, __CLASS__, $class), E_USER_DEPRECATED);
-            } else {
-                $idReader = null;
-            }
+            throw new \InvalidArgumentException(sprintf('The second argument `$idReader` of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
         }
 
         $this->manager = $manager;

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -18,7 +18,6 @@
 use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
-use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
 
@@ -377,70 +376,8 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
     }
 
     /**
-     * @group legacy
-     *
-     * @expectedDeprecation Not explicitly passing an instance of "Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader" to "Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader" when it can optimize single id entity "%s" has been deprecated in 4.3 and will not apply any optimization in 5.0.
-     */
-    public function testLoaderWithoutIdReaderCanBeOptimized()
-    {
-        $obj1 = new SingleIntIdEntity('1', 'one');
-        $obj2 = new SingleIntIdEntity('2', 'two');
-
-        $metadata = $this->createMock(ClassMetadata::class);
-        $metadata->expects($this->once())
-            ->method('getIdentifierFieldNames')
-            ->willReturn(['idField'])
-        ;
-        $metadata->expects($this->any())
-            ->method('getIdentifierValues')
-            ->willReturnCallback(function ($obj) use ($obj1, $obj2) {
-                if ($obj === $obj1) {
-                    return ['idField' => '1'];
-                }
-                if ($obj === $obj2) {
-                    return ['idField' => '2'];
-                }
-
-                return null;
-            })
-        ;
-
-        $this->om = $this->createMock(ObjectManager::class);
-        $this->om->expects($this->once())
-            ->method('getClassMetadata')
-            ->with(SingleIntIdEntity::class)
-            ->willReturn($metadata)
-        ;
-        $this->om->expects($this->any())
-            ->method('contains')
-            ->with($this->isInstanceOf(SingleIntIdEntity::class))
-            ->willReturn(true)
-        ;
-
-        $loader = new DoctrineChoiceLoader(
-            $this->om,
-            SingleIntIdEntity::class,
-            null,
-            $this->objectLoader
-        );
-
-        $choices = [$obj1, $obj2];
-
-        $this->repository->expects($this->never())
-            ->method('findAll');
-
-        $this->objectLoader->expects($this->once())
-            ->method('getEntitiesByIds')
-            ->with('idField', ['1'])
-            ->willReturn($choices);
-
-        $this->assertSame([$obj1], $loader->loadChoicesForValues(['1']));
-    }
-
-    /**
-     * @group legacy
-     *
-     * @deprecationMessage Passing an instance of "Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader" to "Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader" with an entity class "stdClass" that has a composite id is deprecated since Symfony 4.3 and will throw an exception in 5.0.
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The second argument `$idReader` of "Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.
      */
     public function testPassingIdReaderWithoutSingleIdEntity()
     {
@@ -450,13 +387,6 @@ public function testPassingIdReaderWithoutSingleIdEntity()
             ->willReturn(false)
         ;
 
-        $loader = new DoctrineChoiceLoader(
-            $this->om,
-            $this->class,
-            $idReader,
-            $this->objectLoader
-        );
-
-        $this->assertInstanceOf(DoctrineChoiceLoader::class, $loader);
+        new DoctrineChoiceLoader($this->om, $this->class, $idReader, $this->objectLoader);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Security\User;
 
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Tools\SchemaTool;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Security\User\EntityUserProvider;
@@ -172,7 +173,7 @@ public function testLoadUserByUserNameShouldLoadUserWhenProperInterfaceProvided(
      */
     public function testLoadUserByUserNameShouldDeclineInvalidInterface()
     {
-        $repository = $this->getMockBuilder('\Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
+        $repository = $this->getMockBuilder(EntityRepository::class)->disableOriginalConstructor()->getMock();
 
         $provider = new EntityUserProvider(
             $this->getManager($this->getObjectManager($repository)),

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -16,27 +16,27 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2.9",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "~1.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/service-contracts": "^1.1"
     },
     "require-dev": {
-        "symfony/stopwatch": "^3.4|^4.0|^5.0",
-        "symfony/config": "^4.2|^5.0",
-        "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-        "symfony/form": "^4.3|^5.0",
-        "symfony/http-kernel": "^3.4|^4.0|^5.0",
-        "symfony/messenger": "^4.3|^5.0",
-        "symfony/property-access": "^3.4|^4.0|^5.0",
-        "symfony/property-info": "^3.4|^4.0|^5.0",
-        "symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0",
-        "symfony/security-core": "^3.4|^4.0|^5.0",
-        "symfony/expression-language": "^3.4|^4.0|^5.0",
-        "symfony/validator": "^3.4|^4.0|^5.0",
-        "symfony/translation": "^3.4|^4.0|^5.0",
+        "symfony/stopwatch": "^4.4|^5.0",
+        "symfony/config": "^4.4|^5.0",
+        "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/form": "^4.4|^5.0",
+        "symfony/http-kernel": "^4.4|^5.0",
+        "symfony/messenger": "^4.4|^5.0",
+        "symfony/property-access": "^4.4|^5.0",
+        "symfony/property-info": "^4.4|^5.0",
+        "symfony/proxy-manager-bridge": "^4.4|^5.0",
+        "symfony/security-core": "^4.4|^5.0",
+        "symfony/expression-language": "^4.4|^5.0",
+        "symfony/validator": "^4.4|^5.0",
+        "symfony/translation": "^4.4|^5.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
@@ -46,10 +46,10 @@
         "doctrine/reflection": "~1.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
-        "symfony/dependency-injection": "<3.4",
-        "symfony/form": "<4.3",
-        "symfony/messenger": "<4.3"
+        "phpunit/phpunit": "<5.4.3",
+        "symfony/dependency-injection": "<4.4",
+        "symfony/form": "<4.4",
+        "symfony/messenger": "<4.4"
     },
     "suggest": {
         "symfony/form": "",
@@ -68,7 +68,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "4.4-dev"
+            "dev-master": "5.0-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Monolog/CHANGELOG.md b/src/Symfony/Bridge/Monolog/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.0.0
+-----
+
+ * The methods `DebugProcessor::getLogs()`, `DebugProcessor::countErrors()`, `Logger::getLogs()` and `Logger::countErrors()` have a new `$request` argument.
+
 4.4.0
 -----
 

diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
@@ -24,35 +24,23 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface
 {
     /**
      * {@inheritdoc}
-     *
-     * @param Request|null $request
      */
-    public function getLogs(/* Request $request = null */)
+    public function getLogs(Request $request = null)
     {
-        if (\func_num_args() < 1 && __CLASS__ !== \get_class($this) && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
-            @trigger_error(sprintf('The "%s()" method will have a new "Request $request = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-        }
-
         if ($logger = $this->getDebugLogger()) {
-            return $logger->getLogs(...\func_get_args());
+            return $logger->getLogs($request);
         }
 
         return [];
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param Request|null $request
      */
-    public function countErrors(/* Request $request = null */)
+    public function countErrors(Request $request = null)
     {
-        if (\func_num_args() < 1 && __CLASS__ !== \get_class($this) && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
-            @trigger_error(sprintf('The "%s()" method will have a new "Request $request = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
-        }
-
         if ($logger = $this->getDebugLogger()) {
-            return $logger->countErrors(...\func_get_args());
+            return $logger->countErrors($request);
         }
 
         return 0;