Merge pull request #455 from neilime/feat/remove-suppoort-for-php-7.4

feat: remove support for php 7.4
neilime · Dec 6, 2022 · b24d41b · b24d41b
2 parents 2dffd2a + dff18a0
commit b24d41b
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 34 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,14 +2,14 @@ version: 2
 updates:
   - package-ecosystem: composer
     open-pull-requests-limit: 20
-    versioning-strategy: increase
+    versioning-strategy: widen
     directory: "/"
     schedule:
       interval: weekly
       day: friday
   - package-ecosystem: npm
     open-pull-requests-limit: 20
-    versioning-strategy: increase
+    versioning-strategy: widen
     directory: "/website"
     schedule:
       interval: weekly

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-versions: "7.4"
           - php-versions: "8.0"
           - php-versions: "8.1"
             stable: true
@@ -27,7 +26,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: none, json, dom, tokenizer, xml, xmlwriter, simplexml, iconv, mbstring, intl, sodium
+          extensions: none, curl, json, dom, tokenizer, xml, xmlwriter, simplexml, iconv, mbstring, intl, sodium
           coverage: pcov
 
       - name: ♻️ Get composer cache directory
@@ -42,7 +41,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: ⚙️ Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: 👕 Lint
         run: composer cs
@@ -61,7 +60,7 @@ jobs:
       - name: 🧪 Test
         run: composer test:ci
 
-      - name: 📊 Upload coverage results to Coveralls
+      - name: 📊 Upload coverage results to Codecov
         if: matrix.stable
         uses: codecov/codecov-action@v3
         with:

diff --git a/Makefile b/Makefile
@@ -8,7 +8,9 @@ build-php: ## Build PHP image for given version
 	@DOCKER_BUILDKIT=1 docker build -t "twbs-helper-php:$(filter-out $@,$(MAKECMDGOALS))" --build-arg "VERSION=$(filter-out $@,$(MAKECMDGOALS))" .
 
 install:
+	rm -f composer.lock
 	@$(call run-php,$(filter-out $@,$(MAKECMDGOALS)) composer install --no-progress --prefer-dist --optimize-autoloader)
+	rm -f composer.lock
 
 shell:
 	@$(call run-php,$(filter-out $@,$(MAKECMDGOALS)) bash)

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "twitter/bootstrap": "Twitter bootstrap assets"
   },
   "require": {
-    "php": "^7.4 || ~8.0.0 || ~8.1.0",
+    "php": "~8.0.0 || ~8.1.0",
     "laminas/laminas-escaper": "^2.12",
     "laminas/laminas-form": "^3.4",
     "laminas/laminas-i18n": "^2.17",
@@ -43,11 +43,11 @@
     "laminas/laminas-mvc": "^3.3",
     "mikey179/vfsstream": "^1.6",
     "pcov/clobber": "^2.0",
-    "phpstan/extension-installer": "^1.1",
-    "phpstan/phpstan": "^0.12",
-    "phpstan/phpstan-phpunit": "^0.12",
+    "phpstan/extension-installer": "^1.2",
+    "phpstan/phpstan": "^1.9",
+    "phpstan/phpstan-phpunit": "^1.2",
     "phpunit/phpunit": "^9.5.26",
-    "slam/phpstan-laminas-framework": "^0.12",
+    "slam/phpstan-laminas-framework": "^1.3",
     "spatie/phpunit-snapshot-assertions": "^4.2",
     "squizlabs/php_codesniffer": "^3.7"
   },

