refactor: Improve ServiceMap configuration for application types (Base, Console, Web) (#45)

Author: terabytesoftw

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     with:
-      concurrency-group: compatibility-${{ github.workflow }}-${{ github.ref }}
+      concurrency-group: phpunit-compatibility-${{ github.workflow }}-${{ github.ref }}
       extensions: intl
       os: >-
         ['ubuntu-latest', 'windows-latest']

.github/workflows/static.yml

@@ -27,6 +27,18 @@ jobs:
     with:
       composer-command: |
         composer require yiisoft/yii2:22.0.x-dev --prefer-dist --no-progress --no-interaction --no-scripts --ansi
+      concurrency-group: phpstan-${{ github.workflow }}-${{ github.ref }}
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.4']
+  phpstan-console:
+    uses: php-forge/actions/.github/workflows/phpstan.yml@main
+    with:
+      configuration: 'phpstan-console.neon'
+      composer-command: |
+        composer require yiisoft/yii2:22.0.x-dev --prefer-dist --no-progress --no-interaction --no-scripts --ansi
+      concurrency-group: phpstan-console-${{ github.workflow }}-${{ github.ref }}
       os: >-
         ['ubuntu-latest']
       php: >-

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Bug #42: Move `ApplicationPropertiesClassReflectionExtension` to `property` directory and add testing (@terabytesoftw)
 - Enh #43: Add tests for session property availability in `Console` and `Web` `Applications` (@terabytesoftw)
 - Bug #44: Move `UserPropertiesClassReflectionExtension` to `property` directory and add testing (@terabytesoftw)
+- Bug #45: Improve `ServiceMap` configuration for application types (`Base`, `Console`, `Web`) (@terabytesoftw)
 
 ## 0.2.3 June 09, 2025
 

composer-require-checker.json

@@ -2,6 +2,7 @@
     "symbol-whitelist": [
         "PHPStan\\Analyser\\OutOfClassScope",
         "PHPStan\\Analyser\\Scope",
+        "PHPStan\\PhpDoc\\StubFilesExtension",
         "PHPStan\\Reflection\\Annotations\\AnnotationsPropertiesClassReflectionExtension",
         "PHPStan\\Reflection\\ClassReflection",
         "PHPStan\\Reflection\\Dummy\\DummyPropertyReflection",

extension.neon

@@ -29,15 +29,6 @@ services:
     -
         class: yii2\extensions\phpstan\property\UserPropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
-    -
-        class: yii2\extensions\phpstan\reflection\RequestMethodsClassReflectionExtension
-        tags: [phpstan.broker.methodsClassReflectionExtension]
-    -
-        class: yii2\extensions\phpstan\reflection\RequestPropertiesClassReflectionExtension
-        tags: [phpstan.broker.propertiesClassReflectionExtension]
-    -
-        class: yii2\extensions\phpstan\reflection\ResponsePropertiesClassReflectionExtension
-        tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
         class: yii2\extensions\phpstan\type\ActiveQueryDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
@@ -53,5 +44,9 @@ services:
     -
         class: yii2\extensions\phpstan\type\HeaderCollectionDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
+    -
+        class: yii2\extensions\phpstan\StubFilesExtension
+        tags:
+            - phpstan.stubFilesExtension
 
     - yii2\extensions\phpstan\ServiceMap(%yii2.config_path%)

phpstan-console.neon

@@ -0,0 +1,31 @@
+includes:
+    - extension.neon
+    - phar://phpstan.phar/conf/bleedingEdge.neon
+    - vendor/phpstan/phpstan-strict-rules/rules.neon
+
+parameters:
+    bootstrapFiles:
+        - tests/bootstrap.php
+
+    ignoreErrors:
+        - '#Calling PHPStan\\Reflection\\Annotations\\AnnotationsPropertiesClassReflectionExtension\:\:(has|get)Property\(\) is not covered.+#'
+        - '#Creating new PHPStan\\Reflection\\Dummy\\DummyPropertyReflection is not covered.+#'
+
+    level: max
+
+    paths:
+        - src
+        - tests/console
+
+    # Enable strict advanced checks
+    checkImplicitMixed: true
+    checkBenevolentUnionTypes: true
+    checkUninitializedProperties: true
+    checkMissingCallableSignature: true
+    checkTooWideReturnTypesInProtectedAndPublicMethods: true
+    reportAnyTypeWideningInVarTag: true
+    reportPossiblyNonexistentConstantArrayOffset: true
+    reportPossiblyNonexistentGeneralArrayOffset: true
+
+    yii2:
+        config_path: tests/console/config/config.php

phpstan.neon

@@ -15,7 +15,7 @@ parameters:
 
     paths:
         - src
-        - tests
+        - tests/web
 
     # Enable strict advanced checks
     checkImplicitMixed: true
@@ -28,4 +28,4 @@ parameters:
     reportPossiblyNonexistentGeneralArrayOffset: true
 
     yii2:
-        config_path: tests/fixture/config/config.php
+        config_path: tests/config/config.php