resolve backport conflicts

Author: jaapio

.github/workflows/integrate.yaml

@@ -55,12 +55,8 @@ jobs:
     uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.8"
     with:
       php-version: "8.2"
-<<<<<<< HEAD
       composer-root-version: "1.x-dev"
-=======
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
->>>>>>> bafbb25a (Add iconv to ci)
 
   architecture:
     name: "Check architecture"
@@ -87,38 +83,26 @@ jobs:
     name: "Unit test"
     uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.8"
     with:
-<<<<<<< HEAD
       composer-root-version: "1.x-dev"
-=======
-      composer-root-version: "2.x-dev"
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
->>>>>>> bafbb25a (Add iconv to ci)
 
   functional-tests:
     name: "Functional test"
     uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.8"
     needs: "unit-tests"
     with:
       test-suite: "functional"
-<<<<<<< HEAD
       composer-root-version: "1.x-dev"
-=======
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
->>>>>>> bafbb25a (Add iconv to ci)
 
   integration-tests:
     name: "integration test"
     uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.8"
     needs: "unit-tests"
     with:
       test-suite: "integration"
-<<<<<<< HEAD
       composer-root-version: "1.x-dev"
-=======
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
->>>>>>> bafbb25a (Add iconv to ci)
 
   xml-lint:
     runs-on: "ubuntu-latest"