Merge pull request #1201 from phpDocumentor/remove-backports

jaapio · web-flow · commit 9cd6dd8971db · 2025-01-29T21:16:29.000+01:00
Remove backports
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
       - "main"
 
 env:
-  ComposerRootVersion: "2.x-dev"
+  ComposerRootVersion: "1.x-dev"
 
 jobs:
   code-coverage:
@@ -56,7 +56,7 @@ jobs:
     with:
       php-version: "8.2"
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
+      composer-root-version: "1.x-dev"
 
   architecture:
     name: "Check architecture"
@@ -83,7 +83,7 @@ jobs:
     name: "Unit test"
     uses: "phpDocumentor/.github/.github/workflows/continuous-integration.yml@v0.8"
     with:
-      composer-root-version: "2.x-dev"
+      composer-root-version: "1.x-dev"
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
 
   functional-tests:
@@ -93,7 +93,7 @@ jobs:
     with:
       test-suite: "functional"
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
+      composer-root-version: "1.x-dev"
 
   integration-tests:
     name: "integration test"
@@ -102,7 +102,7 @@ jobs:
     with:
       test-suite: "integration"
       php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv"
-      composer-root-version: "2.x-dev"
+      composer-root-version: "1.x-dev"
 
   xml-lint:
     runs-on: "ubuntu-latest"
diff --git a/composer.json b/composer.json
@@ -38,16 +38,16 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/deprecations": "^1.1",
-        "phpdocumentor/filesystem": "^2.0@dev",
+        "phpdocumentor/filesystem": "^1.0 || ^1.0@dev",
         "phpdocumentor/flyfinder": "^1.1 || ^2.0",
-        "phpdocumentor/guides": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-cli": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-code": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-graphs": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-markdown": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-restructured-text": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-theme-bootstrap": "^2.0@dev || ^1.0",
-        "phpdocumentor/guides-theme-rst": "^2.0@dev || ^1.0"
+        "phpdocumentor/guides": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-cli": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-code": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-graphs": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-markdown": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-restructured-text": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-theme-bootstrap": "^1.0 || ^1.0@dev",
+        "phpdocumentor/guides-theme-rst": "^1.0 || ^1.0@dev"
     },
     "require-dev": {
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
diff --git a/packages/filesystem/composer.json b/packages/filesystem/composer.json
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-cli/composer.json b/packages/guides-cli/composer.json
@@ -39,7 +39,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-code/composer.json b/packages/guides-code/composer.json
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-graphs/composer.json b/packages/guides-graphs/composer.json
@@ -33,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-markdown/composer.json b/packages/guides-markdown/composer.json
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-restructured-text/composer.json b/packages/guides-restructured-text/composer.json
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-theme-bootstrap/composer.json b/packages/guides-theme-bootstrap/composer.json
@@ -19,7 +19,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides-theme-rst/composer.json b/packages/guides-theme-rst/composer.json
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }
diff --git a/packages/guides/composer.json b/packages/guides/composer.json
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`},`
`29`	`29`	`"extra": {`
`30`	`30`	`"branch-alias": {`
`31`		`- "dev-main": "2.x-dev"`
	`31`	`+ "dev-main": "1.x-dev"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`],`
`40`	`40`	`"extra": {`
`41`	`41`	`"branch-alias": {`
`42`		`- "dev-main": "2.x-dev"`
	`42`	`+ "dev-main": "1.x-dev"`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`},`
`26`	`26`	`"extra": {`
`27`	`27`	`"branch-alias": {`
`28`		`- "dev-main": "2.x-dev"`
	`28`	`+ "dev-main": "1.x-dev"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`},`
`34`	`34`	`"extra": {`
`35`	`35`	`"branch-alias": {`
`36`		`- "dev-main": "2.x-dev"`
	`36`	`+ "dev-main": "1.x-dev"`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`},`
`30`	`30`	`"extra": {`
`31`	`31`	`"branch-alias": {`
`32`		`- "dev-main": "2.x-dev"`
	`32`	`+ "dev-main": "1.x-dev"`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`},`
`20`	`20`	`"extra": {`
`21`	`21`	`"branch-alias": {`
`22`		`- "dev-main": "2.x-dev"`
	`22`	`+ "dev-main": "1.x-dev"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`