Use php-forge/awesome-widget stable version. (#253)

php-forge · Jan 23, 2024 · 55a2398 · 55a2398
1 parent f18fbaf
commit 55a2398
Show file tree

Hide file tree

Showing 122 changed files with 856 additions and 325 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -9,6 +9,7 @@ finder:
     - vendor
 
 enabled:
+  - alpha_ordered_traits
   - array_indentation
   - array_push
   - combine_consecutive_issets
@@ -19,6 +20,7 @@ enabled:
   - fully_qualified_strict_types
   - function_to_constant
   - hash_to_slash_comment
+  - integer_literal_case
   - is_null
   - logical_operators
   - magic_constant_casing
@@ -55,7 +57,6 @@ enabled:
   - phpdoc_order
   - phpdoc_property
   - phpdoc_scalar
-  - phpdoc_separation
   - phpdoc_singular_inheritdoc
   - phpdoc_trim
   - phpdoc_trim_consecutive_blank_line_separation
@@ -77,9 +78,8 @@ enabled:
   - trailing_comma_in_multiline_array
   - unalign_double_arrow
   - unalign_equals
-  - empty_loop_body_braces
-  - integer_literal_case
   - union_type_without_spaces
 
 disabled:
   - function_declaration
+  - psr12_braces
diff --git a/composer.json b/composer.json
@@ -16,16 +16,16 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-mbstring": "*",
-        "php-forge/awesome-widget": "^1.0@dev",
+        "php-forge/awesome-widget": "^0.1",
         "voku/anti-xss": "^4.1"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.3",
-        "php-forge/support": "^1.0@dev",
+        "maglnet/composer-require-checker": "^4.7",
+        "php-forge/support": "^0.1",
         "phpunit/phpunit": "^10.5",
-        "roave/infection-static-analysis-plugin": "^1.3",
-        "symplify/easy-coding-standard": "^11.5",
-        "vimeo/psalm": "^5.18"
+        "roave/infection-static-analysis-plugin": "^1.34",
+        "symplify/easy-coding-standard": "^12.1",
+        "vimeo/psalm": "^5.20"
     },
     "autoload": {
         "psr-4": {
@@ -39,14 +39,14 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.0.x-dev"
+            "dev-main": "0.1-dev"
         }
     },
     "config": {
-        "sort-packages": true,
         "allow-plugins": {
             "infection/extension-installer": true
-        }
+        },
+        "sort-packages": true
     },
     "scripts": {
         "check-dependencies": "composer-require-checker",
@@ -57,13 +57,5 @@
         ],
         "psalm": "psalm",
         "test": "phpunit"
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "name": "php-forge/awesome-widget",
-            "url": "https://github.com/php-forge/awesome-widget",
-            "branch": "main"
-        }
-    ]
+    }
 }
diff --git a/ecs.php b/ecs.php
@@ -7,41 +7,33 @@
 use PhpCsFixer\Fixer\ClassNotation\OrderedTraitsFixer;
 use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return function (ECSConfig $ecsConfig): void {
-    $ecsConfig->paths(
+return ECSConfig::configure()
+    ->withConfiguredRule(
+        ClassDefinitionFixer::class,
+        [
+            'space_before_parenthesis' => true,
+        ],
+    )
+    ->withFileExtensions(['php'])
+    ->withPaths(
         [
             __DIR__ . '/src',
             __DIR__ . '/tests',
-        ]
-    );
-
-    // this way you add a single rule
-    $ecsConfig->rules(
+        ],
+    )
+    ->withPreparedSets(
+        arrays: true,
+        cleanCode: true,
+        comments:true,
+        docblocks: true,
+        namespaces: true,
+        psr12: true
+    )
+    ->withRules(
         [
+            NoUnusedImportsFixer::class,
             OrderedClassElementsFixer::class,
             OrderedTraitsFixer::class,
-            NoUnusedImportsFixer::class,
         ]
     );
-
-    // this way you can add sets - group of rules
-    $ecsConfig->sets(
-        [
-            // run and fix, one by one
-            SetList::DOCBLOCK,
-            SetList::NAMESPACES,
-            SetList::COMMENTS,
-            SetList::PSR_12,
-        ]
-    );
-
-    // this way configures a rule
-    $ecsConfig->ruleWithConfiguration(
-        ClassDefinitionFixer::class,
-        [
-            'space_before_parenthesis' => true,
-        ],
-    );
-};
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache">
-  <php>
-    <ini name="error_reporting" value="-1"/>
-  </php>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  cacheDirectory=".phpunit.cache"
+  colors="true"
+  executionOrder="depends,defects"
+  failOnRisky="true"
+  failOnWarning="true"
+  stopOnFailure="false"
+>
   <testsuites>
     <testsuite name="Html">
