fix: prevent creating reserved name classes

Author: vardumper

docs/phpmd.md

@@ -13,6 +13,7 @@
 use Html\Element\BlockElement;
 use Html\Element\InlineElement;
 use Html\Element\VoidElement;
+use Html\Helper\Helper;
 use Html\Trait\ClassResolverTrait;
 use Html\Trait\GeneratorResolverTrait;
 use ReflectionClass;
@@ -114,7 +115,7 @@ public function __invoke(
                 // Generate PHP component class for twig-component generator
                 if ($name === 'twig-component' && method_exists($generatorInstance, 'renderComponentClass')) {
                     $componentClass = $generatorInstance->renderComponentClass($elementInstance);
-                    $componentName = ucfirst($elementInstance::QUALIFIED_NAME);
+                    $componentName = $this->getSafeComponentClassName(ucfirst($elementInstance::QUALIFIED_NAME));
 
                     // PHP classes go in src/Twig/{Block|Inline|Void}
                     $levelCap = ucfirst($level);
@@ -227,9 +228,9 @@ private function generateBundleFiles(string $bundleDir, bool $overwrite): void
 
 /**
  * HTML Component Bundle
- * 
+ *
  * Provides Symfony UX Twig Components for all HTML5 elements with ARIA support.
- * 
+ *
  * @author vardumper <info@erikpoehler.com>
  * @package Html\ComponentBundle
  */
@@ -319,4 +320,16 @@ public function getPath(): string
             $this->io->success("Generated: {$readmeFile}");
         }
     }
+
+    /**
+     * Get safe component class name, avoiding PHP reserved words
+     */
+    private function getSafeComponentClassName(string $className): string
+    {
+        $reserved = Helper::getReservedWords();
+        if (in_array(strtolower($className), $reserved, true)) {
+            return $className . 'Element';
+        }
+        return $className;
+    }
 }

src/Command/BatchGeneratorCommand.php

@@ -2,6 +2,7 @@
 
 namespace Html\TemplateGenerator;
 
+use Html\Helper\Helper;
 use Html\Interface\HTMLElementDelegatorInterface;
 use Html\Interface\TemplateGeneratorInterface;
 use Html\Mapping\TemplateGenerator;
@@ -101,7 +102,7 @@ public function renderComponentClass(HTMLElementDelegatorInterface $element): st
             ? $ref->getConstant('QUALIFIED_NAME')
             : strtolower($ref->getShortName());
 
-        $componentName = ucfirst($elementName);
+        $componentName = $this->getComponentClassName(ucfirst($elementName));
 
         // Determine the level (Block, Inline, or Void)
         $level = $this->determineComponentLevel($ref->getName());
@@ -282,6 +283,9 @@ public function renderComponentClass(HTMLElementDelegatorInterface $element): st
                 return "'{$type}'";
             }, $propData['allowedTypes']);
 
+            if (in_array('null', $propData['allowedTypes'])) {
+                $php .= "        \$resolver->setDefaults(['{$propName}' => null]);\n";
+            }
             $php .= "        \$resolver->setAllowedTypes('{$propName}', [" . implode(
                 ', ',
                 $allowedTypesFormatted
@@ -416,6 +420,7 @@ private function renderTemplate(HTMLElementDelegatorInterface $element): string
             }
         }
         $name = ucfirst($elementName);
+        $componentName = $this->getComponentClassName(ucfirst($elementName));
 
         // Build Twig Component template
         $twig = "{#\n";
@@ -424,7 +429,7 @@ private function renderTemplate(HTMLElementDelegatorInterface $element): string
         $twig .= "  Symfony UX Twig Component (Anonymous)\n";
         $twig .= "  @see https://symfony.com/bundles/ux-twig-component/current/index.html\n\n";
         $twig .= "  Usage:\n";
-        $twig .= '    <twig:' . ucfirst($elementName);
+        $twig .= '    <twig:' . $componentName;
 
         // Add example usage
         $exampleProps = [];
@@ -447,7 +452,7 @@ private function renderTemplate(HTMLElementDelegatorInterface $element): string
         } else {
             $twig .= ">\n";
             $twig .= "      Content goes here\n";
-            $twig .= '    </twig:' . ucfirst($elementName) . ">\n";
+            $twig .= '    </twig:' . $componentName . ">\n";
         }
 
         $twig .= "\n  @author vardumper <info@erikpoehler.com>\n";
