Applying patch from fabbot

symfony · liarco · Oct 29, 2020 · Oct 29, 2020 · Oct 30, 2020 · Oct 30, 2020
commit e2934b599a84de5de300bdb54951665942dc2c3c
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -189,7 +189,7 @@ private function getReadVariablesFromNode(Node $node): ?array

            foreach ($node as $key => $variable) {
                // Odd children are variable names, even ones are values
-                if ($key % 2 == 1) {
+                if (1 == $key % 2) {
                    continue;
                }


diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -86,8 +86,8 @@ protected function extractTemplate(string $template, MessageCatalogue $catalogue
                $catalogue->setMetadata($id, ['notes' => [
                    [
                        'category' => 'symfony-extractor-variables',
-                        'content' => 'Available variables: ' . join(', ', $message[2]),
-                    ]
+                        'content' => 'Available variables: '.implode(', ', $message[2]),
+                    ],
                ]], $message[1] ?: $this->defaultDomain);
            }
        }

@@ -347,8 +347,8 @@ protected function parseTokens(array $tokens, MessageCatalogue $catalog, string
                        $catalog->setMetadata($message, ['notes' => [
                            [
                                'category' => 'symfony-extractor-variables',
-                                'content' => 'Available variables: ' . join(', ', $variables),
-                            ]
+                                'content' => 'Available variables: '.implode(', ', $variables),
+                            ],
                        ]], $domain);
                    }
-Original file line number
+Diff line change
@@ -189,7 +189,7 @@ private function getReadVariablesFromNode(Node $node): ?array
                 foreach ($node as $key => $variable) {
                   welcoMattic marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
                     // Odd children are variable names, even ones are values
-                    if ($key % 2 == 1) {
+                    if (1 == $key % 2) {
                         continue;
                     }
-          Expand Down