diff --git a/src/Documentation/Test/Config.php b/src/Documentation/Test/Config.php
@@ -7,9 +7,9 @@ class Config
     public static $TITLE_SEPARATOR = ' / ';
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $title;
+    public $title = null;
 
     /**
      * @var string

diff --git a/src/Documentation/Test/SnapshotService.php b/src/Documentation/Test/SnapshotService.php
@@ -26,6 +26,6 @@ public function getSnapshotPathFromTitle(string $title, $incrementor = 1): strin
         $snapshotFile = $safePath . '__' .  $incrementor . '.html';
 
         return $this->testsDirectoryPath . DIRECTORY_SEPARATOR .
-            static::$SNAPSHOT_ROOT_DIRECTORY . DIRECTORY_SEPARATOR . $snapshotFile;
+            self::$SNAPSHOT_ROOT_DIRECTORY . DIRECTORY_SEPARATOR . $snapshotFile;
     }
 }
diff --git a/src/TwbsHelper/View/Helper/DescriptionList.php b/src/TwbsHelper/View/Helper/DescriptionList.php
@@ -49,7 +49,7 @@ public function render(array $items, iterable $optionsAndAttributes = [], bool $
         }
 
         $attributes = $this->getView()->plugin('htmlattributes')
-            ->__invoke($optionsAndAttributes ?? [])
+            ->__invoke($optionsAndAttributes ?: [])
             ->merge(['class' => ['row']]);
 
         return $this->renderContainer(
@@ -175,7 +175,7 @@ protected function renderListItemTerm(
         unset($termOptionsAndAttributes['column']);
 
         $attributes = $this->getView()->plugin('htmlattributes')
-            ->__invoke($termOptionsAndAttributes ?? [])
+            ->__invoke($termOptionsAndAttributes ?: [])
             ->merge([
                 'class' => $this->getView()->plugin('htmlClass')->plugin('column')->getClassesFromOption(
                     $columSize
@@ -211,7 +211,7 @@ protected function renderListItemDetail(
         unset($detailOptionsAndAttributes['column']);
 
         $attributes = $this->getView()->plugin('htmlattributes')
-            ->__invoke($detailOptionsAndAttributes ?? [])
+            ->__invoke($detailOptionsAndAttributes ?: [])
             ->merge([
                 'class' => $this->getView()->plugin('htmlClass')->plugin('column')->getClassesFromOption(
                     $columSize

diff --git a/src/TwbsHelper/View/Helper/Dropdown.php b/src/TwbsHelper/View/Helper/Dropdown.php
@@ -109,7 +109,7 @@ protected function createDropdown($dropdown)
             throw new \InvalidArgumentException(sprintf(
                 'Argument "$dropdown" expects %s, "%s" given',
                 'an instanceof \Laminas\Form\ElementInterface or an iterable',
-                is_object($dropdown) ? get_class($dropdown) : gettype($dropdown)
+                get_class($dropdown)
             ));
         }
         return $dropdown;
@@ -175,9 +175,9 @@ protected function renderToggle(\Laminas\Form\ElementInterface $dropdown): strin
         $toogleElementAttributes = $toogleElement->getAttributes();
         foreach (
             [
-            'data-bs-toggle' => 'dropdown',
-            'data-bs-offset' => $dropdownOptions['offset'] ?? null,
-            'aria-expanded' => 'false',
+                'data-bs-toggle' => 'dropdown',
+                'data-bs-offset' => $dropdownOptions['offset'] ?? null,
+                'aria-expanded' => 'false',
             ] as $attributeName => $defaultValue
         ) {
             if ($defaultValue !== null && !isset($toogleElementAttributes[$attributeName])) {
@@ -478,8 +478,8 @@ protected function renderItem(array $itemOptions, bool $escape): string
 
                 foreach (
                     [
-                    'active' => ['aria-current' => 'true'],
-                    'disabled' => ['tabindex' => '-1', 'aria-disabled' => 'true'],
+                        'active' => ['aria-current' => 'true'],
+                        'disabled' => ['tabindex' => '-1', 'aria-disabled' => 'true'],
                     ] as $option => $optionAttributes
                 ) {
                     if (empty($itemOptions[$option])) {

diff --git a/src/TwbsHelper/View/Helper/GridColumn.php b/src/TwbsHelper/View/Helper/GridColumn.php
@@ -121,7 +121,7 @@ protected function prepareAttributes(iterable $optionsAndAttributes): iterable
             );
         }
 
-        $colOption = $optionsAndAttributes['column'] ?? $options['column'] ?? true;
+        $colOption = $optionsAndAttributes['column'] ?? true;
         $attributes['class']->merge(
             $this->getView()->plugin('htmlClass')->plugin('column')->getClassesFromOption($colOption)
         );

diff --git a/src/TwbsHelper/View/Helper/HtmlAttributes/HtmlClass.php b/src/TwbsHelper/View/Helper/HtmlAttributes/HtmlClass.php
@@ -49,11 +49,12 @@ public function setHelperPluginManager($helperPluginManager)
             }
             $helperPluginManager = new $helperPluginManager(new \Laminas\ServiceManager\ServiceManager());
         }
+
         if (!$helperPluginManager instanceof \TwbsHelper\View\Helper\HtmlAttributes\HtmlClass\HelperPluginManager) {
             throw new \InvalidArgumentException(sprintf(
                 'Helper helpers must extend %s; got type "%s" instead',
                 \TwbsHelper\View\Helper\HtmlAttributes\HtmlClass\HelperPluginManager::class,
-                (is_object($helperPluginManager) ? get_class($helperPluginManager) : gettype($helperPluginManager))
+                get_class($helperPluginManager)
             ));
         }
         $this->helperPluginManager = $helperPluginManager;

diff --git a/src/TwbsHelper/View/Helper/HtmlAttributes/HtmlClass/HelperPluginManager.php b/src/TwbsHelper/View/Helper/HtmlAttributes/HtmlClass/HelperPluginManager.php
@@ -2,6 +2,8 @@
 
 namespace TwbsHelper\View\Helper\HtmlAttributes\HtmlClass;
 
+use Laminas\ServiceManager\ConfigInterface;
+
 /**
  * Plugin manager implementation for HTML class attribute helpers
  *
@@ -31,8 +33,10 @@ class HelperPluginManager extends \Laminas\ServiceManager\AbstractPluginManager
 
     /**
      * Default factories
+     *
      * @var array
      */
