style: fix lint issues

neilime · Dec 20, 2023 · a5e41c7 · a5e41c7
1 parent 86b67b6
commit a5e41c7
Show file tree

Hide file tree

Showing 84 changed files with 291 additions and 291 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,7 +12,7 @@
     ->setRules([
         '@PSR12' => true,
         'array_indentation' => true,
-        '@PHP81Migration' => true,
+        '@PHP83Migration' => true,
     ])
     ->setFinder($finder)
     ->setUsingCache(true)

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "twitter/bootstrap": "Twitter bootstrap assets"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "laminas/laminas-escaper": "^2.12",
     "laminas/laminas-form": "^3.4",
     "laminas/laminas-i18n": "^2.17",

diff --git a/src/Documentation/Generator/UsagePage/Prettifier/PhpPrettifier.php b/src/Documentation/Generator/UsagePage/Prettifier/PhpPrettifier.php
@@ -36,11 +36,11 @@ private function __construct(\Documentation\Generator\Configuration $configurati
     public static function getInstance(
         \Documentation\Generator\Configuration $configuration
     ): \Documentation\Generator\UsagePage\Prettifier\PhpPrettifier {
-        if (static::$instance === null) {
-            static::$instance = new static($configuration);
+        if (self::$instance === null) {
+            self::$instance = new self($configuration);
         }
 
-        return static::$instance;
+        return self::$instance;
     }
 
     public function prettify($source)

diff --git a/src/Documentation/Test/Snapshots/Drivers/Unified.php b/src/Documentation/Test/Snapshots/Drivers/Unified.php
@@ -135,8 +135,8 @@ protected function renderChangedExtent(Differ $differ, int $oldIndex, int $newIn
 
         static $mbOld, $mbNew;
 
-        $mbOld = $mbOld ?? new MbString();
-        $mbNew = $mbNew ?? new MbString();
+        $mbOld ??= new MbString();
+        $mbNew ??= new MbString();
 
         $mbOld->set($oldValue);
         $mbNew->set($newValue);

diff --git a/src/TwbsHelper/Form/View/Helper/FormRows.php b/src/TwbsHelper/Form/View/Helper/FormRows.php
@@ -148,7 +148,7 @@ protected function getElementRowRendering(
 
         $rowRendering['helper'] = [
             $this->getHtmlElementHelper(),
-            '__invoke'
+            '__invoke',
         ];
 
         $rowAttributes = $this->getHtmlattributesHelper()->__invoke([
@@ -168,7 +168,7 @@ protected function getElementRowRendering(
         $rowRendering['helper_params'] = [
             'div',
             $rowAttributes,
-            '%content%'
+            '%content%',
         ];
 
         return $rowRendering;
@@ -202,12 +202,12 @@ protected function renderButtonGroup(
                 'content' => [$button],
                 'helper' => [
                     $this->getButtonGroupHelper(),
-                    '__invoke'
+                    '__invoke',
                 ],
                 'helper_params' => [
                     '%content%',
-                    ['attributes' => ['class' => $rowClass]]
-                ]
+                    ['attributes' => ['class' => $rowClass]],
+                ],
             ];
         }
 

diff --git a/src/TwbsHelper/View/Helper/Blockquote.php b/src/TwbsHelper/View/Helper/Blockquote.php
@@ -40,7 +40,7 @@ public function __invoke(
             $escape
         );
 
-        $footerAttributes['tag'] = $footerAttributes['tag'] ?? 'figcaption';
+        $footerAttributes['tag'] ??= 'figcaption';
         $footerContent = $this->renderFooter(
             $footer,
             $htmlattributesHelper->__invoke($footerAttributes),

diff --git a/src/TwbsHelper/View/Helper/Card.php b/src/TwbsHelper/View/Helper/Card.php
@@ -37,7 +37,7 @@ class Card extends \TwbsHelper\View\Helper\AbstractHtmlElement
         self::CARD_IMG_TOP => 'renderCardImgTop',
         self::CARD_IMG_BOTTOM => 'renderCardImgBottom',
         self::CARD_OVERLAY => 'renderCardOverlay',
-        self::CARD_LIST_GROUP => 'renderCardListGroup'
+        self::CARD_LIST_GROUP => 'renderCardListGroup',
     ];
 
     /**
@@ -191,7 +191,7 @@ protected function renderCardColumn($content, iterable $attributes, bool $escape
         $attributes = $this->getView()->plugin('htmlattributes')
             ->__invoke($attributes)
             ->merge([
-                'class' => $this->getView()->plugin('htmlClass')->plugin('column')->getClassesFromOption($column)
+                'class' => $this->getView()->plugin('htmlClass')->plugin('column')->getClassesFromOption($column),
             ]);
 
         $content = $this->renderCardContainerContent($content, [], $escape);
@@ -370,7 +370,7 @@ protected function renderCardListGroup(iterable $arguments, bool $escape): strin
             ->__invoke($arguments[1] ?? [])
             ->merge(['class' => ['list-group-flush']])->getArrayCopy();
 
-        $arguments[2] = $arguments[2] ?? $escape;
+        $arguments[2] ??= $escape;
 
         return $this->getView()->plugin('listGroup')->__invoke(...$arguments);
     }
@@ -429,7 +429,7 @@ protected function renderCardItem($type, $typeContent, bool $escape): string
                 $blockquoteAttributes = $typeContent[2] ?? ['class' => 'mb-0'];
                 $blockquoteContentAttributes = $typeContent[3] ?? [];
                 $blockquoteFooterAttributes = $typeContent[4] ?? [];
-                $blockquoteFooterAttributes['tag'] = $blockquoteFooterAttributes['tag'] ?? 'footer';
+                $blockquoteFooterAttributes['tag'] ??= 'footer';
                 $blockquoteFigureAttributes = $typeContent[5] ?? [];
                 $blockquoteEscape = $typeContent[6] ?? $escape;
 

diff --git a/src/TwbsHelper/View/Helper/Collapse.php b/src/TwbsHelper/View/Helper/Collapse.php
@@ -60,8 +60,8 @@ protected function prepareTriggersSpec($triggers): iterable
 
         $triggers['items'] = $triggerItems;
 
-        $triggers['tag'] = $triggers['tag'] ?? 'p';
-        $triggers['attributes'] = $triggers['attributes'] ?? [];
+        $triggers['tag'] ??= 'p';
+        $triggers['attributes'] ??= [];
 
         return $triggers;
     }

diff --git a/src/TwbsHelper/View/Helper/DescriptionList.php b/src/TwbsHelper/View/Helper/DescriptionList.php
@@ -92,7 +92,7 @@ protected function renderListItem(
 
         if (is_string($itemValue)) {
             $detailOptionsAndAttributes = [
-                'data' => $itemValue
+                'data' => $itemValue,
             ];
         } elseif (is_array($itemValue)) {
             if (!empty($itemValue['term'])) {

diff --git a/src/TwbsHelper/View/Helper/Dropdown.php b/src/TwbsHelper/View/Helper/Dropdown.php
@@ -49,7 +49,7 @@ class Dropdown extends \TwbsHelper\View\Helper\AbstractHtmlElement
      * @var array
      */
     protected static $directions = [
-        'down', 'up', 'start', 'end'
+        'down', 'up', 'start', 'end',
     ];
 
     /**

diff --git a/src/TwbsHelper/View/Helper/GridColumn.php b/src/TwbsHelper/View/Helper/GridColumn.php
@@ -111,7 +111,7 @@ protected function prepareAttributes(iterable $optionsAndAttributes): iterable
             }
 
             $attributes['class']->merge([
-                $this->getView()->plugin('htmlClass')->getPrefixedClass($order, 'order')
+                $this->getView()->plugin('htmlClass')->getPrefixedClass($order, 'order'),
             ]);
         }
 

diff --git a/src/TwbsHelper/View/Helper/HtmlElement.php b/src/TwbsHelper/View/Helper/HtmlElement.php
@@ -14,7 +14,7 @@ class HtmlElement extends \Laminas\View\Helper\AbstractHtmlElement
         'figure',
         'ul',
         'fieldset',
-        'nav'
+        'nav',
     ];
 
     /**

diff --git a/src/TwbsHelper/View/Helper/HtmlList.php b/src/TwbsHelper/View/Helper/HtmlList.php
@@ -173,7 +173,7 @@ protected function prepareItemSpec($item, iterable $optionsAndAttributes): itera
         $item['attributes'] = $this->getView()->plugin('htmlattributes')
             ->__invoke($item['attributes'] ?? [])
             ->merge([
-                'class' => $this->getListItemClassesFromOptionsAndAttributes($optionsAndAttributes)
+                'class' => $this->getListItemClassesFromOptionsAndAttributes($optionsAndAttributes),
             ]);
 
         return $item;
@@ -182,7 +182,7 @@ protected function prepareItemSpec($item, iterable $optionsAndAttributes): itera
     protected function getListItemClassesFromOptionsAndAttributes(iterable $optionsAndAttributes): array
     {
         $classes = [];
-        $inline = isset($optionsAndAttributes['inline']) ? $optionsAndAttributes['inline'] : false;
+        $inline = $optionsAndAttributes['inline'] ?? false;
         if ($inline) {
             $classes[] = 'list-inline-item';
         }

diff --git a/src/TwbsHelper/View/Helper/ListGroup.php b/src/TwbsHelper/View/Helper/ListGroup.php
@@ -143,7 +143,7 @@ protected function prepareItemSpec($item, iterable $optionsAndAttributes): itera
                 'class' => [
                     'd-flex',
                     'justify-content-between',
-                    $isNumbered ? 'align-items-start' : 'align-items-center'
+                    $isNumbered ? 'align-items-start' : 'align-items-center',
                 ],
             ]);
         }

diff --git a/src/TwbsHelper/View/Helper/Modal.php b/src/TwbsHelper/View/Helper/Modal.php
@@ -84,7 +84,7 @@ protected function preparePartFromContent(string $type, $content): iterable
 
             case is_iterable($content):
                 $part = $content;
-                $part['type'] = $part['type'] ?? $type;
+                $part['type'] ??= $type;
                 $parts[] = $part;
                 break;
 
@@ -260,7 +260,7 @@ protected function renderParts(
         return join(PHP_EOL, array_filter([
             $this->renderHeaderPart($headerPart, $optionsAndAttributes, $escape),
             $this->renderBodyPart($bodyPart, $optionsAndAttributes, $escape),
-            $this->renderFooterPart($footerPart, $escape)
+            $this->renderFooterPart($footerPart, $escape),
         ]));
     }
 
@@ -434,7 +434,7 @@ protected function renderPartList(
                         'content' => $partItem,
                     ];
                 }
-                $partItem['type'] = $partItem['type'] ?? $type;
+                $partItem['type'] ??= $type;
                 return $that->renderPart($partItem, $escape);
             }, \Laminas\Stdlib\ArrayUtils::iteratorToArray($part))
         );

diff --git a/src/TwbsHelper/View/Helper/Offcanvas.php b/src/TwbsHelper/View/Helper/Offcanvas.php
@@ -234,7 +234,7 @@ protected function renderContainer(
         }
 
         $attributes['class']->merge([
-            $this->getView()->plugin('htmlClass')->getPrefixedClass($placement, 'offcanvas')
+            $this->getView()->plugin('htmlClass')->getPrefixedClass($placement, 'offcanvas'),
         ]);
 
         return $this->getView()->plugin('htmlElement')->__invoke(

diff --git a/src/TwbsHelper/View/Helper/Placeholder.php b/src/TwbsHelper/View/Helper/Placeholder.php
@@ -122,7 +122,7 @@ protected function prepareAttributesForSize(
                 'class' => $this->getView()->plugin('htmlClass')->plugin('size')->getClassesFromOption(
                     $optionsAndAttributes['size'],
                     'placeholder'
-                )
+                ),
             ]);
         }
     }

diff --git a/tests/TestSuite/Documentation/Generator/FileSystem/Local/FileTest.php b/tests/TestSuite/Documentation/Generator/FileSystem/Local/FileTest.php
@@ -31,8 +31,8 @@ public function testRemoveDirShouldRemoveTheGivenDIrectory()
 
         \org\bovigo\vfs\vfsStream::create([
             'test' => [
-                'test.txt' => 'test'
-            ]
+                'test.txt' => 'test',
+            ],
         ], $this->root);
 
         $dirPath = $this->root->url() . DIRECTORY_SEPARATOR . 'test';
@@ -49,8 +49,8 @@ public function testRemoveDirShouldThrowsAnExceptionWhenDirPathIsInvalid()
 
         \org\bovigo\vfs\vfsStream::create([
             'test' => [
-                'test.txt' => 'test'
-            ]
+                'test.txt' => 'test',
+            ],
         ], $this->root);
 
         $dirPath = $this->root->url() . DIRECTORY_SEPARATOR . 'wrong';
@@ -70,7 +70,7 @@ public function testFileExistsShouldReturnTrueWhenFileExists()
         $fileName = 'test.txt';
         $filePath = $this->root->url() . DIRECTORY_SEPARATOR . $fileName;
         \org\bovigo\vfs\vfsStream::create([
-            $fileName => 'test'
+            $fileName => 'test',
         ], $this->root);
         $this->assertTrue($this->file->fileExists($filePath));
     }
@@ -87,7 +87,7 @@ public function testReadFile()
         $fileContent = 'test content';
         $filePath = $this->root->url() . DIRECTORY_SEPARATOR . $fileName;
         \org\bovigo\vfs\vfsStream::create([
-            $fileName => $fileContent
+            $fileName => $fileContent,
         ], $this->root);
         $this->assertEquals($fileContent, $this->file->readFile($filePath));
     }
@@ -127,7 +127,7 @@ public function testAppendFile()
         $filePath = $this->root->url() . DIRECTORY_SEPARATOR . $fileName;
         $content = 'test content';
         \org\bovigo\vfs\vfsStream::create([
-            $fileName => $content
+            $fileName => $content,
         ], $this->root);
 
         $newContent = 'test new content';
@@ -145,7 +145,7 @@ public function testRemoveFile()
         $filePath = $this->root->url() . DIRECTORY_SEPARATOR . $fileName;
         $content = 'test content';
         \org\bovigo\vfs\vfsStream::create([
-            $fileName => $content
+            $fileName => $content,
         ], $this->root);
 
         $this->assertTrue($this->root->hasChild($fileName));

diff --git a/tests/TestSuite/Documentation/Test/ConfigTest.php b/tests/TestSuite/Documentation/Test/ConfigTest.php
@@ -94,8 +94,8 @@ public function testFromArrayShouldHandleTestChildren()
             [
                 'title' => 'test',
                 'tests' => [
-                    ['title' => 'child']
-                ]
+                    ['title' => 'child'],
+                ],
             ],
         );
 

diff --git a/tests/TestSuite/Documentation/Tests/Components/Accordion.php b/tests/TestSuite/Documentation/Tests/Components/Accordion.php
@@ -177,8 +177,8 @@
                             'always_open' => true,
                         ]);
                     },
-                ]
+                ],
             ],
-        ]
+        ],
     ],
 ];
diff --git a/tests/TestSuite/Documentation/Tests/Components/Badges.php b/tests/TestSuite/Documentation/Tests/Components/Badges.php
@@ -25,7 +25,7 @@
                         echo '<h5>Example heading ' . $view->badge('New') . '</h5>' . PHP_EOL;
                         // H6
                         echo '<h6>Example heading ' . $view->badge('New') . '</h6>';
-                    }
+                    },
                 ],
                 [
                     'title' => 'Buttons',
@@ -38,7 +38,7 @@
                                 'variant' => 'primary',
                             ],
                         ]);
-                    }
+                    },
                 ],
                 [
                     'title' => 'Positioned',
@@ -54,7 +54,7 @@
                                         'positioned' => true,
                                         'type' => 'pill',
                                         'hidden_content' => 'unread messages',
-                                    ]
+                                    ],
                                 ],
                                 'variant' => 'primary',
                             ],
@@ -72,12 +72,12 @@
                                         'positioned' => true,
                                         'type' => 'pill',
                                         'hidden_content' => 'New alerts',
-                                    ]
+                                    ],
                                 ],
                                 'variant' => 'primary',
                             ],
                         ]);
-                    }
+                    },
                 ],
                 [
                     'title' => 'Background colors',

diff --git a/tests/TestSuite/Documentation/Tests/Components/ButtonGroup/BasicExample.php b/tests/TestSuite/Documentation/Tests/Components/ButtonGroup/BasicExample.php
@@ -27,7 +27,7 @@
                     'attributes' => [
                         'class' => 'active',
                         'aria-current' => 'page',
-                        'href' => '#'
+                        'href' => '#',
                     ],
                 ],
                 [

diff --git a/tests/TestSuite/Documentation/Tests/Components/Buttons/ButtonPlugin.php b/tests/TestSuite/Documentation/Tests/Components/Buttons/ButtonPlugin.php
@@ -75,6 +75,6 @@
                     ],
                 ]);
             },
-        ]
-    ]
+        ],
+    ],
 ];
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 $attributes['class']->merge([
-                    $this->getView()->plugin('htmlClass')->getPrefixedClass($order, 'order')
+                    $this->getView()->plugin('htmlClass')->getPrefixedClass($order, 'order'),
                 ]);
             }
@@ Expand Down @@