Fix Anonymous component props and Class backed component properties d…

src/TwigComponent/src/ComponentRenderer.php

@@ -120,6 +120,8 @@ private function preRender(MountedComponent $mounted, array $context = []): PreR
 
         $component = $mounted->getComponent();
         $metadata = $this->factory->metadataFor($mounted->getName());
+        // expose public properties and properties marked with ExposeInTemplate attribute
+        $props = iterator_to_array($this->exposedVariables($component, $metadata->isPublicPropsExposed()));
         $variables = array_merge(
             // first so values can be overridden
             $context,
@@ -132,9 +134,8 @@ private function preRender(MountedComponent $mounted, array $context = []): PreR
 
             // add attributes
             [$metadata->getAttributesVar() => $mounted->getAttributes()],
-
-            // expose public properties and properties marked with ExposeInTemplate attribute
-            iterator_to_array($this->exposedVariables($component, $metadata->isPublicPropsExposed())),
+            $props,
+            ['__props' => $props]
         );
         $event = new PreRenderEvent($mounted, $metadata, $variables);
 

src/TwigComponent/src/Twig/PropsNode.php

@@ -37,7 +37,7 @@ public function compile(Compiler $compiler): void
             $compiler
                 ->write('$propsNames[] = \''.$name.'\';')
                 ->write('$context[\'attributes\'] = $context[\'attributes\']->remove(\''.$name.'\');')
-                ->write('if (!isset($context[\''.$name.'\'])) {');
+                ->write('if (!isset($context[\'__props\'][\''.$name.'\'])) {');
 
             if (!$this->hasNode($name)) {
                 $compiler

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

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

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

@@ -0,0 +1,5 @@
+{% props message = 'foo' %}
+
+<p>{{ message }}</p>
+{% block content %}
+{% endblock %}

src/TwigComponent/tests/Integration/ComponentExtensionTest.php

@@ -195,6 +195,13 @@ public function testRenderAnonymousComponentWithNonScalarProps(): void
         $this->assertStringContainsString('class variable defined? no', $output);
     }
 
+    public function testComponentPropsOverwriteContextValue(): void
+    {
+        $output = self::getContainer()->get(Environment::class)->render('anonymous_component_with_variable_already_in_context.html.twig');
+
+        $this->assertStringContainsString('<p>foo</p>', $output);
+    }
+
     private function renderComponent(string $name, array $data = []): string
     {
         return self::getContainer()->get(Environment::class)->render('render_component.html.twig', [