Skip to content

Commit b084560

Browse files
ZombayaZombaya
authored
Merge pull request absolute-quantum#67 from integr8rs/feature/sf8
Add support for symfony 8.x and drop support for symfony 5.4
2 parents 6f8c053 + 1f87275 commit b084560

File tree

122 files changed

+5008
-964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+5008
-964
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ jobs:
6767
fail-fast: false
6868
matrix:
6969
# normal, highest, non-dev installs
70-
php-version: ['8.1', '8.2', '8.3', '8.4']
70+
php-version: ['8.2', '8.3', '8.4', '8.5']
7171
composer-options: ['--prefer-stable']
7272
dependency-versions: ['highest']
7373
include:
7474
# testing lowest PHP version with lowest dependencies
75-
- php-version: '8.1'
75+
- php-version: '8.2'
7676
dependency-versions: 'lowest'
7777
composer-options: '--prefer-lowest'
7878
env:
@@ -111,30 +111,6 @@ jobs:
111111
composer-options: "--prefer-dist --no-progress"
112112
working-directory: "demo"
113113

114-
- name: Demo symfony5.4 - Install dependencies
115-
uses: "ramsey/composer-install@v3"
116-
with:
117-
dependency-versions: "${{ matrix.dependency-versions }}"
118-
composer-options: "--prefer-dist --no-progress"
119-
working-directory: "demo/symfony5.4"
120-
121-
- name: Demo symfony5.4 - Unit Tests
122-
run: demo/symfony5.4/bin/phpunit -c demo/symfony5.4/phpunit.xml.dist
123-
env:
124-
SYMFONY_PHPUNIT_VERSION: "${{ matrix.dependency-versions == 'lowest' && '9' || '' }}"
125-
126-
- name: Demo symfony5.4-types - Install dependencies
127-
uses: "ramsey/composer-install@v3"
128-
with:
129-
dependency-versions: "${{ matrix.dependency-versions }}"
130-
composer-options: "--prefer-dist --no-progress"
131-
working-directory: "demo/symfony5.4-types"
132-
133-
- name: Demo symfony5.4-types - Unit Tests
134-
run: demo/symfony5.4-types/bin/phpunit -c demo/symfony5.4-types/phpunit.xml.dist
135-
env:
136-
SYMFONY_PHPUNIT_VERSION: "${{ matrix.dependency-versions == 'lowest' && '9' || '' }}"
137-
138114
- name: Demo symfony6.x - Install dependencies
139115
uses: "ramsey/composer-install@v3"
140116
with:
@@ -171,20 +147,44 @@ jobs:
171147
dependency-versions: "${{ matrix.dependency-versions }}"
172148
composer-options: "--prefer-dist --no-progress"
173149
working-directory: "demo/symfony7.x"
174-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
150+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
175151

176152
- name: Demo symfony7.x - Unit Tests
177153
run: demo/symfony7.x/vendor/bin/simple-phpunit -c demo/symfony7.x/phpunit.xml.dist
178-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
154+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
179155

180156
- name: Demo symfony7.x-types - Install dependencies
181157
uses: "ramsey/composer-install@v3"
182158
with:
183159
dependency-versions: "${{ matrix.dependency-versions }}"
184160
composer-options: "--prefer-dist --no-progress"
185161
working-directory: "demo/symfony7.x-types"
186-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
162+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
187163

