Merge branch '2.x' into remove-array-key-validation

Author: mspirkov

.gitattributes

@@ -9,7 +9,6 @@
 /Makefile export-ignore
 /composer-require-checker.json export-ignore
 /composer.lock export-ignore
-/rector.php export-ignore
 /phpbench.json export-ignore
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore

.github/workflows/integrate.yaml

@@ -17,18 +17,21 @@ jobs:
     name: "Code Coverage"
     uses: "phpDocumentor/.github/.github/workflows/code-coverage.yml@main"
     with:
+      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
       composer-root-version: "1.x-dev"
 
   coding-standards:
     name: "Coding Standards"
     uses: "phpDocumentor/.github/.github/workflows/coding-standards.yml@v0.9"
     with:
+      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
       composer-root-version: "1.x-dev"
 
   dependency-analysis:
     name: "Dependency analysis"
     uses: "phpDocumentor/.github/.github/workflows/dependency-analysis.yml@v0.9"
     with:
+      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
       composer-root-version: "1.x-dev"
 
   lint-root:
@@ -41,12 +44,13 @@ jobs:
     name: "Static analysis"
     uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.9"
     with:
-      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, pcntl, posix"
+      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, pcntl, posix, iconv"
       composer-root-version: "1.x-dev"
 
   unit-tests:
     name: "Unit test"
     uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.9"
     with:
+      php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
       composer-root-version: "1.x-dev"
       upcoming-releases: true

Makefile

@@ -35,10 +35,6 @@ vendor: composer.json composer.lock
 benchmark:
 	docker run -it --rm -v${CURDIR}:/opt/project -w /opt/project php:7.4-cli vendor/bin/phpbench run
 
-.PHONY: rector
-rector: ## Refactor code using rector
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.4 vendor/bin/rector process
-
 .PHONY: pre-commit-test
 pre-commit-test: fix-code-style test code-style static-code-analysis
 

composer.json

@@ -10,20 +10,19 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "phpdocumentor/reflection-common": "^2.0",
-        "phpstan/phpdoc-parser": "^1.18|^2.0",
+        "phpstan/phpdoc-parser": "^2.0",
         "doctrine/deprecations": "^1.0"
     },
     "require-dev": {
         "ext-tokenizer": "*",
         "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.8",
-        "phpstan/phpstan-phpunit": "^1.1",
-        "phpstan/extension-installer": "^1.1",
-        "vimeo/psalm": "^4.25",
-        "rector/rector": "^0.13.9",
-        "phpbench/phpbench": "^1.2"
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpbench/phpbench": "^1.2",
+        "psalm/phar": "^4"
     },
     "autoload": {
         "psr-4": {
@@ -37,12 +36,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-1.x": "1.x-dev"
+            "dev-1.x": "1.x-dev",
+            "dev-2.x": "2.x-dev"
         }
     },
     "config": {
         "platform": {
-            "php": "7.3.0"
+            "php": "7.4.0"
         },
         "allow-plugins": {
             "phpstan/extension-installer": true