+    /** @phpstan-ignore-next-line */
     protected $factories = [
         \TwbsHelper\View\Helper\HtmlAttributes\HtmlClass\Helper\Align::class
         => \Laminas\ServiceManager\Factory\InvokableFactory::class,
@@ -63,6 +67,8 @@ class HelperPluginManager extends \Laminas\ServiceManager\AbstractPluginManager
      * Sets the provided $parentLocator as the creation context for all
      * factories; for $config, {@see \Laminas\ServiceManager\ServiceManager::configure()}
      * for details on its accepted structure.
+     * @param null|ConfigInterface|\Psr\Container\ContainerInterface $configInstanceOrParentLocator
+     * @param array $config
      */
     public function __construct($configInstanceOrParentLocator = null, array $config = [])
     {
@@ -76,7 +82,7 @@ public function __construct($configInstanceOrParentLocator = null, array $config
      */
     public function injectHtmlClassHelper($first, $second)
     {
-        $helper = ($first instanceof \Interop\Container\ContainerInterface)
+        $helper = ($first instanceof \Psr\Container\ContainerInterface)
             ? $second
             : $first;
 

diff --git a/src/TwbsHelper/View/Helper/Navigation/Menu.php b/src/TwbsHelper/View/Helper/Navigation/Menu.php
@@ -96,7 +96,7 @@ function ($matches) {
 
         $content = $this->renderMenuItemsLink($content, $options);
 
-        return $content ?? '';
+        return $content ?: '';
     }
 
     protected function renderMenuItemsNav(string $content, iterable $options): string
@@ -214,13 +214,13 @@ protected function getMenuItemsNavClasses(iterable $options, bool $isRoot): iter
         $classes = [];
         foreach (
             [
-            'tabs' => 'nav-tabs',
-            'pills' => 'nav-pills',
-            'fill' => 'nav-fill',
-            'justified' => 'nav-justified',
-            'centered' => 'justify-content-center',
-            'right_aligned' => 'justify-content-end',
-            'vertical' => 'flex-column',
+                'tabs' => 'nav-tabs',
+                'pills' => 'nav-pills',
+                'fill' => 'nav-fill',
+                'justified' => 'nav-justified',
+                'centered' => 'justify-content-center',
+                'right_aligned' => 'justify-content-end',
+                'vertical' => 'flex-column',
             ] as $option => $className
         ) {
             if (!empty($options[$option])) {

diff --git a/tests/TestSuite/TwbsHelper/View/Helper/HtmlAttributes/HtmlClassTest.php b/tests/TestSuite/TwbsHelper/View/Helper/HtmlAttributes/HtmlClassTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace TestSuite\TwbsHelper\View\Helper\HtmlAttributes;
+
+class HtmlClassTest extends \TestSuite\TwbsHelper\AbstractViewHelperTestCase
+{
+    /**
+     * @var \TwbsHelper\View\Helper\HtmlAttributes\HtmlClass
+     */
+    protected $helper = 'htmlClass';
+
+    public function testSetHelperPluginManagerWithWrongClass()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'Helper helpers must extend TwbsHelper\View\Helper\HtmlAttributes\HtmlClass\HelperPluginManager; ' .
+                'got type "stdClass" instead'
+        );
+        $this->helper->setHelperPluginManager(\stdClass::class);
+    }
+}
diff --git a/tests/TestSuite/TwbsHelper/View/Helper/Navigation/MenuTest.php b/tests/TestSuite/TwbsHelper/View/Helper/Navigation/MenuTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace TestSuite\TwbsHelper\View\Helper\Navigation;
+
+class MenuTest extends \TestSuite\TwbsHelper\AbstractViewHelperTestCase
+{
+    /**
+     * @var \TwbsHelper\View\Helper\Navigation\Menu
+     */
+    protected $helper = 'menu';
+
+    public function testRenderMenuWithoutContainerReturnsEmptyContent()
+    {
+        $this->assertEquals(
+            '',
+            $this->helper->renderMenu()
+        );
+    }
+}