Merge branch 'symfony:2.x' into live-component-force-post-requests

Author: hepisec

src/TwigComponent/src/Twig/ComponentNode.php

@@ -13,6 +13,7 @@
 
 use Symfony\UX\TwigComponent\BlockStack;
 use Twig\Compiler;
+use Twig\Extension\CoreExtension;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
 
@@ -43,6 +44,17 @@ public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
+        // since twig/twig 3.9.0: Using the internal "twig_to_array" function is deprecated.
+        $compiler
+            ->write('$toArray = function ($data) {')
+        ;
+
+        if (method_exists(CoreExtension::class, 'toArray')) {
+            $compiler->write('return Twig\Extension\CoreExtension::toArray($data);};');
+        } else {
+            $compiler->write('return twig_to_array($data);};');
+        }
+
         /*
          * Block 1) PreCreateForRender handling
          *
@@ -55,7 +67,7 @@ public function compile(Compiler $compiler): void
             ->raw(']->extensionPreCreateForRender(')
             ->string($this->getAttribute('component'))
             ->raw(', ')
-            ->raw('twig_to_array(')
+            ->raw('$toArray(')
         ;
         $this->writeProps($compiler)
             ->raw(')')
@@ -86,7 +98,7 @@ public function compile(Compiler $compiler): void
             ->string(ComponentExtension::class)
             ->raw(']->startEmbeddedComponentRender(')
             ->string($this->getAttribute('component'))
-            ->raw(', twig_to_array(')
+            ->raw(', $toArray(')
         ;
         $this->writeProps($compiler)
             ->raw('), ')

src/TwigComponent/src/Twig/PropsTokenParser.php

@@ -30,7 +30,7 @@ public function parse(Token $token): Node
         $names = [];
         $values = [];
         while (!$stream->nextIf(Token::BLOCK_END_TYPE)) {
-            $name = $stream->expect(\Twig\Token::NAME_TYPE)->getValue();
+            $name = $stream->expect(Token::NAME_TYPE)->getValue();
 
             if ($stream->nextIf(Token::OPERATOR_TYPE, '=')) {
                 $values[$name] = $parser->getExpressionParser()->parseExpression();
@@ -39,7 +39,7 @@ public function parse(Token $token): Node
             $names[] = $name;
 
             if (!$stream->nextIf(Token::PUNCTUATION_TYPE)) {
-                $stream->expect(\Twig\Token::BLOCK_END_TYPE);
+                $stream->expect(Token::BLOCK_END_TYPE);
                 break;
             }
         }