Allowing config to just be a template dir... and with trailing slash

weaverryan · Sep 23, 2023 · 85e3bef · 85e3bef
1 parent 173e53f
commit 85e3bef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/TwigComponent/src/DependencyInjection/Compiler/TwigComponentPass.php b/src/TwigComponent/src/DependencyInjection/Compiler/TwigComponentPass.php
@@ -101,6 +101,6 @@ private function calculateTemplate(string $componentName, ?array $defaults): str
             $componentName = substr($componentName, \strlen($defaults['name_prefix']) + 1);
         }
 
-        return sprintf('%s/%s.html.twig', $directory, str_replace(':', '/', $componentName));
+        return sprintf('%s/%s.html.twig', rtrim($directory, '/'), str_replace(':', '/', $componentName));
     }
 }
diff --git a/src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php b/src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php
@@ -43,7 +43,7 @@
  */
 final class TwigComponentExtension extends Extension implements ConfigurationInterface
 {
-    const DEPRECATED_DEFAULT_KEY = '__deprecated__use_old_naming_behavior';
+    private const DEPRECATED_DEFAULT_KEY = '__deprecated__use_old_naming_behavior';
 
     public function load(array $configs, ContainerBuilder $container): void
     {
@@ -135,7 +135,7 @@ public function getConfigTreeBuilder()
                     ->defaultValue([self::DEPRECATED_DEFAULT_KEY])
                     ->useAttributeAsKey('namespace')
                     ->validate()
-                        ->always(function($v) {
+                        ->always(function ($v) {
                             foreach ($v as $namespace => $defaults) {
                                 if (!str_ends_with($namespace, '\\')) {
                                     throw new InvalidConfigurationException(sprintf('The twig_component.defaults namespace "%s" is invalid: it must end in a "\"', $namespace));
@@ -147,6 +147,12 @@ public function getConfigTreeBuilder()
                     ->end()
                     // validate that namespace ends in \
                     ->arrayPrototype()
+                        ->beforeNormalization()
+                            ->ifString()
+                            ->then(function (string $v) {
+                                return ['template_directory' => $v];
+                            })
+                        ->end()
                         ->children()
                             ->scalarNode('template_directory')
                                 ->defaultValue('components')

diff --git a/src/TwigComponent/tests/Fixtures/Kernel.php b/src/TwigComponent/tests/Fixtures/Kernel.php
@@ -61,7 +61,7 @@ protected function configureContainer(ContainerConfigurator $c): void
             }
             $c->extension('twig_component', [
                 'defaults' => [
-                    'Symfony\UX\TwigComponent\Tests\Fixtures\Component\\' => [],
+                    'Symfony\UX\TwigComponent\Tests\Fixtures\Component\\' => 'components/',
                     'Symfony\UX\TwigComponent\Tests\Fixtures\AcmeComponent\\' => $acmeDefaults,
                 ],
             ]);