Merge PR #21 from @zonky2

- Fix PHPCQ2 warnings

.github/workflows/diagnostics.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -61,9 +61,6 @@ jobs:
           restore-keys: |
                         ${{ runner.os }}-build-${{ env.cache-name }}-
 
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup composer config
-        run:  composer config minimum-stability dev
-
       - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
         run:  composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable
 

.phpcq.lock

@@ -1 +1 @@
-{"plugins":{"phpunit":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phpunit-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0"},"tool":{"phpunit":"^6.0 || ^7.0 || ^8.0 || ^9.0"}},"checksum":{"type":"sha-512","value":"c73f15658e3ba62665f09492ec91c3a6a715760bfaa88473a987538439fff442540148e086e46a6aa18ce55a3ea2fbf76caaa581384cb84a38859fcc609ae7e4"},"tools":{"phpunit":{"version":"9.5.20","url":"https://phar.phpunit.de/phpunit-9.5.20.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*","ext-libxml":"*","ext-mbstring":"*","ext-xml":"*","ext-xmlwriter":"*"}},"checksum":{"type":"sha-256","value":"6becad2da5c37f5ad101cc665ef05a2f1a6a45d2427c8edcc74f72c92fb1e05a"},"signature":"https://phar.phpunit.de/phpunit-9.5.20.phar.asc"}},"composerLock":null},"composer-require-checker":{"api-version":"1.0.0","version":"1.0.1.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-require-checker-1.0.1.0.php","signature":null,"requirements":{"php":{"php":"^7.4 || ^8.0"},"tool":{"composer-require-checker":"^3.8"}},"checksum":{"type":"sha-512","value":"5b0fd8cd5e0f5761c53b9d5375b6f6ba50f148468896248f823cc2a48361adfd872556066764b1b544ff51ffd5de60d6f9a75050db00b257d807976ac761bc3a"},"tools":{"composer-require-checker":{"version":"3.8.0","url":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar","requirements":{"php":{"php":"^7.4 || ^8.0","ext-json":"*","ext-phar":"*"}},"checksum":null,"signature":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar.asc"}},"composerLock":null},"phpmd":{"api-version":"1.0.0","version":"1.0.1.0","type":"php-file","url":"https://phpcq.github.io/repository/phpmd-1.0.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpmd":"^2.6.1"}},"checksum":{"type":"sha-512","value":"88e267b9c36b2edc85e924717606b626e005ac8d97b1f65f5331e2a3b3894dec2cf124f6187541bf759d026477b6d94daacc5d5c81bb09714a68ffabe5698dc5"},"tools":{"phpmd":{"version":"2.12.0","url":"https://github.com/phpmd/phpmd/releases/download/2.12.0/phpmd.phar","requirements":{"php":{"php":">=5.3.9","ext-xml":"*"}},"checksum":null,"signature":null}},"composerLock":null},"phpcpd":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcpd-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcpd":"^6.0"}},"checksum":{"type":"sha-512","value":"1189ce0bf3fade4cb4241f1d96f915ef8fc7651f4450dc79fdf464ee3d6be3009316f0d423ce2d4af9d76ad50807b7fdf4d77bfa6d9ee2c91d6eda32ea214433"},"tools":{"phpcpd":{"version":"6.0.3","url":"https://phar.phpunit.de/phpcpd-6.0.3.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*"}},"checksum":{"type":"sha-256","value":"2cbaea7cfda1bb4299d863eb075e977c3f49055dd16d88529fae5150d48a84cb"},"signature":"https://phar.phpunit.de/phpcpd-6.0.3.phar.asc"}},"composerLock":null},"phploc":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phploc-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*","ext-json":"*"},"tool":{"phploc":"^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"}},"checksum":{"type":"sha-512","value":"f67b02d494796adf553cb3dd13ec06c1cb8e53c799954061749424251379541637538199afb3afa3c7a01cabd1cb6f1c53eb621f015dff9644c6c7cbf10c56d1"},"tools":{"phploc":{"version":"7.0.2","url":"https://phar.phpunit.de/phploc-7.0.2.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*"}},"checksum":{"type":"sha-256","value":"3d59778ec86faf25fd00e3a329b2f9ad4a3c751ca91601ea7dab70f887b0bf46"},"signature":"https://phar.phpunit.de/phploc-7.0.2.phar.asc"}},"composerLock":null},"phpcs":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcs-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcs":"^3.0 || ^2.0","phpcbf":"^3.0 || ^2.0"}},"checksum":{"type":"sha-512","value":"2737022369da1318cc4e0ea194e8a81019f7b079080d869aab878b7486052fdbe68fee3f28131f35573226def1aabd4bd005e038ee7b767c137b1107c1492a83"},"tools":{"phpcs":{"version":"3.6.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcs.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcs.phar.asc"},"phpcbf":{"version":"3.6.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcbf.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcbf.phar.asc"}},"composerLock":null},"composer-normalize":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-normalize-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-json":"*"},"tool":{"composer-normalize":"^2.1"}},"checksum":{"type":"sha-512","value":"d59d3557cb20630734878a9115df5dd32d5aff815e5b15be36f6fb5d6e9d83dd36efd84215ab6529edcc924f600946f739a0d9e67723deff95c88346ab502498"},"tools":{"composer-normalize":{"version":"2.25.1","url":"https://github.com/ergebnis/composer-normalize/releases/download/2.25.1/composer-normalize.phar","requirements":{"php":{"php":"^7.4 || ^8.0"}},"checksum":null,"signature":"https://github.com/ergebnis/composer-normalize/releases/download/2.25.1/composer-normalize.phar.asc"}},"composerLock":null}},"tools":[]}
+{"plugins":{"phpunit":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phpunit-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0"},"tool":{"phpunit":"^6.0 || ^7.0 || ^8.0 || ^9.0"}},"checksum":{"type":"sha-512","value":"c73f15658e3ba62665f09492ec91c3a6a715760bfaa88473a987538439fff442540148e086e46a6aa18ce55a3ea2fbf76caaa581384cb84a38859fcc609ae7e4"},"tools":{"phpunit":{"version":"9.6.10","url":"https://phar.phpunit.de/phpunit-9.6.10.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*","ext-libxml":"*","ext-mbstring":"*","ext-xml":"*","ext-xmlwriter":"*"}},"checksum":{"type":"sha-256","value":"81fc7b66061dcce44ed1b093af0484b17b90fba5b058bad033a2417a9c9a565d"},"signature":"https://phar.phpunit.de/phpunit-9.6.10.phar.asc"}},"composerLock":null},"composer-require-checker":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-require-checker-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.4 || ^8.0"},"tool":{"composer-require-checker":"^3.8 || ^4.0"}},"checksum":{"type":"sha-512","value":"d5415bddfe024c5749d894034583882aee4e5c3e1087815d9fdd81cb5e71630f631a0e35de0ff84b97fbbf738c16ece5f83bd8c00695913eb846aa6f04577dc2"},"tools":{"composer-require-checker":{"version":"3.8.0","url":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar","requirements":{"php":{"php":"^7.4 || ^8.0","ext-json":"*","ext-phar":"*"}},"checksum":null,"signature":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar.asc"}},"composerLock":null},"phpmd":{"api-version":"1.0.0","version":"1.0.2.0","type":"php-file","url":"https://phpcq.github.io/repository/phpmd-1.0.2.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpmd":"^2.6.1"}},"checksum":{"type":"sha-512","value":"f22280a6dec8dbdd2ec1d83b294f23237fe32c34f4a298e52038e0a7a0074d541635b2b488b1a6098a42d8418a6cd8eb804406ea82b91e362be2b5d11a0915b0"},"tools":{"phpmd":{"version":"2.13.0","url":"https://github.com/phpmd/phpmd/releases/download/2.13.0/phpmd.phar","requirements":{"php":{"php":">=5.3.9","ext-xml":"*"}},"checksum":null,"signature":"https://github.com/phpmd/phpmd/releases/download/2.13.0/phpmd.phar.asc"}},"composerLock":null},"phpcpd":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcpd-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcpd":"^6.0"}},"checksum":{"type":"sha-512","value":"1189ce0bf3fade4cb4241f1d96f915ef8fc7651f4450dc79fdf464ee3d6be3009316f0d423ce2d4af9d76ad50807b7fdf4d77bfa6d9ee2c91d6eda32ea214433"},"tools":{"phpcpd":{"version":"6.0.3","url":"https://phar.phpunit.de/phpcpd-6.0.3.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*"}},"checksum":{"type":"sha-256","value":"2cbaea7cfda1bb4299d863eb075e977c3f49055dd16d88529fae5150d48a84cb"},"signature":"https://phar.phpunit.de/phpcpd-6.0.3.phar.asc"}},"composerLock":null},"phploc":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phploc-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*","ext-json":"*"},"tool":{"phploc":"^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"}},"checksum":{"type":"sha-512","value":"f67b02d494796adf553cb3dd13ec06c1cb8e53c799954061749424251379541637538199afb3afa3c7a01cabd1cb6f1c53eb621f015dff9644c6c7cbf10c56d1"},"tools":{"phploc":{"version":"7.0.2","url":"https://phar.phpunit.de/phploc-7.0.2.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*"}},"checksum":{"type":"sha-256","value":"3d59778ec86faf25fd00e3a329b2f9ad4a3c751ca91601ea7dab70f887b0bf46"},"signature":"https://phar.phpunit.de/phploc-7.0.2.phar.asc"}},"composerLock":null},"phpcs":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcs-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcs":"^3.0 || ^2.0","phpcbf":"^3.0 || ^2.0"}},"checksum":{"type":"sha-512","value":"2737022369da1318cc4e0ea194e8a81019f7b079080d869aab878b7486052fdbe68fee3f28131f35573226def1aabd4bd005e038ee7b767c137b1107c1492a83"},"tools":{"phpcs":{"version":"3.7.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.7.2/phpcs.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.7.2/phpcs.phar.asc"},"phpcbf":{"version":"3.7.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.7.2/phpcbf.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.7.2/phpcbf.phar.asc"}},"composerLock":null},"composer-normalize":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-normalize-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-json":"*"},"tool":{"composer-normalize":"^2.1"}},"checksum":{"type":"sha-512","value":"d59d3557cb20630734878a9115df5dd32d5aff815e5b15be36f6fb5d6e9d83dd36efd84215ab6529edcc924f600946f739a0d9e67723deff95c88346ab502498"},"tools":{"composer-normalize":{"version":"2.34.0","url":"https://github.com/ergebnis/composer-normalize/releases/download/2.34.0/composer-normalize.phar","requirements":{"php":{"php":"~8.1.0 || ~8.2.0","ext-json":"*"}},"checksum":null,"signature":"https://github.com/ergebnis/composer-normalize/releases/download/2.34.0/composer-normalize.phar.asc"}},"composerLock":null}},"tools":[]}

composer.json

@@ -1,113 +1,113 @@
 {
-    "name": "menatwork/contao-multicolumnwizard-bundle",
-    "description": "MultiColumWizard for Contao OpenSource CMS",
-    "license": "LGPL-3.0-or-later",
-    "type": "contao-bundle",
-    "keywords": [
-        "contao",
-        "widget",
-        "wizard"
-    ],
-    "authors": [
-        {
-            "name": "Stefan Heimes",
-            "email": "[email protected]",
-            "homepage": "https://www.men-at-work.de",
-            "role": "Developer"
-        },
-        {
-            "name": "Andreas Isaak",
-            "email": "[email protected]",
-            "homepage": "https://www.men-at-work.de",
-            "role": "Developer"
-        },
-        {
-            "name": "David Maack",
-            "email": "[email protected]",
-            "homepage": "https://www.men-at-work.de",
-            "role": "Developer"
-        },
-        {
-            "name": "Andreas Schempp", 
-            "email": "[email protected]",
-            "homepage": "https://www.terminal42.ch",
-            "role": "Developer"
-        },
-        {
-            "name": "Yanick Witschi",
-            "email": "[email protected]",
-            "homepage": "https://www.terminal42.ch",
-            "role": "Developer"
-        },
-        {
-            "name": "Tristan Lins",
-            "homepage": "https://github.com/tristanlins",
-            "role": "Developer"
-        }
-    ],
-    "homepage": "https://www.men-at-work.de",
-    "support": {
-        "issues": "https://github.com/menatwork/MultiColumnWizard/issues",
-        "wiki": "https://de.contaowiki.org/MultiColumnWizard",
-        "irc": "irc://irc.freenode.org/contao.dev",
-        "source": "https://github.com/menatwork/MultiColumnWizard"
+  "name": "menatwork/contao-multicolumnwizard-bundle",
+  "description": "MultiColumWizard for Contao OpenSource CMS",
+  "license": "LGPL-3.0-or-later",
+  "type": "contao-bundle",
+  "keywords": [
+    "contao",
+    "widget",
+    "wizard"
+  ],
+  "authors": [
+    {
+      "name": "Stefan Heimes",
+      "email": "[email protected]",
+      "homepage": "https://www.men-at-work.de",
+      "role": "Developer"
     },
-    "require": {
-        "php": "^8.1",
-        "ext-json": "*",
-        "contao/core-bundle": "^4.13 || ^5.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0"
+    {
+      "name": "Andreas Isaak",
+      "email": "[email protected]",
+      "homepage": "https://www.men-at-work.de",
+      "role": "Developer"
     },
-    "require-dev": {
-        "contao/manager-plugin": "^2.1",
-        "phpcq/runner-bootstrap": "^1.0@dev",
-        "roave/security-advisories": "dev-latest"
+    {
+      "name": "David Maack",
+      "email": "[email protected]",
+      "homepage": "https://www.men-at-work.de",
+      "role": "Developer"
     },
-    "replace": {
-        "contao-legacy/multicolumnwizard": "*",
-        "menatwork/contao-multicolumnwizard": ">=3.3.4 <4.0"
+    {
+      "name": "Andreas Schempp",
+      "email": "[email protected]",
+      "homepage": "https://www.terminal42.ch",
+      "role": "Developer"
     },
-    "autoload": {
-        "psr-4": {
-            "MenAtWork\\MultiColumnWizardBundle\\": "src",
-            "MenAtWork\\MultiColumnWizard\\": "legacy_layer/psr-4-maw",
-            "MultiColumnWizard\\": "legacy_layer/psr-4-mcw"
-        },
-        "classmap": [
-            "legacy_layer/classmap"
-        ],
-        "files": [
-            "src/deprecated-autoload.php"
-        ]
+    {
+      "name": "Yanick Witschi",
+      "email": "[email protected]",
+      "homepage": "https://www.terminal42.ch",
+      "role": "Developer"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "MenAtWork\\MultiColumnWizardBundle\\Test\\": "tests"
-        },
-        "files": [
-            "tests/contao3-autoloader.php"
-        ]
+    {
+      "name": "Tristan Lins",
+      "homepage": "https://github.com/tristanlins",
+      "role": "Developer"
+    }
+  ],
+  "homepage": "https://www.men-at-work.de",
+  "support": {
+    "issues": "https://github.com/menatwork/MultiColumnWizard/issues",
+    "wiki": "https://de.contaowiki.org/MultiColumnWizard",
+    "irc": "irc://irc.freenode.org/contao.dev",
+    "source": "https://github.com/menatwork/MultiColumnWizard"
+  },
+  "require": {
+    "php": "^8.1",
+    "ext-json": "*",
+    "contao/core-bundle": "^4.13 || ^5.0",
+    "symfony/config": "^5.4 || ^6.0",
+    "symfony/console": "^5.4 || ^6.0",
+    "symfony/dependency-injection": "^5.4 || ^6.0",
+    "symfony/event-dispatcher": "^5.4 || ^6.0",
+    "symfony/http-foundation": "^5.4 || ^6.0",
+    "symfony/http-kernel": "^5.4 || ^6.0",
+    "symfony/translation": "^5.4 || ^6.0"
+  },
+  "require-dev": {
+    "contao/manager-plugin": "^2.1",
+    "phpcq/runner-bootstrap": "^1.0@dev",
+    "roave/security-advisories": "dev-latest"
+  },
+  "replace": {
+    "contao-legacy/multicolumnwizard": "*",
+    "menatwork/contao-multicolumnwizard": ">=3.3.4 <4.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "MenAtWork\\MultiColumnWizardBundle\\": "src",
+      "MenAtWork\\MultiColumnWizard\\": "legacy_layer/psr-4-maw",
+      "MultiColumnWizard\\": "legacy_layer/psr-4-mcw"
     },
-    "config": {
-        "allow-plugins": {
-            "contao-components/installer": false,
-            "contao/manager-plugin": false,
-            "php-http/discovery": false
-        }
+    "classmap": [
+      "legacy_layer/classmap"
+    ],
+    "files": [
+      "src/deprecated-autoload.php"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MenAtWork\\MultiColumnWizardBundle\\Test\\": "tests"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-develop": "3.7.x-dev",
-            "dev-master": "3.6.x-dev",
-            "dev-support/contao3": "3.3.x-dev",
-            "dev-support/contao4.4": "3.4.x-dev"
-        },
-        "contao-manager-plugin": "MenAtWork\\MultiColumnWizardBundle\\ContaoManager\\Plugin"
+    "files": [
+      "tests/contao3-autoloader.php"
+    ]
+  },
+  "config": {
+    "allow-plugins": {
+      "contao-components/installer": false,
+      "contao/manager-plugin": false,
+      "php-http/discovery": false
     }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-develop": "3.7.x-dev",
+      "dev-master": "3.6.x-dev",
+      "dev-support/contao3": "3.3.x-dev",
+      "dev-support/contao4.4": "3.4.x-dev"
+    },
+    "contao-manager-plugin": "MenAtWork\\MultiColumnWizardBundle\\ContaoManager\\Plugin"
+  }
 }