Skip to content

Commit 420b6e7

Browse files
authored
Merge branch 'main' into exclude
2 parents 9a639f7 + cbfe20e commit 420b6e7

File tree

10 files changed

+289
-233
lines changed

10 files changed

+289
-233
lines changed

.github/workflows/integrate.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
99
- "main"
1010

1111
env:
12-
ComposerRootVersion: "1.x-dev"
12+
ComposerRootVersion: "2.x-dev"
1313

1414
jobs:
1515
code-coverage:
@@ -52,7 +52,7 @@ jobs:
5252
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
5353
with:
5454
php-version: "8.2"
55-
composer-root-version: "1.x-dev"
55+
composer-root-version: "2.x-dev"
5656

5757
architecture:
5858
name: "Check architecture"
@@ -78,23 +78,23 @@ jobs:
7878
name: "Unit test"
7979
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
8080
with:
81-
composer-root-version: "1.x-dev"
81+
composer-root-version: "2.x-dev"
8282

8383
functional-tests:
8484
name: "Functional test"
8585
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
8686
needs: "unit-tests"
8787
with:
8888
test-suite: "functional"
89-
composer-root-version: "1.x-dev"
89+
composer-root-version: "2.x-dev"
9090

9191
integration-tests:
9292
name: "integration test"
9393
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
9494
needs: "unit-tests"
9595
with:
9696
test-suite: "integration"
97-
composer-root-version: "1.x-dev"
97+
composer-root-version: "2.x-dev"
9898

9999
xml-lint:
100100
runs-on: "ubuntu-latest"

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
"php": "^8.1",
3737
"ext-json": "*",
3838
"ext-mbstring": "*",
39-
"phpdocumentor/guides": "^1.0@dev || ^0.3",
40-
"phpdocumentor/guides-cli": "^1.0@dev || ^0.3",
41-
"phpdocumentor/guides-code": "^1.0@dev || ^0.3",
42-
"phpdocumentor/guides-graphs": "^1.0@dev || ^0.3",
43-
"phpdocumentor/guides-markdown": "^1.0@dev || ^0.3",
44-
"phpdocumentor/guides-restructured-text": "^1.0@dev || ^0.3",
45-
"phpdocumentor/guides-theme-bootstrap": "^1.0@dev || ^0.3"
39+
"phpdocumentor/guides": "^2.0@dev || ^1.0",
40+
"phpdocumentor/guides-cli": "^2.0@dev || ^1.0",
41+
"phpdocumentor/guides-code": "^2.0@dev || ^1.0",
42+
"phpdocumentor/guides-graphs": "^2.0@dev || ^1.0",
43+
"phpdocumentor/guides-markdown": "^2.0@dev || ^1.0",
44+
"phpdocumentor/guides-restructured-text": "^2.0@dev || ^1.0",
45+
"phpdocumentor/guides-theme-bootstrap": "^2.0@dev || ^1.0"
4646
},
4747
"require-dev": {
4848
"ext-dom": "*",

0 commit comments

Comments
 (0)