Merge branch 'main' into field-type-deprecated-translated-category

Author: mglaman

.circleci/config.yml

@@ -47,9 +47,6 @@ jobs:
         drupal:
           - "^10"
         include:
-          - php-version: "8.1"
-            drupal: "^9.0"
-            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true
@@ -65,9 +62,6 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
       - name: "Set drupal/core to ${{ matrix.drupal }}"
         run: "composer require drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
-      - name: "Add phpspec/prophecy-phpunit"
-        run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
-        if: ${{ matrix.drupal == '^9.0' }}
       - name: "Install dependencies"
         uses: "ramsey/composer-install@v3"
       - name: "PHPUnit"
@@ -89,9 +83,6 @@ jobs:
         drupal:
           - "^10"
         include:
-          - php-version: "8.1"
-            drupal: "^9.0"
-            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true
@@ -121,7 +112,7 @@ jobs:
       - name: "require phpstan-drupal"
         run: |
           cd ~/drupal
-          COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 1.2.99" phpstan/extension-installer --with-all-dependencies
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev "phpstan/phpstan:^2.0" "phpstan/phpstan-phpunit:^2.0" mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 2.99.99" phpstan/extension-installer --with-all-dependencies
           cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-phpstan.neon phpstan.neon
       - name: "Test core/install.php"
         run: |
@@ -165,9 +156,6 @@ jobs:
         drupal:
           - "^10"
         include:
-          - php-version: "8.1"
-            drupal: "^9.0"
-            experimental: false
           - php-version: "8.3"
             drupal: "11.x-dev"
             experimental: true
@@ -245,15 +233,14 @@ jobs:
          cd drupal
          composer config repositories.0 composer https://packages.drupal.org/8
          composer config repositories.1 path $GITHUB_WORKSPACE
-
       - name: "Install Drupal core dependencies"
         uses: "ramsey/composer-install@v3"
         with:
           working-directory: "${{ runner.temp }}/drupal"
       - name: "require phpstan-drupal"
         run: |
           cd ${{ runner.temp }}/drupal
-          composer require --dev mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 1.1.99" --with-all-dependencies
+          composer require drupal/core-dev "phpstan/phpstan:^2.0" "phpstan/phpstan-phpunit:^2.0" mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 2.99.99" phpstan/extension-installer --with-all-dependencies
       - name: "Check baseline"
         run: |
           cd ${{ runner.temp }}/drupal

.circleci/generate-local-config.sh

@@ -8,6 +8,10 @@ PHPStan is able to [discover symbols](https://phpstan.org/user-guide/discovering
 by Composer. However, Drupal does not provide autoloading information for modules and themes. This project registers 
 those namespaces so that PHPStan can properly discover symbols in your Drupal code base automatically.
 
+> [!NOTE]
+> With Drupal 11.2, Drupal core is now using PHPStan 2.0. The 1.x branch of phpstan-drupal will be supported until 
+> 11.1 loses security support when 11.3 is released.
+
 ## Sponsors
 
 <a href="https://www.undpaul.de/"><img src="https://www.undpaul.de/themes/custom/undpaul3/logo.svg" alt="undpaul" width="250" /></a> <a href="https://www.optasy.com/"><img src="https://optasy.com/themes/custom/optasy/img/logo_optasy.png" alt="Optasy" width="250"></a> <a href="https://www.fame.fi/"><img src="https://www.fame.fi/assets/images/fame-logo.png" alt="Fame Helsinki" width="250" ></a>

.circleci/run-local-config.sh

@@ -11,23 +11,23 @@
     ],
     "require": {
         "php": "^8.1",
-        "phpstan/phpstan": "^1.10.56",
-        "phpstan/phpstan-deprecation-rules": "^1.1.4",
-        "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "symfony/finder": "^6.2 || ^7.0",
+        "symfony/yaml": "^6.2 || ^7.0",
         "webflo/drupal-finder": "^1.3.1"
     },
     "require-dev": {
-        "behat/mink": "^1.8",
+        "behat/mink": "^1.10",
         "composer/installers": "^1.9",
         "drupal/core-recommended": "^10",
-        "drush/drush": "^10.0 || ^11 || ^12 || ^13@beta",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^8.5 || ^9 || ^10 || ^11",
-        "slevomat/coding-standard": "^7.1",
-        "squizlabs/php_codesniffer": "^3.3",
-        "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0"
+        "drush/drush": "^11 || ^12 || ^13",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan-strict-rules": "^2.0",
+        "phpunit/phpunit": "^9 || ^10 || ^11",
+        "slevomat/coding-standard": "^8.6",
+        "squizlabs/php_codesniffer": "^3.7",
+        "symfony/phpunit-bridge": "^6.2 || ^7.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -51,9 +51,6 @@
         ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-main": "1.0-dev"
-        },
         "installer-paths": {
             "tests/fixtures/drupal/core": ["type:drupal-core"],
             "tests/fixtures/drupal/libraries/{$name}": ["type:drupal-library"],

.github/workflows/php.yml

@@ -16,7 +16,7 @@ parameters:
 	scanFiles:
 		- stubs/Twig/functions.stub
 	drupal:
-		drupal_root: ~
+		drupal_root:
 		bleedingEdge:
 			checkDeprecatedHooksInApiFiles: false
 			checkCoreDeprecatedHooksInApiFiles: false
@@ -26,6 +26,7 @@ parameters:
 			dependencySerializationTraitPropertyRule: false
 			accessResultConditionRule: false
 			classExtendsInternalClassRule: true
+			pluginManagerInspectionRule: false
 		entityMapping:
 			aggregator_feed:
 				class: Drupal\aggregator\Entity\Feed
@@ -252,6 +253,7 @@ parametersSchema:
 			dependencySerializationTraitPropertyRule: boolean()
 			accessResultConditionRule: boolean()
 			classExtendsInternalClassRule: boolean()
+			pluginManagerInspectionRule: boolean()
 		])
 		entityMapping: arrayOf(anyOf(
 			structure([
@@ -333,3 +335,7 @@ services:
 		class: mglaman\PHPStanDrupal\DeprecatedScope\DeprecationHelperScope
 		tags:
 			- phpstan.deprecations.deprecatedScopeResolver
+	-
+		class: mglaman\PHPStanDrupal\Type\InspectorTypeExtension
+		tags:
+			- phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension

.github/workflows/phpstan-dev.yml

@@ -34,16 +34,6 @@ parameters:
 			count: 1
 			path: src/Drupal/DrupalAutoloader.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
-			count: 1
-			path: src/Rules/Deprecations/ConditionManagerCreateInstanceContextConfigurationRule.php
-
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
-			count: 1
-			path: src/Rules/Deprecations/ConditionManagerCreateInstanceContextConfigurationRule.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
 			count: 2