create-prisma-php-app 1.26.529 → 1.26.531

package/dist/src/Lib/PHPX/PHPX.php

@@ -47,41 +47,59 @@ class PHPX implements IPHPX
     /**
      * Combines and returns the CSS classes for the component.
      *
-     * This method merges the optional base CSS class with additional classes
-     * defined in the component's `$class` property. If no base class is provided,
-     * only the component's `$class` property will be used. It ensures that there 
-     * are no duplicate classes and the classes are properly formatted.
+     * This method merges the provided classes, which can be either strings or arrays of strings,
+     * with the component's `$class` property. It uses the `Utils::mergeClasses` method to ensure
+     * that the resulting CSS class string is optimized, with duplicate or conflicting classes removed.
      *
-     * @param string $baseClass The optional base CSS class to be merged. Defaults to an empty string.
-     * @return string The merged CSS class string.
+     * ### Features:
+     * - Accepts multiple arguments as strings or arrays of strings.
+     * - Automatically merges the provided classes with `$this->class`.
+     * - Ensures the final CSS class string is well-formatted and free of conflicts.
+     *
+     * @param string|array ...$classes The CSS classes to be merged. Each argument can be a string or an array of strings.
+     * @return string A single CSS class string with the merged and optimized classes, including `$this->class`.
      */
-    protected function getMergeClasses(string $baseClass = ''): string
+    protected function getMergeClasses(string|array ...$classes): string
     {
-        return TwMerge::mergeClasses($baseClass, $this->class);
+        return TwMerge::mergeClasses($classes, $this->class);
     }
 
     /**
      * Generates and returns a string of HTML attributes from the provided props.
      * Excludes 'class' and 'children' props from being added as attributes.
-     * 
-     * @return string The generated HTML attributes.
+     * Prioritizes attributes from `$this->props` if duplicates are found in `$params`.
+     *
+     * @param array $params Optional additional attributes to merge with props.
+     *
+     * @return string The generated HTML attributes as a space-separated string.
      */
-    protected function getAttributes(): string
+    protected function getAttributes(array $params = []): string
     {
         // Filter out 'class' and 'children' props
-        $filteredProps = array_filter($this->props, function ($key) {
-            return !in_array($key, ['class', 'children']);
-        }, ARRAY_FILTER_USE_KEY);
+        $filteredProps = array_filter(
+            $this->props,
+            function ($key) {
+                return !in_array($key, ["class", "children"]);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+
+        // Merge attributes, prioritizing props in case of duplicates
+        $attributes = array_merge($params, $filteredProps);
 
-        // Build attributes string by escaping keys and values
-        $attributes = [];
-        foreach ($filteredProps as $key => $value) {
-            $escapedKey = htmlspecialchars($key, ENT_QUOTES, 'UTF-8');
-            $escapedValue = htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8');
-            $attributes[] = "$escapedKey='$escapedValue'";
+        // Build the attributes string by escaping keys and values
+        $attributeStrings = [];
+        foreach ($attributes as $key => $value) {
+            $escapedKey = htmlspecialchars($key, ENT_QUOTES, "UTF-8");
+            $escapedValue = htmlspecialchars(
+                (string) $value,
+                ENT_QUOTES,
+                "UTF-8"
+            );
+            $attributeStrings[] = "$escapedKey='$escapedValue'";
         }
 
-        return implode(' ', $attributes);
+        return implode(" ", $attributeStrings);
     }
 
     /**

package/dist/src/Lib/PHPX/TemplateCompiler.php

@@ -37,6 +37,9 @@ class TemplateCompiler
             self::initializeClassMappings();
         }
 
+        // Escape `&` characters that are not part of valid XML entities
+        $templateContent = preg_replace('/&(?![a-zA-Z0-9#]+;)/', '&', $templateContent);
+
         $dom = new DOMDocument();
         libxml_use_internal_errors(true);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "1.26.529",
+  "version": "1.26.531",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",