Merge branch '4.4' into 5.1

Author: derrabus

Controller/ControllerResolver.php

@@ -114,7 +114,7 @@ protected function createController(string $controller)
             return $controller;
         }
 
-        list($class, $method) = explode('::', $controller, 2);
+        [$class, $method] = explode('::', $controller, 2);
 
         try {
             $controller = [$this->instantiateController($class), $method];
@@ -172,7 +172,7 @@ private function getControllerError($callable): string
             return 'Invalid array callable, expected [controller, method].';
         }
 
-        list($controller, $method) = $callable;
+        [$controller, $method] = $callable;
 
         if (\is_string($controller) && !class_exists($controller)) {
             return sprintf('Class "%s" does not exist.', $controller);

DataCollector/DumpDataCollector.php

@@ -75,7 +75,7 @@ public function dump(Data $data)
             $this->stopwatch->start('dump');
         }
 
-        list('name' => $name, 'file' => $file, 'line' => $line, 'file_excerpt' => $fileExcerpt) = $this->sourceContextProvider->getContext();
+        ['name' => $name, 'file' => $file, 'line' => $line, 'file_excerpt' => $fileExcerpt] = $this->sourceContextProvider->getContext();
 
         if ($this->dumper instanceof Connection) {
             if (!$this->dumper->write($data)) {

DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -106,7 +106,7 @@ public function process(ContainerBuilder $container)
                 if (!isset($methods[$action = strtolower($attributes['action'])])) {
                     throw new InvalidArgumentException(sprintf('Invalid "action" attribute on tag "%s" for service "%s": no public "%s()" method found on class "%s".', $this->controllerTag, $id, $attributes['action'], $class));
                 }
-                list($r, $parameters) = $methods[$action];
+                [$r, $parameters] = $methods[$action];
                 $found = false;
 
                 foreach ($parameters as $p) {
@@ -124,7 +124,7 @@ public function process(ContainerBuilder $container)
                 }
             }
 
-            foreach ($methods as list($r, $parameters)) {
+            foreach ($methods as [$r, $parameters]) {
                 /** @var \ReflectionMethod $r */
 
                 // create a per-method map of argument-names to service/type-references
@@ -146,7 +146,7 @@ public function process(ContainerBuilder $container)
                     } elseif (isset($bindings[$bindingName = $type.' $'.$p->name]) || isset($bindings[$bindingName = '$'.$p->name]) || isset($bindings[$bindingName = $type])) {
                         $binding = $bindings[$bindingName];
 
-                        list($bindingValue, $bindingId, , $bindingType, $bindingFile) = $binding->getValues();
+                        [$bindingValue, $bindingId, , $bindingType, $bindingFile] = $binding->getValues();
                         $binding->setValues([$bindingValue, $bindingId, true, $bindingType, $bindingFile]);
 
                         if (!$bindingValue instanceof Reference) {

DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php

@@ -49,7 +49,7 @@ public function process(ContainerBuilder $container)
                 }
 
                 $controllerDef = $container->getDefinition($id);
-                foreach ($controllerDef->getMethodCalls() as list($method)) {
+                foreach ($controllerDef->getMethodCalls() as [$method]) {
                     if (0 === strcasecmp($action, $method)) {
                         $reason = sprintf('Removing method "%s" of service "%s" from controller candidates: the method is called at instantiation, thus cannot be an action.', $action, $id);
                         break;

Kernel.php

@@ -245,7 +245,7 @@ public function locateResource(string $name)
         $bundleName = substr($name, 1);
         $path = '';
         if (false !== strpos($bundleName, '/')) {
-            list($bundleName, $path) = explode('/', $bundleName, 2);
+            [$bundleName, $path] = explode('/', $bundleName, 2);
         }
 
         $bundle = $this->getBundle($bundleName);

Profiler/FileProfilerStorage.php

@@ -61,7 +61,7 @@ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, in
         $result = [];
         while (\count($result) < $limit && $line = $this->readLineFromFile($file)) {
             $values = str_getcsv($line);
-            list($csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode) = $values;
+            [$csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode] = $values;
             $csvTime = (int) $csvTime;
 
             if ($ip && false === strpos($csvIp, $ip) || $url && false === strpos($csvUrl, $url) || $method && false === strpos($csvMethod, $method) || $statusCode && false === strpos($csvStatusCode, $statusCode)) {

Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php

@@ -39,7 +39,7 @@ public function testServicesAreOrderedAccordingToPriority()
         $container = new ContainerBuilder();
         $container->setDefinition('argument_resolver', $definition);
 
-        foreach ($services as $id => list($tag)) {
+        foreach ($services as $id => [$tag]) {
             $container->register($id)->addTag('controller.argument_value_resolver', $tag);
         }
 
@@ -72,7 +72,7 @@ public function testInDebugWithStopWatchDefinition()
         $container->register('debug.stopwatch', Stopwatch::class);
         $container->setDefinition('argument_resolver', $definition);
 
-        foreach ($services as $id => list($tag)) {
+        foreach ($services as $id => [$tag]) {
             $container->register($id)->addTag('controller.argument_value_resolver', $tag);
         }
 

Tests/HttpCache/StoreTest.php

@@ -92,7 +92,7 @@ public function testSetsTheXContentDigestResponseHeaderBeforeStoring()
     {
         $cacheKey = $this->storeSimpleEntry();
         $entries = $this->getStoreMetadata($cacheKey);
-        list(, $res) = $entries[0];
+        [, $res] = $entries[0];
 
         $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]);
     }
@@ -103,7 +103,7 @@ public function testDoesNotTrustXContentDigestFromUpstream()
 
         $cacheKey = $this->store->write($this->request, $response);
         $entries = $this->getStoreMetadata($cacheKey);
-        list(, $res) = $entries[0];
+        [, $res] = $entries[0];
 
         $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]);
         $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $response->headers->get('X-Content-Digest'));

Tests/HttpCache/TestHttpKernel.php

@@ -43,13 +43,13 @@ public function assert(\Closure $callback)
     {
         $trustedConfig = [Request::getTrustedProxies(), Request::getTrustedHeaderSet()];
 
-        list($trustedProxies, $trustedHeaderSet, $backendRequest) = $this->backendRequest;
+        [$trustedProxies, $trustedHeaderSet, $backendRequest] = $this->backendRequest;
         Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
 
         try {
             $callback($backendRequest);
         } finally {
-            list($trustedProxies, $trustedHeaderSet) = $trustedConfig;
+            [$trustedProxies, $trustedHeaderSet] = $trustedConfig;
             Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
         }
     }