Skip to content

Commit d49ccbe

Browse files
Merge pull request #28 from NoResponseMate/add-sym-7
[Maintenance] Add Symfony 7 to dependencies
2 parents 846216b + b0ac556 commit d49ccbe

File tree

4 files changed

+24
-48
lines changed

4 files changed

+24
-48
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
/.github export-ignore
12
/features export-ignore
23
/spec export-ignore
34

45
/.gitattributes export-ignore
56
/.gitignore export-ignore
67
/.travis.yml export-ignore
78
/behat.yml.dist export-ignore
9+
/phpspec.yml.dist export-ignore

.github/workflows/build.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php: ["7.4", "8.0", "8.1"]
20-
symfony: ["5.3.*", "5.4.*", "6.0.*"]
19+
php: ["8.1", "8.2", "8.3"]
20+
symfony: ["^6.4", "^7.0"]
2121
exclude:
22-
- symfony: "6.0.*"
23-
php: "7.4"
22+
- php: "8.1"
23+
symfony: "^7.0"
24+
include:
25+
- php: "7.4"
26+
symfony: "^5.4"
27+
- php: "8.0"
28+
symfony: "^5.4"
2429

2530
steps:
2631
-
27-
uses: actions/checkout@v2
32+
uses: actions/checkout@v4
2833

2934
-
3035
name: Setup PHP
@@ -36,15 +41,7 @@ jobs:
3641
-
3742
name: Restrict Symfony version
3843
if: matrix.symfony != ''
39-
run: |
40-
composer global require --no-progress --no-scripts --no-plugins "symfony/flex"
41-
composer config extra.symfony.require "${{ matrix.symfony }}"
42-
composer config minimum-stability "dev"
43-
composer config prefer-stable true
44-
45-
- name: Remove Phpspec
46-
if: ${{ contains( matrix.symfony, '6.0.*' ) }}
47-
run: composer remove --dev phpspec/phpspec --no-update
44+
run: composer config extra.symfony.require "${{ matrix.symfony }}"
4845

4946
-
5047
name: Install dependencies
@@ -54,11 +51,6 @@ jobs:
5451
name: Run analysis
5552
run: composer analyse
5653

57-
-
58-
name: Run phpspec
59-
if: ${{ true != contains( matrix.symfony, '6.0.*' ) }}
60-
run: vendor/bin/phpspec run --format dot -vvv --no-interaction
61-
6254
-
6355
name: Run Behat
6456
run: vendor/bin/behat -f progress --strict -vvv --no-interaction --colors

.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

composer.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,27 @@
1212
"php": "^7.4 || ^8.0",
1313

1414
"behat/behat": "^3.4",
15-
"symfony/dependency-injection": "^5.3 || ^6.0"
15+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0"
1616
},
1717
"require-dev": {
1818
"friends-of-behat/test-context": "^1.3",
19-
"phpspec/phpspec": "^7.0"
19+
"phpspec/phpspec": "^7.0",
20+
"symfony/flex": "^1.20 || ^2.4"
2021
},
2122
"autoload": {
2223
"psr-4": { "FriendsOfBehat\\ExcludeSpecificationsExtension\\": "src/" }
2324
},
2425
"autoload-dev": {
2526
"psr-4" : { "spec\\FriendsOfBehat\\ExcludeSpecificationsExtension\\": "spec/" }
2627
},
28+
"config": {
29+
"sort-packages": true,
30+
"allow-plugins": {
31+
"symfony/flex": true
32+
}
33+
},
34+
"minimum-stability": "dev",
35+
"prefer-stable": true,
2736
"scripts": {
2837
"analyse": [
2938
"@composer validate --ansi --strict"

0 commit comments

Comments
 (0)