Patch 1

.gitattributes

@@ -2,3 +2,5 @@
 *.stub linguist-language=PHP
 
 tests/PHPStan/Command/ErrorFormatter/data/WindowsNewlines.php eol=crlf
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/workflows/backward-compatibility.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'src/**'
       - '.github/workflows/backward-compatibility.yml'

.github/workflows/bench.yml

@@ -8,7 +8,7 @@ on:
       - 'tests/bench/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'src/**'
       - '.github/workflows/bench.yml'

.github/workflows/build-issue-bot.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/build-issue-bot.yml'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'issue-bot/**'
       - '.github/workflows/build-issue-bot.yml'

.github/workflows/changelog-generator.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/changelog-generator.yml'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'changelog-generator/**'
       - '.github/workflows/changelog-generator.yml'

.github/workflows/claude-update-config-parameters-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update Config Parameters Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-config-parameters-docs-on-change.yml'
+      - 'conf/parametersSchema.neon'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update Config Parameters Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-config-parameters-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/claude-update-phpdoc-tags-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update PHPDoc Tags Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-phpdoc-tags-docs-on-change.yml'
+      - 'src/PhpDoc/PhpDocNodeResolver.php'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update PHPDoc Tags Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-phpdoc-tags-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/claude-update-phpdoc-types-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update PHPDoc Types Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-phpdoc-types-docs-on-change.yml'
+      - 'src/PhpDoc/TypeNodeResolver.php'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update PHPDoc Types Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-phpdoc-types-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/e2e-tests.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'
@@ -267,6 +267,12 @@ jobs:
               cd e2e/bug-11857
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/in-trait
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan --error-format=raw")
+              ../bashunit -a contains 'FooTrait.php:10:Strict comparison using === between int<0, max> and false will always evaluate to false.' "$OUTPUT"
+              ../bashunit -a contains 'FooTrait.php (in context of class E2EInTrait\Bar):18:Strict comparison using === between E2EInTrait\Bar and null will always evaluate to false.' "$OUTPUT"
+              ../bashunit -a contains 'FooTrait.php (in context of class E2EInTrait\Foo):18:Strict comparison using === between E2EInTrait\Foo and null will always evaluate to false.' "$OUTPUT"
           - script: |
               cd e2e/result-cache-meta-extension
               composer install

.github/workflows/lint-workflows.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
 
 permissions: {}
 

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
 
 concurrency:
   group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches

.github/workflows/phar.yml

@@ -6,9 +6,9 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     tags:
-      - '2.1.*'
+      - '2.2.*'
 
 concurrency:
   group: phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
@@ -95,14 +95,14 @@ jobs:
 
       - uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # v3
         env:
-          COMPOSER_ROOT_VERSION: "2.1.x-dev"
+          COMPOSER_ROOT_VERSION: "2.2.x-dev"
 
       - name: "Compile PHAR for checksum"
         working-directory: "compiler/build"
         run: "php ../box/vendor/bin/box compile --no-parallel --sort-compiled-files"
         env:
           PHAR_CHECKSUM: "1"
-          COMPOSER_ROOT_VERSION: "2.1.x-dev"
+          COMPOSER_ROOT_VERSION: "2.2.x-dev"
 
       - name: "Re-sign PHAR"
         run: "php compiler/build/resign.php tmp/phpstan.phar"
@@ -134,25 +134,25 @@ jobs:
   integration-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.1.x
+    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.2.x
     with:
-      ref: 2.1.x
+      ref: 2.2.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   extension-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@2.1.x
+    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@2.2.x
     with:
-      ref: 2.1.x
+      ref: 2.2.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   other-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/other-tests.yml@2.1.x
+    uses: phpstan/phpstan/.github/workflows/other-tests.yml@2.2.x
     with:
-      ref: 2.1.x
+      ref: 2.2.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   download-base-sha-phar:
@@ -298,7 +298,7 @@ jobs:
 
   commit:
     name: "Commit PHAR"
-    if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/2.1.x' || startsWith(github.ref, 'refs/tags/'))"
+    if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/2.2.x' || startsWith(github.ref, 'refs/tags/'))"
     needs: compiler-tests
     runs-on: "ubuntu-latest"
     timeout-minutes: 60
@@ -325,7 +325,7 @@ jobs:
           repository: phpstan/phpstan
           path: phpstan-dist
           token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
-          ref: 2.1.x
+          ref: 2.2.x
 
       - name: "Get previous pushed dist commit"
         id: previous-commit

.github/workflows/reflection-golden-test.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

.github/workflows/spelling.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
 
 permissions:
   contents: read

.github/workflows/static-analysis.yml

@@ -9,7 +9,7 @@ on:
       - 'apigen/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

build/baseline-8.0.neon

@@ -12,24 +12,12 @@ parameters:
 			count: 1
 			path: ../src/Type/ClosureTypeFactory.php
 
-		-
-			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
-			identifier: identical.alwaysFalse
-			count: 1
-			path: ../src/Type/Php/MbFunctionsReturnTypeExtension.php
-
 		-
 			message: '#^Strict comparison using \=\=\= between int\<0, max\> and false will always evaluate to false\.$#'
 			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
 
-		-
-			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
-			identifier: identical.alwaysFalse
-			count: 1
-			path: ../src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
-
 		-
 			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
 			identifier: identical.alwaysFalse

conf/config.neon

@@ -82,6 +82,7 @@ parameters:
 	reportWrongPhpDocTypeInVarTag: false
 	reportAnyTypeWideningInVarTag: false
 	reportNonIntStringArrayKey: false
+	reportUnsafeArrayStringKeyCasting: null
 	reportPossiblyNonexistentGeneralArrayOffset: false
 	reportPossiblyNonexistentConstantArrayOffset: false
 	checkMissingOverrideMethodAttribute: false

conf/parametersSchema.neon

@@ -91,6 +91,7 @@ parametersSchema:
 	reportWrongPhpDocTypeInVarTag: bool()
 	reportAnyTypeWideningInVarTag: bool()
 	reportNonIntStringArrayKey: bool()
+	reportUnsafeArrayStringKeyCasting: schema(string(), pattern('detect|prevent'), nullable())
 	reportPossiblyNonexistentGeneralArrayOffset: bool()
 	reportPossiblyNonexistentConstantArrayOffset: bool()
 	checkMissingOverrideMethodAttribute: bool()

e2e/in-trait/phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	level: 8
+	paths:
+		- src

e2e/in-trait/src/Bar.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace E2EInTrait;
+
+class Bar
+{
+
+	use FooTrait;
+
+	public function getSth(): ?self
+	{
+		return rand(0, 1) ? $this : null;
+	}
+
+	public function getSth2(): self
+	{
+		return $this;
+	}
+
+}

e2e/in-trait/src/Foo.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace E2EInTrait;
+
+class Foo
+{
+
+	use FooTrait;
+
+	public function getSth(): self
+	{
+		return $this;
+	}
+
+	public function getSth2(): self
+	{
+		return $this;
+	}
+
+}

e2e/in-trait/src/FooTrait.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace E2EInTrait;
+
+trait FooTrait
+{
+
+	public function doFoo(int $i): void
+	{
+		if (abs($i) === false) {
+
+		}
+
+		if ($this->getSth() === null) {
+
+		}
+
+		if ($this->getSth2() === null) {
+
+		}
+	}
+
+}

issue-bot/playground.neon

@@ -1,5 +1,7 @@
 rules:
+	- PHPStan\Rules\Playground\ArrayDimCastRule
 	- PHPStan\Rules\Playground\FunctionNeverRule
+	- PHPStan\Rules\Playground\LiteralArrayKeyCastRule
 	- PHPStan\Rules\Playground\MethodNeverRule
 	- PHPStan\Rules\Playground\NotAnalysedTraitRule
 	- PHPStan\Rules\Playground\NoPhpCodeRule