fix null props not overwrite parent context

Author: WebMamba

src/TwigComponent/src/Twig/PropsNode.php

@@ -73,7 +73,23 @@ public function compile(Compiler $compiler): void
                 ->raw(";\n")
                 ->outdent()
                 ->write('}')
-                ->write("\n");
+                ->write("\n")
+            ;
+
+            // overwrite the context value if a props with a similar name and a default value exist
+            if ($this->hasNode($name)) {
+                $compiler
+                    ->write('if (isset($context[\'__context\'][\''.$name.'\'])) {')
+                    ->raw("\n")
+                    ->indent()
+                    ->write('$context[\''.$name.'\'] = ')
+                    ->subcompile($this->getNode($name))
+                    ->raw(";\n")
+                    ->outdent()
+                    ->write('}')
+                    ->raw("\n")
+                ;
+            }
         }
 
         $compiler
@@ -94,20 +110,5 @@ public function compile(Compiler $compiler): void
             ->write('}')
             ->raw("\n")
         ;
-
-        // overwrite the context value if a props with a similar name and a default value exist
-        if ($this->hasNode($name)) {
-            $compiler
-                ->write('if (isset($context[\'__context\'][\''.$name.'\'])) {')
-                ->raw("\n")
-                ->indent()
-                ->write('$context[\''.$name.'\'] = ')
-                ->subcompile($this->getNode($name))
-                ->raw(";\n")
-                ->outdent()
-                ->write('}')
-                ->raw("\n")
-            ;
-        }
     }
 }

src/TwigComponent/tests/Fixtures/templates/anonymous_component_with_props_overwrite_parents_props.html.twig

@@ -0,0 +1,3 @@
+<twig:Alert size='md'>
+    <twig:Icon/>
+</twig:Alert>

src/TwigComponent/tests/Fixtures/templates/components/Alert.html.twig

@@ -31,5 +31,6 @@
 }) %}
 
 <div class="{{ alert.apply({color, size}, attributes.render('class'), 'flex p-4') }}">
-    ...
+    {% block content %}
+    {% endblock %}
 </div>

src/TwigComponent/tests/Fixtures/templates/components/Icon.html.twig

@@ -0,0 +1,6 @@
+{% props size = null %}
+
+<p>I am an icon</p>
+{% if size is not null %}
+    <p>I am {{ size }}</p>
+{% endif %}

src/TwigComponent/tests/Integration/ComponentExtensionTest.php

@@ -366,6 +366,14 @@ public function testComponentWithConflictBetweenPropsFromTemplateAndClass(): voi
         self::getContainer()->get(Environment::class)->render('component_with_conflict_between_props_from_template_and_class.html.twig');
     }
 
+    public function testAnonymousComponentWithPropsOverwriteParentsProps(): void
+    {
+        $output = self::getContainer()->get(Environment::class)->render('anonymous_component_with_props_overwrite_parents_props.html.twig');
+
+        $this->assertStringContainsString('I am an icon', $output);
+        $this->assertStringNotContainsString('I am md', $output);
+    }
+
     private function renderComponent(string $name, array $data = []): string
     {
         return self::getContainer()->get(Environment::class)->render('render_component.html.twig', [