Merge origin/2.2.x into 2.3.x

Author: ondrejmirtes

.github/workflows/lint.yml

@@ -29,6 +29,7 @@ jobs:
           - "8.3"
           - "8.4"
           - "8.5"
+          - "8.6"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

.github/workflows/phar.yml

@@ -1085,7 +1085,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
+        php-version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5", "8.6"]
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

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

@@ -72,6 +72,7 @@ jobs:
           - "8.3"
           - "8.4"
           - "8.5"
+          - "8.6"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

.github/workflows/static-analysis.yml

@@ -35,6 +35,7 @@ jobs:
           - "8.3"
           - "8.4"
           - "8.5"
+          - "8.6"
         operating-system: [ubuntu-latest, windows-latest]
 
     steps:
@@ -98,6 +99,7 @@ jobs:
           - "8.3"
           - "8.4"
           - "8.5"
+          - "8.6"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

.github/workflows/tests.yml

@@ -35,6 +35,7 @@ jobs:
           - "8.3"
           - "8.4"
           - "8.5"
+          - "8.6"
         operating-system: [ ubuntu-latest, windows-latest ]
 
     steps:

composer.json

@@ -38,7 +38,7 @@
 		"ondrejmirtes/better-reflection": "6.70.0.6",
 		"ondrejmirtes/composer-attribute-collector": "^1.2.0",
 		"ondrejmirtes/php-merge": "^4.1",
-		"phpstan/php-8-stubs": "0.4.37",
+		"phpstan/php-8-stubs": "0.4.38",
 		"phpstan/phpdoc-parser": "2.3.5",
 		"react/child-process": "^0.7",
 		"react/event-loop": "^1.2",

composer.lock

@@ -119,10 +119,10 @@ parametersSchema:
 		loadLimit: schema(float(), nullable())
 	])
 	phpVersion: schema(anyOf(
-		schema(int(), min(70100), max(80599)),
+		schema(int(), min(70100), max(80699)),
 		structure([
-			min: schema(int(), min(70100), max(80599)),
-			max: schema(int(), min(70100), max(80599))
+			min: schema(int(), min(70100), max(80699)),
+			max: schema(int(), min(70100), max(80699))
 		])
 	), nullable())
 	polluteScopeWithLoopInitialAssignments: bool()

conf/parametersSchema.neon

@@ -1,6 +1,6 @@
 <?php
 
-\PHPStan\Testing\assertType('int<80100, 80599>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<80100, 80699>', PHP_VERSION_ID);
 \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION);
-\PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<1, 6>', PHP_MINOR_VERSION);
 \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);

e2e/composer-min-open-end-version/test.php

@@ -1,6 +1,6 @@
 <?php
 
-\PHPStan\Testing\assertType('int<80100, 80599>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<80100, 80699>', PHP_VERSION_ID);
 \PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION);
-\PHPStan\Testing\assertType('int<1, 5>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<1, 6>', PHP_MINOR_VERSION);
 \PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);