-      <directory>./tests</directory>
+      <directory>tests</directory>
     </testsuite>
   </testsuites>
+
   <source>
     <include>
-      <directory>./src</directory>
+      <directory suffix=".php">./src</directory>
     </include>
-    <exclude>
-      <directory>./vendor</directory>
-    </exclude>
   </source>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0"?>
 <psalm
   errorLevel="1"
+  findUnusedBaselineEntry="true"
+  findUnusedCode="false"
   resolveFromConfigFile="true"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="https://getpsalm.org/schema/config"
   xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-  findUnusedBaselineEntry="true"
-  findUnusedCode="false"
 >
   <projectFiles>
     <directory name="src" />
-    <ignoreFiles>
-      <directory name="vendor" />
-    </ignoreFiles>
   </projectFiles>
   <issueHandlers>
     <MixedAssignment errorLevel="suppress" />

diff --git a/src/Attribute/Custom/HasDataBsAutoClose.php b/src/Attribute/Custom/HasDataBsAutoClose.php
@@ -20,6 +20,8 @@ trait HasDataBsAutoClose
      */
     public function dataBsAutoClose(string $value): static
     {
-        return $this->dataAttributes([DataAttributes::BS_AUTO_CLOSE => $value]);
+        return $this->dataAttributes([
+            DataAttributes::BS_AUTO_CLOSE => $value,
+        ]);
     }
 }
diff --git a/src/Attribute/Custom/HasDataBsDismiss.php b/src/Attribute/Custom/HasDataBsDismiss.php
@@ -20,6 +20,8 @@ trait HasDataBsDismiss
      */
     public function dataBsDismiss(string $value): static
     {
-        return $this->dataAttributes([DataAttributes::BS_DISMISS => $value]);
+        return $this->dataAttributes([
+            DataAttributes::BS_DISMISS => $value,
+        ]);
     }
 }
diff --git a/src/Attribute/Custom/HasDataBsTarget.php b/src/Attribute/Custom/HasDataBsTarget.php
@@ -24,7 +24,9 @@ trait HasDataBsTarget
     public function dataBsTarget(bool|string $value): static
     {
         if (is_string($value)) {
-            return $this->dataAttributes([DataAttributes::BS_TARGET => $value]);
+            return $this->dataAttributes([
+                DataAttributes::BS_TARGET => $value,
+            ]);
         }
 
         $new = clone $this;

diff --git a/src/Attribute/Custom/HasDataBsToggle.php b/src/Attribute/Custom/HasDataBsToggle.php
@@ -20,6 +20,8 @@ trait HasDataBsToggle
      */
     public function dataBsToggle(string $value): static
     {
-        return $this->dataAttributes([DataAttributes::BS_TOGGLE => $value]);
+        return $this->dataAttributes([
+            DataAttributes::BS_TOGGLE => $value,
+        ]);
     }
 }
diff --git a/src/Attribute/Custom/HasDataCollapseToggle.php b/src/Attribute/Custom/HasDataCollapseToggle.php
@@ -20,6 +20,8 @@ trait HasDataCollapseToggle
      */
     public function dataCollapseToggle(string $value): static
     {
-        return $this->dataAttributes([DataAttributes::COLLAPSE_TOGGLE => $value]);
+        return $this->dataAttributes([
+            DataAttributes::COLLAPSE_TOGGLE => $value,
+        ]);
     }
 }
