Merge branch '5.1' into 5.x

derrabus · derrabus · commit 0085cbc05d09 · 2020-10-28T22:46:03.000+01:00
diff --git a/Argument/BoundArgument.php b/Argument/BoundArgument.php
@@ -54,9 +54,9 @@ public function getValues(): array
     public function setValues(array $values)
     {
         if (5 === \count($values)) {
-            list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;
+            [$this->value, $this->identifier, $this->used, $this->type, $this->file] = $values;
         } else {
-            list($this->value, $this->identifier, $this->used) = $values;
+            [$this->value, $this->identifier, $this->used] = $values;
         }
     }
 }
diff --git a/Compiler/AbstractRecursivePass.php b/Compiler/AbstractRecursivePass.php
@@ -127,7 +127,7 @@ protected function getConstructor(Definition $definition, bool $required)
         }
 
         if ($factory) {
-            list($class, $method) = $factory;
+            [$class, $method] = $factory;
             if ($class instanceof Reference) {
                 $class = $this->container->findDefinition((string) $class)->getClass();
             } elseif ($class instanceof Definition) {
diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -126,7 +126,7 @@ private function doProcessValue($value, bool $isRoot = false)
         $this->methodCalls = $this->autowireCalls($reflectionClass, $isRoot);
 
         if ($constructor) {
-            list(, $arguments) = array_shift($this->methodCalls);
+            [, $arguments] = array_shift($this->methodCalls);
 
             if ($arguments !== $value->getArguments()) {
                 $value->setArguments($arguments);
@@ -152,7 +152,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):
 
         foreach ($this->methodCalls as $i => $call) {
             $this->decoratedMethodIndex = $i;
-            list($method, $arguments) = $call;
+            [$method, $arguments] = $call;
 
             if ($method instanceof \ReflectionFunctionAbstract) {
                 $reflectionMethod = $method;
diff --git a/Compiler/AutowireRequiredMethodsPass.php b/Compiler/AutowireRequiredMethodsPass.php
@@ -38,7 +38,7 @@ protected function processValue($value, bool $isRoot = false)
         $alreadyCalledMethods = [];
         $withers = [];
 
-        foreach ($value->getMethodCalls() as list($method)) {
+        foreach ($value->getMethodCalls() as [$method]) {
             $alreadyCalledMethods[strtolower($method)] = true;
         }
 
diff --git a/Compiler/DecoratorServicePass.php b/Compiler/DecoratorServicePass.php
@@ -46,9 +46,9 @@ public function process(ContainerBuilder $container)
         }
         $decoratingDefinitions = [];
 
-        foreach ($definitions as list($id, $definition)) {
+        foreach ($definitions as [$id, $definition]) {
             $decoratedService = $definition->getDecoratedService();
-            list($inner, $renamedId) = $decoratedService;
+            [$inner, $renamedId] = $decoratedService;
             $invalidBehavior = $decoratedService[3] ?? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
 
             $definition->setDecoratedService(null);
diff --git a/Compiler/ResolveBindingsPass.php b/Compiler/ResolveBindingsPass.php
@@ -41,11 +41,11 @@ public function process(ContainerBuilder $container)
         try {
             parent::process($container);
 
-            foreach ($this->unusedBindings as list($key, $serviceId, $bindingType, $file)) {
+            foreach ($this->unusedBindings as [$key, $serviceId, $bindingType, $file]) {
                 $argumentType = $argumentName = $message = null;
 
                 if (false !== strpos($key, ' ')) {
-                    list($argumentType, $argumentName) = explode(' ', $key, 2);
+                    [$argumentType, $argumentName] = explode(' ', $key, 2);
                 } elseif ('$' === $key[0]) {
                     $argumentName = $key;
                 } else {
@@ -117,7 +117,7 @@ protected function processValue($value, bool $isRoot = false)
         $bindingNames = [];
 
         foreach ($bindings as $key => $binding) {
-            list($bindingValue, $bindingId, $used, $bindingType, $file) = $binding->getValues();
+            [$bindingValue, $bindingId, $used, $bindingType, $file] = $binding->getValues();
             if ($used) {
                 $this->usedBindings[$bindingId] = true;
                 unset($this->unusedBindings[$bindingId]);
@@ -156,7 +156,7 @@ protected function processValue($value, bool $isRoot = false)
         }
 
         foreach ($calls as $i => $call) {
-            list($method, $arguments) = $call;
+            [$method, $arguments] = $call;
 
             if ($method instanceof \ReflectionFunctionAbstract) {
                 $reflectionMethod = $method;
@@ -210,7 +210,7 @@ protected function processValue($value, bool $isRoot = false)
         }
 
         if ($constructor) {
-            list(, $arguments) = array_pop($calls);
+            [, $arguments] = array_pop($calls);
 
             if ($arguments !== $value->getArguments()) {
                 $value->setArguments($arguments);
@@ -229,7 +229,7 @@ protected function processValue($value, bool $isRoot = false)
      */
     private function getBindingValue(BoundArgument $binding)
     {
-        list($bindingValue, $bindingId) = $binding->getValues();
+        [$bindingValue, $bindingId] = $binding->getValues();
 
         $this->usedBindings[$bindingId] = true;
         unset($this->unusedBindings[$bindingId]);
diff --git a/Compiler/ResolveNamedArgumentsPass.php b/Compiler/ResolveNamedArgumentsPass.php
@@ -41,7 +41,7 @@ protected function processValue($value, bool $isRoot = false)
         $calls[] = ['__construct', $value->getArguments()];
 
         foreach ($calls as $i => $call) {
-            list($method, $arguments) = $call;
+            [$method, $arguments] = $call;
             $parameters = null;
             $resolvedArguments = [];
 
@@ -107,7 +107,7 @@ protected function processValue($value, bool $isRoot = false)
             }
         }
 
-        list(, $arguments) = array_pop($calls);
+        [, $arguments] = array_pop($calls);
 
         if ($arguments !== $value->getArguments()) {
             $value->setArguments($arguments);
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1455,7 +1455,7 @@ public function removeBindings(string $id)
     {
         if ($this->hasDefinition($id)) {
             foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {
-                list(, $bindingId) = $binding->getValues();
+                [, $bindingId] = $binding->getValues();
                 $this->removedBindingIds[(int) $bindingId] = true;
             }
         }
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -597,7 +597,7 @@ private function addServiceInclude(string $cId, Definition $definition): string
                 }
             }
 
-            foreach ($this->serviceCalls as $id => list($callCount, $behavior)) {
+            foreach ($this->serviceCalls as $id => [$callCount, $behavior]) {
                 if ('service_container' !== $id && $id !== $cId
                     && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE !== $behavior
                     && $this->container->has($id)
@@ -950,7 +950,7 @@ private function addInlineReference(string $id, Definition $definition, string $
             $targetId = (string) $this->container->getAlias($targetId);
         }
 
-        list($callCount, $behavior) = $this->serviceCalls[$targetId];
+        [$callCount, $behavior] = $this->serviceCalls[$targetId];
 
         if ($id === $targetId) {
             return $this->addInlineService($id, $definition, $definition);
@@ -1006,7 +1006,7 @@ private function addInlineService(string $id, Definition $definition, Definition
         $code = '';
 
         if ($isSimpleInstance = $isRootInstance = null === $inlineDef) {
-            foreach ($this->serviceCalls as $targetId => list($callCount, $behavior, $byConstructor)) {
+            foreach ($this->serviceCalls as $targetId => [$callCount, $behavior, $byConstructor]) {
                 if ($byConstructor && isset($this->circularReferences[$id][$targetId]) && !$this->circularReferences[$id][$targetId]) {
                     $code .= $this->addInlineReference($id, $definition, $targetId, $forConstructor);
                 }
@@ -1076,7 +1076,7 @@ private function addServices(array &$services = null): string
         }
 
         foreach ($definitions as $id => $definition) {
-            if (!(list($file, $code) = $services[$id]) || null !== $file) {
+            if (!([$file, $code] = $services[$id]) || null !== $file) {
                 continue;
             }
             if ($definition->isPublic()) {
@@ -1094,7 +1094,7 @@ private function generateServiceFiles(array $services): iterable
         $definitions = $this->container->getDefinitions();
         ksort($definitions);
         foreach ($definitions as $id => $definition) {
-            if ((list($file, $code) = $services[$id]) && null !== $file && ($definition->isPublic() || !$this->isTrivialInstance($definition) || isset($this->locatedIds[$id]))) {
+            if (([$file, $code] = $services[$id]) && null !== $file && ($definition->isPublic() || !$this->isTrivialInstance($definition) || isset($this->locatedIds[$id]))) {
                 yield $file => [$code, $definition->hasTag($this->hotPathTag) || !$definition->hasTag($this->preloadTags[1]) && !$definition->isDeprecated() && !$definition->hasErrors()];
             }
         }
@@ -1796,7 +1796,7 @@ private function dumpValue($value, bool $interpolate = true): string
                     return sprintf('new \%s($this->getService, [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
                 }
             } finally {
-                list($this->definitionVariables, $this->referenceVariables) = $scope;
+                [$this->definitionVariables, $this->referenceVariables] = $scope;
             }
         } elseif ($value instanceof Definition) {
             if ($value->hasErrors() && $e = $value->getErrors()) {
diff --git a/Dumper/XmlDumper.php b/Dumper/XmlDumper.php
@@ -118,7 +118,7 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa
             $service->setAttribute('lazy', 'true');
         }
         if (null !== $decoratedService = $definition->getDecoratedService()) {
-            list($decorated, $renamedId, $priority) = $decoratedService;
+            [$decorated, $renamedId, $priority] = $decoratedService;
             $service->setAttribute('decorates', $decorated);
 
             $decorationOnInvalid = $decoratedService[3] ?? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
diff --git a/Dumper/YamlDumper.php b/Dumper/YamlDumper.php
@@ -138,7 +138,7 @@ private function addService(string $id, Definition $definition): string
         }
 
         if (null !== $decoratedService = $definition->getDecoratedService()) {
-            list($decorated, $renamedId, $priority) = $decoratedService;
+            [$decorated, $renamedId, $priority] = $decoratedService;
             $code .= sprintf("        decorates: %s\n", $decorated);
             if (null !== $renamedId) {
                 $code .= sprintf("        decoration_inner_name: %s\n", $renamedId);
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -430,7 +430,7 @@ private function processAnonymousServices(\DOMDocument $xml, string $file)
 
         // resolve definitions
         uksort($definitions, 'strnatcmp');
-        foreach (array_reverse($definitions) as $id => list($domElement, $file)) {
+        foreach (array_reverse($definitions) as $id => [$domElement, $file]) {
             if (null !== $definition = $this->parseDefinition($domElement, $file, new Definition())) {
                 $this->setDefinition($id, $definition);
             }
diff --git a/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -67,7 +67,7 @@ public function testAliasParametersShouldBeResolved()
 
     public function testBindingsShouldBeResolved()
     {
-        list($boundValue) = $this->container->getDefinition('foo')->getBindings()['$baz']->getValues();
+        [$boundValue] = $this->container->getDefinition('foo')->getBindings()['$baz']->getValues();
 
         $this->assertSame($this->container->getParameterBag()->resolveValue('%env(BAZ)%'), $boundValue);
     }

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ public function getValues(): array`
`54`	`54`	`public function setValues(array $values)`
`55`	`55`	`{`
`56`	`56`	`if (5 === \count($values)) {`
`57`		`- list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;`
	`57`	`+ [$this->value, $this->identifier, $this->used, $this->type, $this->file] = $values;`
`58`	`58`	`} else {`
`59`		`- list($this->value, $this->identifier, $this->used) = $values;`
	`59`	`+ [$this->value, $this->identifier, $this->used] = $values;`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected function getConstructor(Definition $definition, bool $required)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if ($factory) {`
`130`		`- list($class, $method) = $factory;`
	`130`	`+ [$class, $method] = $factory;`
`131`	`131`	`if ($class instanceof Reference) {`
`132`	`132`	`$class = $this->container->findDefinition((string) $class)->getClass();`
`133`	`133`	`} elseif ($class instanceof Definition) {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function processValue($value, bool $isRoot = false)`
`38`	`38`	`$alreadyCalledMethods = [];`
`39`	`39`	`$withers = [];`
`40`	`40`
`41`		`- foreach ($value->getMethodCalls() as list($method)) {`
	`41`	`+ foreach ($value->getMethodCalls() as [$method]) {`
`42`	`42`	`$alreadyCalledMethods[strtolower($method)] = true;`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected function processValue($value, bool $isRoot = false)`
`41`	`41`	`$calls[] = ['__construct', $value->getArguments()];`
`42`	`42`
`43`	`43`	`foreach ($calls as $i => $call) {`
`44`		`- list($method, $arguments) = $call;`
	`44`	`+ [$method, $arguments] = $call;`
`45`	`45`	`$parameters = null;`
`46`	`46`	`$resolvedArguments = [];`
`47`	`47`
`@@ -107,7 +107,7 @@ protected function processValue($value, bool $isRoot = false)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- list(, $arguments) = array_pop($calls);`
	`110`	`+ [, $arguments] = array_pop($calls);`
`111`	`111`
`112`	`112`	`if ($arguments !== $value->getArguments()) {`
`113`	`113`	`$value->setArguments($arguments);`
Original file line number	Diff line number	Diff line change
`@@ -1455,7 +1455,7 @@ public function removeBindings(string $id)`
`1455`	`1455`	`{`
`1456`	`1456`	`if ($this->hasDefinition($id)) {`
`1457`	`1457`	`foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {`
`1458`		`- list(, $bindingId) = $binding->getValues();`
	`1458`	`+ [, $bindingId] = $binding->getValues();`
`1459`	`1459`	`$this->removedBindingIds[(int) $bindingId] = true;`
`1460`	`1460`	`}`
`1461`	`1461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ private function addServiceInclude(string $cId, Definition $definition): string`
`597`	`597`	`}`
`598`	`598`	`}`
`599`	`599`
`600`		`- foreach ($this->serviceCalls as $id => list($callCount, $behavior)) {`
	`600`	`+ foreach ($this->serviceCalls as $id => [$callCount, $behavior]) {`
`601`	`601`	`if ('service_container' !== $id && $id !== $cId`
`602`	`602`	`&& ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE !== $behavior`
`603`	`603`	`&& $this->container->has($id)`
`@@ -950,7 +950,7 @@ private function addInlineReference(string $id, Definition $definition, string $`
`950`	`950`	`$targetId = (string) $this->container->getAlias($targetId);`
`951`	`951`	`}`
`952`	`952`
`953`		`- list($callCount, $behavior) = $this->serviceCalls[$targetId];`
	`953`	`+ [$callCount, $behavior] = $this->serviceCalls[$targetId];`
`954`	`954`
`955`	`955`	`if ($id === $targetId) {`
`956`	`956`	`return $this->addInlineService($id, $definition, $definition);`
`@@ -1006,7 +1006,7 @@ private function addInlineService(string $id, Definition $definition, Definition`
`1006`	`1006`	`$code = '';`
`1007`	`1007`
`1008`	`1008`	`if ($isSimpleInstance = $isRootInstance = null === $inlineDef) {`
`1009`		`- foreach ($this->serviceCalls as $targetId => list($callCount, $behavior, $byConstructor)) {`
	`1009`	`+ foreach ($this->serviceCalls as $targetId => [$callCount, $behavior, $byConstructor]) {`
`1010`	`1010`	`if ($byConstructor && isset($this->circularReferences[$id][$targetId]) && !$this->circularReferences[$id][$targetId]) {`
`1011`	`1011`	`$code .= $this->addInlineReference($id, $definition, $targetId, $forConstructor);`
`1012`	`1012`	`}`
`@@ -1076,7 +1076,7 @@ private function addServices(array &$services = null): string`
`1076`	`1076`	`}`
`1077`	`1077`
`1078`	`1078`	`foreach ($definitions as $id => $definition) {`
`1079`		`- if (!(list($file, $code) = $services[$id]) \|\| null !== $file) {`
	`1079`	`+ if (!([$file, $code] = $services[$id]) \|\| null !== $file) {`
`1080`	`1080`	`continue;`
`1081`	`1081`	`}`
`1082`	`1082`	`if ($definition->isPublic()) {`
`@@ -1094,7 +1094,7 @@ private function generateServiceFiles(array $services): iterable`
`1094`	`1094`	`$definitions = $this->container->getDefinitions();`
`1095`	`1095`	`ksort($definitions);`
`1096`	`1096`	`foreach ($definitions as $id => $definition) {`
`1097`		`- if ((list($file, $code) = $services[$id]) && null !== $file && ($definition->isPublic() \|\| !$this->isTrivialInstance($definition) \|\| isset($this->locatedIds[$id]))) {`
	`1097`	`+ if (([$file, $code] = $services[$id]) && null !== $file && ($definition->isPublic() \|\| !$this->isTrivialInstance($definition) \|\| isset($this->locatedIds[$id]))) {`
`1098`	`1098`	`yield $file => [$code, $definition->hasTag($this->hotPathTag) \|\| !$definition->hasTag($this->preloadTags[1]) && !$definition->isDeprecated() && !$definition->hasErrors()];`
`1099`	`1099`	`}`
`1100`	`1100`	`}`
`@@ -1796,7 +1796,7 @@ private function dumpValue($value, bool $interpolate = true): string`
`1796`	`1796`	`return sprintf('new \%s($this->getService, [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n " : '', $serviceTypes, $serviceTypes ? "\n " : '');`
`1797`	`1797`	`}`
`1798`	`1798`	`} finally {`
`1799`		`- list($this->definitionVariables, $this->referenceVariables) = $scope;`
	`1799`	`+ [$this->definitionVariables, $this->referenceVariables] = $scope;`
`1800`	`1800`	`}`
`1801`	`1801`	`} elseif ($value instanceof Definition) {`
`1802`	`1802`	`if ($value->hasErrors() && $e = $value->getErrors()) {`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa`
`118`	`118`	`$service->setAttribute('lazy', 'true');`
`119`	`119`	`}`
`120`	`120`	`if (null !== $decoratedService = $definition->getDecoratedService()) {`
`121`		`- list($decorated, $renamedId, $priority) = $decoratedService;`
	`121`	`+ [$decorated, $renamedId, $priority] = $decoratedService;`
`122`	`122`	`$service->setAttribute('decorates', $decorated);`
`123`	`123`
`124`	`124`	`$decorationOnInvalid = $decoratedService[3] ?? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;`