@@ -495,7 +500,7 @@ private function buildComposedTemplate(
         string $description,
         array $parentOf
     ): string {
-        $componentName = ucfirst($elementName);
+        $componentName = $this->getComponentClassName(ucfirst($elementName));
 
         $twig = "{#\n";
         $twig .= "  This file is auto-generated.\n\n";
@@ -550,7 +555,7 @@ private function collectChildrenForComposedTemplate(array $parentOf): array
                 ? $childRef->getConstant('QUALIFIED_NAME')
                 : strtolower($childRef->getShortName());
 
-            $childComponentName = ucfirst($childElementName);
+            $childComponentName = $this->getComponentClassName(ucfirst($childElementName));
             $isSelfClosing = $childRef->hasConstant('SELF_CLOSING') && $childRef->getConstant('SELF_CLOSING');
 
             $twigCode = '';
@@ -606,4 +611,16 @@ private function determineComponentLevel(string $className): string
         }
         return 'block';
     }
+
+    /**
+     * Get safe component class name, avoiding PHP reserved words
+     */
+    private function getComponentClassName(string $className): string
+    {
+        $reserved = Helper::getReservedWords();
+        if (in_array(strtolower($className), $reserved, true)) {
+            return $className . 'Element';
+        }
+        return $className;
+    }
 }

src/TemplateGenerator/TwigComponentsGenerator.php

@@ -1,12 +1,11 @@
-# Twig Component Bundle with all HTML5 elements
+# HTML Component Bundle
 
-Symfony UX Twig Components for all HTML5 elements with ARIA support and static attribute validation via Enums.
-It provides auto-completion in your IDE of choice, so all available attributes can be quickly accessed. 
+Symfony UX Twig Components for all HTML5 elements with ARIA support.
 
 ## Installation
 
 ```bash
-composer require vardumper/html5-twig-component-bundle
+composer require html/component-bundle
 ```
 
 ## Configuration
@@ -16,7 +15,7 @@ Register the bundle in `config/bundles.php`:
 ```php
 return [
     // ...
-    Html\TwigComponentBundle\HtmlTwigComponentBundle::class => ['all' => true],
+    Html\ComponentBundle\HtmlComponentBundle::class => ['all' => true],
 ];
 ```
 
@@ -51,8 +50,6 @@ Components are organized by type:
 - `Inline` - Inline elements (span, a, strong, etc.)
 - `Void` - Self-closing elements (img, input, br, etc.)
 
-## Read More
-* [Extended HTMLDocument Documentation](https://vardumper.github.io/extended-htmldocument/)
-* [Extended HTMLDocument Github Repository](https://github.com/vardumper/extended-htmldocument)
-* [Twig Components](https://symfony.com/bundles/ux-twig-component/current/index.html)
-* [Symfony UX](https://ux.symfony.com/)
+## License
+
+MIT

templates/twig-component/README.md

@@ -1,5 +1,5 @@
 {
-    "name": "vardumper/html5-twig-component-bundle",
+    "name": "vardumper/html5-ux-twig-component-bundle",
     "description": "Symfony UX Twig Components for typesafe HTML5 elements with ARIA support & enum validation",
     "type": "symfony-bundle",
     "license": "MIT",
@@ -9,7 +9,7 @@
         "components",
         "html5",
         "aria",
-        "symfony-ux"
+        "ux"
     ],
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^8.4",
+        "php": "^8.2",
         "symfony/twig-bundle": "^6.0|^7.0",
         "symfony/ux-twig-component": "^2.0",
         "vardumper/extended-htmldocument": "^0.2"

templates/twig-component/composer.json

@@ -0,0 +1,21 @@
+<?php
+
+namespace Html\ComponentBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * HTML Component Bundle
+ *
+ * Provides Symfony UX Twig Components for all HTML5 elements with ARIA support.
+ *
+ * @author vardumper <info@erikpoehler.com>
+ * @package Html\ComponentBundle
+ */
+class HtmlComponentBundle extends Bundle
+{
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
+}

templates/twig-component/src/HtmlComponentBundle.php

@@ -7,9 +7,9 @@
   @see https://symfony.com/bundles/ux-twig-component/current/index.html
 
   Usage:
-    <twig:Object ariaAtomic="false" ariaBusy="true">
+    <twig:ObjectElement ariaAtomic="false" ariaBusy="true">
       Content goes here
-    </twig:Object>
+    </twig:ObjectElement>
 
   @author vardumper <info@erikpoehler.com>
   @package vardumper/extended-htmldocument

templates/twig-component/src/Resources/block/object/object.html.twig

@@ -7,9 +7,9 @@
   @see https://symfony.com/bundles/ux-twig-component/current/index.html
 
   Usage:
-    <twig:Var ariaAtomic="false" ariaBusy="true">
+    <twig:VarElement ariaAtomic="false" ariaBusy="true">
       Content goes here
-    </twig:Var>
+    </twig:VarElement>
 
   @author vardumper <info@erikpoehler.com>
   @package vardumper/extended-htmldocument