diff --git a/src/Attribute/Custom/HasDataDismissTarget.php b/src/Attribute/Custom/HasDataDismissTarget.php
@@ -22,7 +22,9 @@ trait HasDataDismissTarget
     public function dataDismissTarget(bool|string $value): static
     {
         if (is_string($value)) {
-            return $this->dataAttributes([DataAttributes::DISMISS_TARGET => $value]);
+            return $this->dataAttributes([
+                DataAttributes::DISMISS_TARGET => $value,
+            ]);
         }
 
         $new = clone $this;

diff --git a/src/Attribute/Custom/HasDataDrawerTarget.php b/src/Attribute/Custom/HasDataDrawerTarget.php
@@ -24,7 +24,9 @@ trait HasDataDrawerTarget
     public function dataDrawerTarget(bool|string $value): static
     {
         if (is_string($value)) {
-            return $this->dataAttributes([DataAttributes::DRAWER_TARGET => $value]);
+            return $this->dataAttributes([
+                DataAttributes::DRAWER_TARGET => $value,
+            ]);
         }
 
         $new = clone $this;

diff --git a/src/Attribute/Custom/HasDataDropdownToggle.php b/src/Attribute/Custom/HasDataDropdownToggle.php
@@ -24,7 +24,9 @@ trait HasDataDropdownToggle
     public function dataDropdownToggle(bool|string $value): static
     {
         if (is_string($value)) {
-            return $this->dataAttributes([DataAttributes::DROPDOWN_TOGGLE => $value]);
+            return $this->dataAttributes([
+                DataAttributes::DROPDOWN_TOGGLE => $value,
+            ]);
         }
 
         $new = clone $this;

diff --git a/src/Attribute/Custom/HasDataToggle.php b/src/Attribute/Custom/HasDataToggle.php
@@ -24,7 +24,9 @@ trait HasDataToggle
     public function dataToggle(bool|string $value): static
     {
         if (is_string($value)) {
-            return $this->dataAttributes([DataAttributes::TOGGLE => $value]);
+            return $this->dataAttributes([
+                DataAttributes::TOGGLE => $value,
+            ]);
         }
 
         $new = clone $this;

diff --git a/src/Base/AbstractSelect.php b/src/Base/AbstractSelect.php
@@ -115,13 +115,16 @@ private function renderItems(mixed $formValue): array
                 $options = [];
 
                 foreach ($content as $v => $c) {
-                    /** @psalm-var array */
+                    /** @psalm-var array[] $itemsAttributes */
                     $itemsAttributes[$v] ??= [];
                     $options[] = Tag::widget()
                         ->attributes(
                             array_merge(
                                 $itemsAttributes[$v],
-                                ['selected' => in_array($v, $formValue), 'value' => $v],
+                                [
+                                    'selected' => in_array($v, $formValue),
+                                    'value' => $v,
+                                ],
                             )
                         )
                         ->content($c)
@@ -135,13 +138,16 @@ private function renderItems(mixed $formValue): array
                     ->tagName('optgroup')
                     ->render();
             } else {
-                /** @psalm-var array */
+                /** @psalm-var array[] $itemsAttributes */
                 $itemsAttributes[$value] ??= [];
                 $items[] = Tag::widget()
                     ->attributes(
                         array_merge(
                             $itemsAttributes[$value],
-                            ['selected' => in_array($value, $formValue), 'value' => $value],
+                            [
+                                'selected' => in_array($value, $formValue),
+                                'value' => $value,
+                            ],
                         )
                     )
                     ->content($content)

diff --git a/src/ButtonToggle.php b/src/ButtonToggle.php
@@ -76,11 +76,11 @@ protected function run(): string
 
         $id = $this->generateId('button-toggle-');
 
-        if ($this->ariaControls) {
+        if ($this->ariaControls === true) {
             $attributes['aria-controls'] = $this->toggleId;
         }
 
-        if ($this->dataBsTarget) {
+        if ($this->dataBsTarget === true) {
             $attributes['data-bs-target'] = "#$this->toggleId";
         }
 

diff --git a/src/Helper/CssClass.php b/src/Helper/CssClass.php
@@ -28,7 +28,7 @@ final class CssClass
      */
     public static function add(array &$attributes, array|string $class, bool $override = false): void
     {
-        if (empty($class)) {
+        if ($class === '' || $class === []) {
             return;
         }
 

diff --git a/src/Helper/Encode.php b/src/Helper/Encode.php
@@ -84,7 +84,9 @@ public static function value(mixed $value, bool $doubleEncode = true, string $en
     {
         $value = htmlspecialchars((string) $value, self::HTMLSPECIALCHARS_FLAGS, $encoding, $doubleEncode);
 
-        return strtr($value, ['\u{0000}' => '&#0;']); // U+0000 NULL
+        return strtr($value, [
+            '\u{0000}' => '&#0;',
+        ]); // U+0000 NULL
     }
 
     /**

diff --git a/src/Helper/Utils.php b/src/Helper/Utils.php
@@ -166,6 +166,10 @@ private static function parseAttribute(string $attribute): array
             throw new InvalidArgumentException('Attribute name must contain word characters only.');
         }
 
-        return ['name' => $matches[2], 'prefix' => $matches[1], 'suffix' => $matches[3]];
+        return [
+            'name' => $matches[2],
+            'prefix' => $matches[1],
+            'suffix' => $matches[3],
+        ];
     }
 }
diff --git a/src/Input/Base/AbstractButton.php b/src/Input/Base/AbstractButton.php
@@ -74,7 +74,9 @@ protected function run(): string
                 ->suffixContainerTag($this->suffixContainerTag)
                 ->tagName('input')
                 ->template($this->template)
-                ->tokenValues(['{label}' => $this->renderLabelTag($labelFor)])
+                ->tokenValues([
+                    '{label}' => $this->renderLabelTag($labelFor),
+                ])
                 ->type($this->type)
                 ->render()
         );