Skip to content

Commit c9cb1a1

Browse files
authored
feature #106 Allow Symfony 6 (sstok)
This PR was merged into the main branch. Discussion ---------- | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Fixed tickets | | License | MIT Note: This uses a fork of SymfonyTest, as the upstream is not fully compatible yet Commits ------- 6df1261 Allow Symfony 6
2 parents 1911c25 + 6df1261 commit c9cb1a1

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
| New feature? | yes/no
55
| BC breaks? | yes/no
66
| Deprecations? | yes/no
7-
| Tests pass? | yes/no
8-
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
7+
| Fixed tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
98
| License | MIT
109

1110
<!--

.github/workflows/ci.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
- PHP_VERSION: '7.4'
2525
SYMFONY_REQUIRE: '^5.2'
2626
- PHP_VERSION: '8.0'
27+
SYMFONY_REQUIRE: '^5.3'
28+
- PHP_VERSION: '8.0'
29+
SYMFONY_REQUIRE: '^6.0'
2730

2831
steps:
2932
# —— Setup Github actions 🐙 —————————————————————————————————————————————
@@ -49,7 +52,6 @@ jobs:
4952
env:
5053
SYMFONY_REQUIRE: ${{ matrix.SYMFONY_REQUIRE }}
5154
SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: 1
52-
SYMFONY_PHPUNIT_REMOVE: "symfony/yaml"
5355
SYMFONY_PHPUNIT_VERSION: '7.5.6'
5456
run: |
5557
git config --global author.name Sebastiaan Stok
@@ -59,7 +61,7 @@ jobs:
5961
6062
rm -f composer.lock
6163
composer global require symfony/flex
62-
composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
64+
composer install --no-progress --no-interaction --optimize-autoloader --ansi
6365
6466
## —— Tests ✅ ———————————————————————————————————————————————————————————
6567
-

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/vendor/
55
/.php_cs.cache
66
symfony.lock
7+
.phpunit.result.cache

composer.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@
2222
"require": {
2323
"php": ">=7.1",
2424
"rollerworks/password-strength-validator": "^1.0.1",
25-
"symfony/framework-bundle": "^3.4.22 || ^4.0 || ^5.0"
25+
"symfony/framework-bundle": "^3.4.22 || ^4.0 || ^5.0 || ^6.0"
2626
},
2727
"require-dev": {
2828
"matthiasnoback/symfony-dependency-injection-test": "^3.1.0 || ^4.1.0",
29-
"symfony/console": "^3.4.22 || ^4.0 || ^5.0",
30-
"symfony/phpunit-bridge": "^3.4.22 || ^4.0 || ^5.0",
31-
"symfony/var-dumper": "^3.4.22 || ^4.0 || ^5.0"
29+
"symfony/console": "^3.4.22 || ^4.0 || ^5.0 || ^6.0",
30+
"symfony/phpunit-bridge": "^3.4.22 || ^4.0 || ^5.0 || ^6.0",
31+
"symfony/var-dumper": "^3.4.22 || ^4.0 || ^5.0 || ^6.0"
3232
},
33+
"repositories": [
34+
{"url": "https://github.com/sstok/SymfonyDependencyInjectionTest.git", "type": "git"},
35+
{"url": "https://github.com/sstok/SymfonyConfigTest.git", "type": "git"}
36+
],
3337
"extra": {
3438
"branch-alias": {
3539
"dev-master": "2.1-dev"
@@ -48,5 +52,6 @@
4852
"Rollerworks\\Bundle\\PasswordStrengthBundle\\Tests\\": "tests/"
4953
}
5054
},
51-
"minimum-stability": "beta"
55+
"minimum-stability": "dev",
56+
"prefer-stable": true
5257
}

0 commit comments

Comments
 (0)