[TwigComponent] Allow input props to have the same name as context variables

Author: squrious

src/TwigComponent/src/ComponentRenderer.php

@@ -113,12 +113,14 @@ private function preRender(MountedComponent $mounted, array $context = []): PreR
 
         // expose public properties and properties marked with ExposeInTemplate attribute
         $props = array_merge($mounted->getInputProps(), $classProps);
+        $propsKeys = \array_keys($props);
         $variables = array_merge(
             // first so values can be overridden
             $context,
             // add the context in a separate variable to keep track
-            // of what is coming from outside the component
-            ['__context' => $context],
+            // of what is coming from outside the component, excluding props
+            // as they override initial context values
+            ['__context' => \array_filter($context, static fn($key) => !\in_array($key, $propsKeys), \ARRAY_FILTER_USE_KEY)],
             // keep reference to old context
             ['outerScope' => $context],
             // add the component as "this"

src/TwigComponent/src/Twig/PropsNode.php

@@ -100,18 +100,13 @@ public function compile(Compiler $compiler): void
             $compiler
                 ->write('if (isset($context[\'__context\'][\''.$name.'\'])) {')
                 ->raw("\n")
-                ->write('$contextValue = $context[\'__context\'][\''.$name.'\'];')
-                ->raw("\n")
-                ->write('$propsValue = $context[\''.$name.'\'];')
-                ->raw("\n")
-                ->write('if ($contextValue === $propsValue) {')
-                ->raw("\n")
+                ->indent()
                 ->write('$context[\''.$name.'\'] = ')
                 ->subcompile($this->getNode($name))
                 ->raw(";\n")
+                ->outdent()
                 ->write('}')
                 ->raw("\n")
-                ->write('}')
             ;
         }
     }

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

@@ -0,0 +1,5 @@
+{% set message = 'bar' %}
+
+<twig:Message :message="message">
+    <p>Hey!</p>
+</twig:Message>

src/TwigComponent/tests/Integration/ComponentExtensionTest.php

@@ -204,6 +204,13 @@ public function testComponentPropsOverwriteContextValue(): void
         $this->assertStringContainsString('<p>foo</p>', $output);
     }
 
+    public function testComponentPropsOverwriteContextValueWithInputProp(): void
+    {
+        $output = self::getContainer()->get(Environment::class)->render('anonymous_component_with_input_prop_with_same_name_in_context.html.twig');
+
+        $this->assertStringContainsString('<p>bar</p>', $output);
+    }
+
     public function testComponentPropsWithTrailingComma(): void
     {
         $output = self::getContainer()->get(Environment::class)->render('anonymous_component_props_trailing_comma.html.twig');