Merge branch '1.12.x' into patch-1

Author: piotrekkr

.github/workflows/e2e-tests.yml

@@ -248,6 +248,13 @@ jobs:
               cd e2e/bad-exclude-paths
               OUTPUT=$(../../bin/phpstan analyse -c ignoreReportUnmatchedFalse.neon)
               echo "$OUTPUT"
+          - script: |
+              cd e2e/bug-11826
+              composer install
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Child process error (exit code 255): PHP Fatal error' "$OUTPUT"
+              ../bashunit -a contains 'Result is incomplete because of severe errors.' "$OUTPUT"
 
     steps:
       - name: "Checkout"
@@ -268,7 +275,7 @@ jobs:
         run: "patch src/Analyser/Error.php < e2e/PHPStanErrorPatch.patch"
 
       - name: "Install bashunit"
-        run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.13.0"
+        run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.17.0"
 
       - name: "Test"
         run: "${{ matrix.script }}"
@@ -308,6 +315,9 @@ jobs:
               cd e2e/discussion-11362
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/bug-11819
+              ../../bin/phpstan
 
     steps:
       - name: "Checkout"

.github/workflows/issue-bot.yml

@@ -106,6 +106,9 @@ jobs:
           attempt_limit: 5
           attempt_delay: 1000
 
+      - name: "Add level 10 config file"
+        run: "cp issue-bot/config.level10.neon conf/"
+
       - name: "Run PHPStan"
         working-directory: "issue-bot"
         timeout-minutes: 5

.github/workflows/phar.yml

@@ -104,13 +104,14 @@ jobs:
       - name: "Delete checksum PHAR"
         run: "rm tmp/phpstan.phar"
 
-  integration-tests:
-    if: github.event_name == 'pull_request'
-    needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.12.x
-    with:
-      ref: 1.12.x
-      phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
+#
+#  integration-tests:
+#    if: github.event_name == 'pull_request'
+#    needs: compiler-tests
+#    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.12.x
+#    with:
+#      ref: 1.12.x
+#      phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   extension-tests:
     if: github.event_name == 'pull_request'

.github/workflows/spelling.yml

@@ -18,6 +18,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Check for typos"
-        uses: "crate-ci/typos@v1.24.6"
+        uses: "crate-ci/typos@v1.26.0"
         with:
           files: "README.md src/"

build/baseline-8.0.neon

@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
+			message: "#^Strict comparison using \\=\\=\\= between list<callable\\(string\\): void> and false will always evaluate to false\\.$#"
 			count: 1
 			path: ../src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php
 

build/enum-adapter-errors.neon

@@ -140,6 +140,11 @@ parameters:
 			count: 1
 			path: ../src/Reflection/ClassReflection.php
 
+		-
+			message: '#^PHPDoc tag @phpstan\-assert\-if\-true for \$this\-\>reflection contains unknown class PHPStan\\BetterReflection\\Reflection\\Adapter\\ReflectionEnum\.$#'
+			count: 1
+			path: ../src/Reflection/ClassReflection.php
+
 		-
 			message: "#^Method PHPStan\\\\Reflection\\\\Php\\\\BuiltinMethodReflection\\:\\:getDeclaringClass\\(\\) has invalid return type PHPStan\\\\BetterReflection\\\\Reflection\\\\Adapter\\\\ReflectionEnum\\.$#"
 			count: 1

build/spl-autoload-functions-php-8.neon

@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^PHPDoc tag @var with type array\\<callable\\>\\|false is not subtype of native type array\\.$#"
+			message: "#^PHPDoc tag @var with type list\\<callable\\(string\\): void\\>\\|false is not subtype of native type list\\<callable\\(string\\): void\\>\\.$#"
 			count: 2
 			path: ../src/Command/CommandHelper.php

build/spl-autoload-functions-pre-php-7.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^PHPDoc tag @var with type array\\<callable\\(\\)\\: mixed\\>\\|false is not subtype of native type list\\<callable\\(string\\)\\: void\\>\\|false\\.$#"
-			count: 2
-			path: ../src/Command/CommandHelper.php
-
 		-
 			message: '#^Parameter \#1 \$array \(list<PHPStan\\Type\\Type>\) of array_values is already a list, call has no effect\.$#'
 			path: ../src/Type/TypeCombinator.php

composer.json

@@ -24,9 +24,9 @@
 		"nette/utils": "^3.2.5",
 		"nikic/php-parser": "^4.19.4",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "6.25.0.19",
+		"ondrejmirtes/better-reflection": "6.25.0.21",
 		"phpstan/php-8-stubs": "0.3.111",
-		"phpstan/phpdoc-parser": "1.32.0",
+		"phpstan/phpdoc-parser": "1.33.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",
 		"react/child-process": "^0.7",
@@ -123,6 +123,9 @@
 			"nette/neon": [
 				"patches/NetteNeonStringNode.patch",
 				"patches/NeonParser.patch"
+			],
+			"react/http": [
+				"patches/Sender.patch"
 			]
 		}
 	},