188164
- name: Demo symfony7.x-types - Unit Tests
189165
run: demo/symfony7.x-types/vendor/bin/simple-phpunit -c demo/symfony7.x-types/phpunit.xml.dist
190-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
166+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
167+
168+
- name: Demo symfony8.x - Install dependencies
169+
uses: "ramsey/composer-install@v3"
170+
with:
171+
dependency-versions: "${{ matrix.dependency-versions }}"
172+
composer-options: "--prefer-dist --no-progress"
173+
working-directory: "demo/symfony8.x"
174+
if: ${{ startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
175+
176+
- name: Demo symfony8.x - Unit Tests
177+
run: demo/symfony8.x/vendor/bin/simple-phpunit -c demo/symfony8.x/phpunit.xml.dist
178+
if: ${{ startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
179+
180+
- name: Demo symfony8.x-types - Install dependencies
181+
uses: "ramsey/composer-install@v3"
182+
with:
183+
dependency-versions: "${{ matrix.dependency-versions }}"
184+
composer-options: "--prefer-dist --no-progress"
185+
working-directory: "demo/symfony8.x-types"
186+
if: ${{ startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}
187+
188+
- name: Demo symfony8.x-types - Unit Tests
189+
run: demo/symfony8.x-types/vendor/bin/simple-phpunit -c demo/symfony8.x-types/phpunit.xml.dist
190+
if: ${{ startsWith(matrix.php-version , '8.4') || startsWith(matrix.php-version , '8.5') }}

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
;
77

88
$demoVersions = [
9-
'symfony5.4',
10-
'symfony5.4-types',
119
'symfony6.x',
1210
'symfony6.x-orm3',
1311
'symfony6.x-types',
1412
'symfony7.x',
1513
'symfony7.x-types',
14+
'symfony8.x',
15+
'symfony8.x-types',
1616
];
1717

1818
foreach ($demoVersions as $demoVersion) {

‎composer.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
"decrypt"
1313
],
1414
"require": {
15-
"php": ">=8.1",
15+
"php": ">=8.2",
1616
"composer-runtime-api": "^2.0",
1717
"composer/semver": "^3.0",
1818
"doctrine/annotations": "^1.13 || ^2.0",
1919
"doctrine/common": "^3.4",
2020
"doctrine/dbal": "^2.13.9 || ^3.9.4 || ^4.2.2",
21-
"doctrine/doctrine-bundle": "^2.0.8",
21+
"doctrine/doctrine-bundle": "^2.12.0 || ^3.0.0",
2222
"doctrine/event-manager": "^1.2 || ^2.0.1",
2323
"doctrine/orm": "^2.12 || ^3.3",
2424
"paragonie/halite": "^4.6 || ^5.0",
25-
"symfony/cache": "^5.4 || ^6.4 || ^7.0",
26-
"symfony/config": "^5.4 || ^6.4 || ^7.0",
27-
"symfony/console": "^5.4 || ^6.4 || ^7.0",
28-
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
25+
"symfony/cache": "^6.4 || ^7.4 || ^8.0",
26+
"symfony/config": "^6.4 || ^7.4 || ^8.0",
27+
"symfony/console": "^6.4 || ^7.4 || ^8.0",
28+
"symfony/dependency-injection": "^6.4 || ^7.4 || ^8.0",
2929
"symfony/deprecation-contracts": "^2.5 || ^3.5.1",
30-
"symfony/expression-language": "^5.4 || ^6.4 || ^7.0",
31-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
32-
"symfony/property-access": "^5.4 || ^6.4 || ^7.0",
33-
"symfony/yaml": "^5.4 || ^6.4 || ^7.0"
30+
"symfony/expression-language": "^6.4 || ^7.4 || ^8.0",
31+
"symfony/http-kernel": "^6.4 || ^7.4 || ^8.0",
32+
"symfony/property-access": "^6.4 || ^7.4 || ^8.0",
33+
"symfony/yaml": "^6.4 || ^7.4 || ^8.0"
3434
},
3535
"require-dev": {
3636
"defuse/php-encryption": "^2.1",
@@ -41,7 +41,7 @@
4141
"phpcompatibility/php-compatibility": "^9.3.5",
4242
"phpstan/phpstan": "^2.1",
4343
"squizlabs/php_codesniffer": "^3.7",
44-
"symfony/phpunit-bridge": "^7.2"
44+
"symfony/phpunit-bridge": "^7.4"
4545
},
4646
"suggest": {
4747
"ext-sodium": "Required to use halite encryption library.",

‎demo/composer.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
],
1515
"installScripts" : [
1616
"Kporras07\\ComposerSymlinks\\ScriptHandler::createSymlinks",
17-
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.local",
18-
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.test.local",
19-
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4-types/.env.local",
20-
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4-types/.env.test.local",
2117
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.local",
2218
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.test.local",
2319
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x-orm3/.env.local",
@@ -27,25 +23,29 @@
2723
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.local",
2824
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.test.local",
2925
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x-types/.env.local",
30-
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x-types/.env.test.local"
26+
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x-types/.env.test.local",
27+
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony8.x/.env.local",
28+
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony8.x/.env.test.local",
29+
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony8.x-types/.env.local",
30+
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony8.x-types/.env.test.local"
3131
]
3232
},
3333
"extra": {
3434
"symlinks": {
35-
"shared/templates": "symfony5.4/templates",
36-
"./shared/templates": "symfony5.4-types/templates",
37-
"././shared/templates": "symfony6.x/templates",
38-
"./././shared/templates": "symfony6.x-orm3/templates",
39-
"././././shared/templates": "symfony6.x-types/templates",
40-
"./././././shared/templates": "symfony7.x/templates",
41-
"././././././shared/templates": "symfony7.x-types/templates",
42-
"shared/var/data.db": "symfony5.4/var/data.db",
43-
"./shared/var/data.db": "symfony5.4-types/var/data.db",
44-
"././shared/var/data.db": "symfony6.x/var/data.db",
45-
"./././shared/var/data.db": "symfony6.x-orm3/var/data.db",
46-
"././././shared/var/data.db": "symfony6.x-types/var/data.db",
47-
"./././././shared/var/data.db": "symfony7.x/var/data.db",
48-
"././././././shared/var/data.db": "symfony7.x-types/var/data.db"
35+
"shared/templates": "symfony6.x/templates",
36+
"./shared/templates": "symfony6.x-orm3/templates",
37+
"././shared/templates": "symfony6.x-types/templates",
38+
"./././shared/templates": "symfony7.x/templates",
39+
"././././shared/templates": "symfony7.x-types/templates",
40+
"./././././shared/templates": "symfony8.x/templates",
41+
"././././././shared/templates": "symfony8.x-types/templates",
42+
"shared/var/data.db": "symfony6.x/var/data.db",
43+
"./shared/var/data.db": "symfony6.x-orm3/var/data.db",
44+
"././shared/var/data.db": "symfony6.x-types/var/data.db",
45+
"./././shared/var/data.db": "symfony7.x/var/data.db",
46+
"././././shared/var/data.db": "symfony7.x-types/var/data.db",
47+
"./././././shared/var/data.db": "symfony8.x/var/data.db",
48+
"././././././shared/var/data.db": "symfony8.x-types/var/data.db"
4949
}
5050
}
5151
}

‎demo/symfony5.4-types/config/packages/php8/doctrine.yaml‎

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

‎demo/symfony5.4-types/config/routes.yaml‎

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

‎demo/symfony5.4-types/config/routes/annotations.yaml‎

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

‎demo/symfony5.4-types/src/Entity/Annotation/Secret.php‎

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

‎demo/symfony5.4-types/src/Kernel.php‎

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

‎demo/symfony5.4-types/src/Repository/Annotation/SecretRepository.php‎

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

0 commit comments

Comments
 (0)