update coding standard

.github/release-drafter.yml

@@ -36,3 +36,7 @@ categories:
   #- title: '**📦 new Useragents:**'
   #  labels:
   #    - 'new useragents'
+
+commitish: master
+target_commitish: master
+filter-by-commitish: true

.php-cs-fixer.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@
 $header = <<<'EOF'
     This file is part of the mimmi20/laminas-router-hostname package.
 
-    Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+    Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
 
     For the full copyright and license information, please view the LICENSE
     file that was distributed with this source code.
@@ -42,8 +42,8 @@
                     'location' => 'after_open',
                     'separate' => 'bottom',
                 ],
-            ]
-        )
+            ],
+        ),
     )
     ->setUsingCache(true)
     ->setFinder($finder);

composer.json

@@ -30,7 +30,7 @@
     "infection/infection": "^0.26.19",
     "laminas/laminas-modulemanager": "^2.14.0",
     "laminas/laminas-servicemanager": "^3.20.0",
-    "mimmi20/coding-standard": "^3.0.27",
+    "mimmi20/coding-standard": "4.0.0-beta.6",
     "nikic/php-parser": "^v4.15.3",
     "phpstan/extension-installer": "^1.2.0",
     "phpstan/phpstan": "^1.10.2",

phpcs.xml

@@ -7,7 +7,11 @@
     <arg name="encoding" value="utf-8"/>
 
     <!-- inherit rules from: -->
-    <rule ref="mimmi20-cs"/>
+    <rule ref="Mimmi20CodingStandard">
+        <exclude name="SlevomatCodingStandard.Functions.FunctionLength.FunctionLength"/>
+        <exclude name="SlevomatCodingStandard.Classes.ClassLength.ClassTooLong"/>
+        <exclude name="SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh"/>
+    </rule>
 
     <!-- Paths to check -->
     <file>src</file>

phpstan.neon

@@ -1,18 +1,45 @@
 parameters:
   level: max
+
   parallel:
     maximumNumberOfProcesses: 1
     processTimeout: 200.0
+
   paths:
     - src
     - tests
+
   scanFiles:
     - %currentWorkingDirectory%/vendor/autoload.php
     - %currentWorkingDirectory%/vendor/squizlabs/php_codesniffer/autoload.php
     - %currentWorkingDirectory%/vendor/squizlabs/php_codesniffer/src/Util/Tokens.php
+
+  checkAlwaysTrueCheckTypeFunctionCall: true
+  checkAlwaysTrueInstanceof: true
+  checkAlwaysTrueStrictComparison: true
+  checkBenevolentUnionTypes: true
+  checkDynamicProperties: true
+  checkExplicitMixedMissingReturn: true
+  checkFunctionNameCase: true
   checkGenericClassInNonGenericObjectType: false
-  checkMissingIterableValueType: false
+  checkImplicitMixed: true
+  checkInternalClassCaseSensitivity: true
+  checkMissingCallableSignature: true
+  checkMissingIterableValueType: true
+  checkTooWideReturnTypesInProtectedAndPublicMethods: true
+  checkUninitializedProperties: true
+  inferPrivatePropertyTypeFromConstructor: true
+  polluteScopeWithAlwaysIterableForeach: false
+  polluteScopeWithLoopInitialAssignments: false
+# reportAlwaysTrueInLastCondition: true
+  reportMaybesInMethodSignatures: false
+  reportMaybesInPropertyPhpDocTypes: true
+  reportStaticMethodSignatures: true
+# reportWrongPhpDocTypeInVarTag: true
   treatPhpDocTypesAsCertain: false
+
+  tipsOfTheDay: false
+
   exceptions:
     implicitThrows: false
     checkedExceptionRegexes:
@@ -21,6 +48,9 @@ parameters:
     check:
       missingCheckedExceptionInThrows: true
       tooWideThrowType: true
+
   ignoreErrors:
     - '~Parameter #1 \$options of static method Mimmi20\\Routing\\Router\\HostName::factory\(\) expects array{host\?: string, hosts\?: array<int\|string, string>, defaults\?: array<int\|string, mixed>}\|bool\|Traversable<string, mixed>, ~'
     - '~is not subtype of Throwable~'
+    - '~Call to static method PHPUnit\\Framework\\Assert::assert.*\(\) with .* will always evaluate to true~'
+    - '~Parameter #1 \$hosts of class Mimmi20\\Routing\\Router\\HostName constructor expects array<int\|string, string>, array given~'

src/ConfigProvider.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,6 +22,8 @@ final class ConfigProvider
      *
      * @return array<string, array<string, array<string, string>>>
      * @phpstan-return array{route_manager: array{factories: array<class-string, class-string>}, router: array{routes: array<mixed>}}
+     *
+     * @throws void
      */
     public function __invoke(): array
     {
@@ -36,6 +38,8 @@ public function __invoke(): array
      *
      * @return array<string, array<string, string>>
      * @phpstan-return array{factories: array<class-string, class-string>}
+     *
+     * @throws void
      */
     public function getRouteManagerConfig(): array
     {

src/Module.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,6 +20,8 @@ final class Module implements ConfigProviderInterface, DependencyIndicatorInterf
     /**
      * @return array<string, array<string, array<string, string>>>
      * @phpstan-return array{route_manager: array{factories: array<class-string, class-string>}, router: array{routes: array<mixed>}}
+     *
+     * @throws void
      */
     public function getConfig(): array
     {
@@ -35,6 +37,8 @@ public function getConfig(): array
      * Expected to return an array of modules on which the current one depends on
      *
      * @return array<int, string>
+     *
+     * @throws void
      */
     public function getModuleDependencies(): array
     {

src/Router/HostName.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -54,8 +54,8 @@ final class HostName implements RouteInterface
     /**
      * Create a new hostname route.
      *
-     * @param array<string>            $hosts
-     * @param array<int|string, mixed> $defaults
+     * @param array<int|string, string> $hosts
+     * @param array<int|string, mixed>  $defaults
      *
      * @throws void
      */

src/Router/HostNameFactory.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -31,8 +31,11 @@ final class HostNameFactory implements FactoryInterface
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array | null $options = null): HostName
-    {
+    public function __invoke(
+        ContainerInterface $container,
+        $requestedName,
+        array | null $options = null,
+    ): HostName {
         if (!is_array($options)) {
             throw new ServiceNotCreatedException('Options must be an Array');
         }

tests/ConfigProviderTest.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

tests/ModuleTest.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

tests/Router/HostNameFactoryTest.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the mimmi20/laminas-router-hostname package.
  *
- * Copyright (c) 2021, Thomas Mueller <mimmi20@live.de>
+ * Copyright (c) 2021-2023, Thomas Mueller <mimmi20@live.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,17 +18,14 @@
 use Mimmi20\Routing\Router\HostNameFactory;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
-use SebastianBergmann\RecursionContext\InvalidArgumentException;
 
 use function assert;
 
 final class HostNameFactoryTest extends TestCase
 {
     private HostNameFactory $object;
 
-    /**
-     * Erstellt alle notwendigen Objekte
-     */
+    /** @throws void */
     protected function setUp(): void
     {
         $this->object = new HostNameFactory();
@@ -62,7 +59,6 @@ public function testInvokeFailed(): void
 
     /**
      * @throws Exception
-     * @throws InvalidArgumentException
      * @throws ServiceNotCreatedException
      */
     public function testInvoke(): void