Merge pull request #723 from mspirkov/support-new-types

Use `phpdocumentor/reflection-docblock` v6 and `phpdocumentor/type-resolver` v2

Author: jaapio

Makefile

@@ -4,11 +4,11 @@ help: ## Displays this list of targets with descriptions
 
 .PHONY: code-style
 code-style:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpcs
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/phpcs
 
 .PHONY: fix-code-style
 fix-code-style:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpcbf
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/phpcbf
 
 .PHONY: static-code-analysis
 static-code-analysis: #vendor ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm
@@ -17,31 +17,31 @@ static-code-analysis: #vendor ## Runs a static code analysis with phpstan/phpsta
 
 .PHONY: test
 test: test-unit test-functional ## Runs all test suites with phpunit/phpunit
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpunit
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/phpunit
 
 .PHONY: test-unit
 test-unit: ## Runs unit tests with phpunit/phpunit
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpunit --testsuite=unit
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/phpunit --testsuite=unit
 
 .PHONY: test-functional
 test-functional: ## Runs unit tests with phpunit/phpunit
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/phpunit --testsuite=integration
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/phpunit --testsuite=integration
 
 .PHONY: dependency-analysis
 dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli .phive/composer-require-checker check --config-file=/opt/project/composer-require-checker.json
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli .phive/composer-require-checker check --config-file=/opt/project/composer-require-checker.json
 
 vendor: composer.json composer.lock
 	composer validate --no-check-publish
 	composer install --no-interaction --no-progress
 
 .PHONY: benchmark
 benchmark:
-	docker run -it --rm -v${CURDIR}:/opt/project -w /opt/project php:8.1-cli tools/phpbench run
+	docker run -it --rm -v${CURDIR}:/opt/project -w /opt/project php:8.2-cli tools/phpbench run
 
 .PHONY: rector
 rector: ## Refactor code using rector
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.1-cli vendor/bin/rector process
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:8.2-cli vendor/bin/rector process
 
 .PHONY: pre-commit-test
 pre-commit-test: fix-code-style test code-style static-code-analysis

composer.json

@@ -24,12 +24,12 @@
         }
     },
     "require": {
-        "php": "8.1.*|8.2.*|8.3.*|8.4.*|8.5.*",
+        "php": "8.2.*|8.3.*|8.4.*|8.5.*",
         "composer-runtime-api": "^2",
         "nikic/php-parser": "~4.18 || ^5.0",
         "phpdocumentor/reflection-common": "^2.1",
-        "phpdocumentor/reflection-docblock": "^5",
-        "phpdocumentor/type-resolver": "^1.4",
+        "phpdocumentor/reflection-docblock": "^6.0",
+        "phpdocumentor/type-resolver": "^2.0",
         "symfony/polyfill-php80": "^1.28",
         "webmozart/assert": "^1.7"
     },
@@ -54,7 +54,7 @@
         },
         "sort-packages": true,
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         },
         "allow-plugins": {
             "phpstan/extension-installer": true,

composer.lock

@@ -9,7 +9,7 @@
 
     <!-- Set the minimum PHP version for PHPCompatibility.
          This should be kept in sync with the requirements in the composer.json file. -->
-    <config name="testVersion" value="8.1-"/>
+    <config name="testVersion" value="8.2-"/>
 
     <arg value="nps"/>
 

phpcs.xml.dist

@@ -8,13 +8,11 @@
 use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\Php\Project;
 use phpDocumentor\Reflection\Php\ProjectFactory;
-use phpDocumentor\Reflection\Types\False_;
+use phpDocumentor\Reflection\PseudoTypes\False_;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Integer;
-use phpDocumentor\Reflection\Types\Mixed_;
 use phpDocumentor\Reflection\Types\Null_;
 use phpDocumentor\Reflection\Types\Object_;
-use phpDocumentor\Reflection\Types\Static_;
 use phpDocumentor\Reflection\Types\String_;
 use PHPUnit\Framework\TestCase;