Merge branch '5.1' into 5.x

Author: derrabus

DataCollector/DoctrineDataCollector.php

@@ -191,7 +191,7 @@ private function sanitizeQuery(string $connectionName, array $query): array
                 }
             }
 
-            list($query['params'][$j], $explainable, $runnable) = $this->sanitizeParam($param, $e);
+            [$query['params'][$j], $explainable, $runnable] = $this->sanitizeParam($param, $e);
             if (!$explainable) {
                 $query['explainable'] = false;
             }
@@ -227,7 +227,7 @@ private function sanitizeParam($var, ?\Throwable $error): array
             $a = [];
             $explainable = $runnable = true;
             foreach ($var as $k => $v) {
-                list($value, $e, $r) = $this->sanitizeParam($v, null);
+                [$value, $e, $r] = $this->sanitizeParam($v, null);
                 $explainable = $explainable && $e;
                 $runnable = $runnable && $r;
                 $a[$k] = $value;

DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

@@ -65,7 +65,7 @@ private function addTaggedSubscribers(ContainerBuilder $container)
         $taggedSubscribers = $this->findAndSortTags($subscriberTag, $container);
 
         foreach ($taggedSubscribers as $taggedSubscriber) {
-            list($id, $tag) = $taggedSubscriber;
+            [$id, $tag] = $taggedSubscriber;
             $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections);
             foreach ($connections as $con) {
                 if (!isset($this->connections[$con])) {
@@ -84,7 +84,7 @@ private function addTaggedListeners(ContainerBuilder $container)
         $listenerRefs = [];
 
         foreach ($taggedListeners as $taggedListener) {
-            list($id, $tag) = $taggedListener;
+            [$id, $tag] = $taggedListener;
             if (!isset($tag['event'])) {
                 throw new InvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.', $id));
             }

Form/DoctrineOrmTypeGuesser.php

@@ -42,7 +42,7 @@ public function guessType(string $class, string $property)
             return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
         }
 
-        list($metadata, $name) = $ret;
+        [$metadata, $name] = $ret;
 
         if ($metadata->hasAssociation($property)) {
             $multiple = $metadata->isCollectionValuedAssociation($property);

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -114,17 +114,8 @@ protected function createEntityManagerMock($repositoryMock)
             ->method('hasField')
             ->willReturn(true)
         ;
-        $reflParser = $this->getMockBuilder('Doctrine\Common\Reflection\StaticReflectionParser')
-            ->disableOriginalConstructor()
-            ->getMock()
-        ;
-        $refl = $this->getMockBuilder('Doctrine\Common\Reflection\StaticReflectionProperty')
-            ->setConstructorArgs([$reflParser, 'property-name'])
-            ->setMethods(['getValue'])
-            ->getMock()
-        ;
+        $refl = $this->createMock(\ReflectionProperty::class);
         $refl
-            ->expects($this->any())
             ->method('getValue')
             ->willReturn(true)
         ;

composer.json

@@ -48,8 +48,7 @@
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.10|^3.0",
-        "doctrine/orm": "^2.6.3",
-        "doctrine/reflection": "~1.0"
+        "doctrine/orm": "^2.6.3"
     },
     "conflict": {
         "doctrine/dbal": "<2.10",