Skip to content

Commit

Permalink
Merge pull request #1201 from phpDocumentor/remove-backports
Browse files Browse the repository at this point in the history
Remove backports
  • Loading branch information
jaapio authored Jan 29, 2025
2 parents e0f5b28 + f13722a commit 9cd6dd8
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 42 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
- "main"

env:
ComposerRootVersion: "2.x-dev"
ComposerRootVersion: "1.x-dev"

jobs:
code-coverage:
Expand Down Expand Up @@ -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"
Expand All @@ -83,7 +83,7 @@ jobs:
name: "Unit test"
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
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:
Expand All @@ -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"
Expand All @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
38 changes: 19 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-cli/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
],
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-code/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-graphs/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-markdown/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-restructured-text/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-theme-bootstrap/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides-theme-rst/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion packages/guides/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-main": "1.x-dev"
}
}
}

0 comments on commit 9cd6dd8

Please sign in to comment.