Skip to content

Commit d41f4f6

Browse files
committed
Merge branch 'main' into claude/test-arkitect-symfony-01Y6qfRAb4ebWgwPX3mequCg
Resolve conflicts by: - Keeping updated dependency versions from main (ondram/ci-detector ^4.2, symfony/polyfill-php80 ^1.33, friendsofphp/php-cs-fixer ^3.90, phpspec/prophecy-phpunit ^2.4) - Adding Symfony 8 support (^8.0 constraint for symfony components) - Merging CONTRIBUTORS.md changes All 327 tests pass with Symfony 8.0.0.
2 parents 0ca99ff + 0096703 commit d41f4f6

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

CONTRIBUTORS.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ Shout out to our top contributors!
88
- [github-actions[bot]](https://api.github.com/users/github-actions%5Bbot%5D)
99
- [pfazzi](https://api.github.com/users/pfazzi)
1010
- [sebastianstucke87](https://api.github.com/users/sebastianstucke87)
11+
- [dependabot[bot]](https://api.github.com/users/dependabot%5Bbot%5D)
1112
- [ricfio](https://api.github.com/users/ricfio)
1213
- [szepeviktor](https://api.github.com/users/szepeviktor)
13-
- [dependabot[bot]](https://api.github.com/users/dependabot%5Bbot%5D)
14-
- [helyakin](https://api.github.com/users/helyakin)
1514
- [JulienRAVIA](https://api.github.com/users/JulienRAVIA)
15+
- [helyakin](https://api.github.com/users/helyakin)
1616
- [hgraca](https://api.github.com/users/hgraca)
1717
- [ben-challis](https://api.github.com/users/ben-challis)
1818
- [raffaelecarelle](https://api.github.com/users/raffaelecarelle)
19-
- [LuigiCardamone](https://api.github.com/users/LuigiCardamone)
2019
- [simivar](https://api.github.com/users/simivar)
20+
- [LuigiCardamone](https://api.github.com/users/LuigiCardamone)
2121
- [annervisser](https://api.github.com/users/annervisser)
22-
- [jdomenechbLendable](https://api.github.com/users/jdomenechbLendable)
23-
- [dbu](https://api.github.com/users/dbu)
24-
- [stephpy](https://api.github.com/users/stephpy)
22+
- [claude](https://api.github.com/users/claude)
2523
- [marmichalski](https://api.github.com/users/marmichalski)
26-
- [EmilMassey](https://api.github.com/users/EmilMassey)
27-
- [frankverhoeven](https://api.github.com/users/frankverhoeven)
28-
- [hectorespert](https://api.github.com/users/hectorespert)
29-
- [kapersoft](https://api.github.com/users/kapersoft)
30-
- [jerowork](https://api.github.com/users/jerowork)
31-
- [jkrzefski](https://api.github.com/users/jkrzefski)
32-
- [mloru](https://api.github.com/users/mloru)
33-
- [nikow13](https://api.github.com/users/nikow13)
24+
- [stephpy](https://api.github.com/users/stephpy)
25+
- [dbu](https://api.github.com/users/dbu)
26+
- [jdomenechbLendable](https://api.github.com/users/jdomenechbLendable)
27+
- [notcgi](https://api.github.com/users/notcgi)
28+
- [DonCallisto](https://api.github.com/users/DonCallisto)
29+
- [smortexa](https://api.github.com/users/smortexa)
30+
- [philipp-yoummday](https://api.github.com/users/philipp-yoummday)
3431
- [OskarStark](https://api.github.com/users/OskarStark)
32+
- [nikow13](https://api.github.com/users/nikow13)
33+
- [mloru](https://api.github.com/users/mloru)
34+
- [jkrzefski](https://api.github.com/users/jkrzefski)

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
"php": "^7.4|^8",
2626
"ext-json": "*",
2727
"nikic/php-parser": "~5",
28-
"ondram/ci-detector": "^4.1",
28+
"ondram/ci-detector": "^4.2",
2929
"phpstan/phpdoc-parser": "^1.2|^2.0",
3030
"symfony/console": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0",
3131
"symfony/event-dispatcher": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0",
3232
"symfony/finder": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0",
33-
"symfony/polyfill-php80": "^1.20",
33+
"symfony/polyfill-php80": "^1.33",
3434
"webmozart/assert": "^1.9"
3535
},
3636
"require-dev": {
37-
"friendsofphp/php-cs-fixer": "^3.75",
37+
"friendsofphp/php-cs-fixer": "^3.90",
3838
"mikey179/vfsstream": "^1.6",
3939
"phpspec/prophecy": "^1.10",
40-
"phpspec/prophecy-phpunit": "^2.3",
40+
"phpspec/prophecy-phpunit": "^2.4",
4141
"phpunit/phpunit": "^7.5|^9.0|^10.0",
4242
"roave/security-advisories": "dev-master",
4343
"symfony/var-dumper": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0"

0 commit comments

Comments
 (0)