Merge pull request #429 from phpDocumentor/prepare-6.x-build

Prepare 6.x build

Author: jaapio

.github/workflows/integrate.yaml

@@ -5,7 +5,7 @@ name: "Integrate"
 on: # yamllint disable-line rule:truthy
   push:
     branches:
-      - "5.x"
+      - "6.x"
   pull_request: null
   # Allow manually triggering the workflow.
   workflow_dispatch: null
@@ -15,19 +15,19 @@ jobs:
     name: "Code Coverage"
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
 
   coding-standards:
     name: "Coding Standards"
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
 
   dependency-analysis:
     name: "Dependency analysis"
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
 
   lint-root:
     name: "Lint root"
@@ -40,19 +40,19 @@ jobs:
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, pcntl, posix"
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
 
   unit-tests:
     name: "Unit test"
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
       upcoming-releases: true
 
   integration-tests:
     name: "Integration test"
     uses: "phpDocumentor/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "5.x-dev"
+      composer-root-version: "6.x-dev"
       upcoming-releases: true
       test-suite: "integration"

composer.json

@@ -15,11 +15,11 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpdocumentor/type-resolver": "^1.7",
+        "phpdocumentor/type-resolver": "^2.x-dev",
         "webmozart/assert": "^1.9.1 || ^2",
         "phpdocumentor/reflection-common": "^2.2",
         "ext-filter": "*",
-        "phpstan/phpdoc-parser": "^1.7|^2.0",
+        "phpstan/phpdoc-parser": "^2.0",
         "doctrine/deprecations": "^1.1"
     },
     "require-dev": {