Merge branch '5.1' into 5.x

symfony · Oct 28, 2020 · 8daf9ed · 8daf9ed
2 parents 4ede087 + 1659352
commit 8daf9ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -147,7 +147,7 @@ private function displayPathsText(SymfonyStyle $io, string $name)
                     $shortnames[] = str_replace('\\', '/', $file->getRelativePathname());
                 }
 
-                list($namespace, $shortname) = $this->parseTemplateName($name);
+                [$namespace, $shortname] = $this->parseTemplateName($name);
                 $alternatives = $this->findAlternatives($shortname, $shortnames);
                 if (FilesystemLoader::MAIN_NAMESPACE !== $namespace) {
                     $alternatives = array_map(function ($shortname) use ($namespace) {
@@ -452,7 +452,7 @@ private function error(SymfonyStyle $io, string $message, array $alternatives =
 
     private function findTemplateFiles(string $name): array
     {
-        list($namespace, $shortname) = $this->parseTemplateName($name);
+        [$namespace, $shortname] = $this->parseTemplateName($name);
 
         $files = [];
         foreach ($this->getFilesystemLoaders() as $loader) {

diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -66,7 +66,7 @@ public function abbrClass(string $class): string
     public function abbrMethod(string $method): string
     {
         if (false !== strpos($method, '::')) {
-            list($class, $method) = explode('::', $method, 2);
+            [$class, $method] = explode('::', $method, 2);
             $result = sprintf('%s::%s()', $this->abbrClass($class), $method);
         } elseif ('Closure' === $method) {
             $result = sprintf('<abbr title="%s">%1$s</abbr>', $method);

diff --git a/Node/TransNode.php b/Node/TransNode.php
@@ -52,7 +52,7 @@ public function compile(Compiler $compiler): void
             $defaults = $this->getNode('vars');
             $vars = null;
         }
-        list($msg, $defaults) = $this->compileString($this->getNode('body'), $defaults, (bool) $vars);
+        [$msg, $defaults] = $this->compileString($this->getNode('body'), $defaults, (bool) $vars);
 
         $compiler
             ->write('echo $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans(')