Skip to content

Commit

Permalink
Add support for Symfony 7
Browse files Browse the repository at this point in the history
Squashed commits
----------------
* 28c5acf 2023-12-09 Zombaya  Allow symfony 7.x in root-composer-json and add demo project for symfony 7
* 47526a7 2023-12-09 Zombaya  Add demo-project using symfony 7.x
* e93cce7 2023-12-09 Zombaya  Use path of phpunit-bridge for symfony 4.x
* 2649be2 2023-12-09 Zombaya  Rework service-definitions and split it up in multiple files so we support sf 4.x-7.x
* d42637b 2023-12-09 Zombaya  Removed symfony 4.4 demo
* a05da56 2023-12-09 Zombaya  Add demo-project for sf 5.4
* d185546 2023-12-09 Zombaya  Replace sf 4.4 by 5.4 in CI
* a05b686 2023-12-09 Zombaya  Drop support for sf 4.* in composer.json
* 14362ff 2023-12-09 Zombaya  Allow halite 4.6 in sf 5.4-demo
* 388c358 2023-12-09 Zombaya  Use seperate config for php 8 and 7 in sf 5.4 demo
* 507e9b4 2023-12-09 Zombaya  Drop support for sf 4 in DoctrineEncryptExtension as well
* 9f23159 2023-12-09 Zombaya  Move dev-requirements and allow more versions of phpunit-bridge
* a4e79da 2023-12-09 Zombaya  Never use phpunit directly - only use the bridge
* 35add17 2023-12-09 Zombaya  Ignore tests in phpstan for now
* 0c8d2e0 2023-12-09 Zombaya  Use simple-php-unit for root-project
* aff5a52 2023-12-09 Zombaya  Stop forcing phpunit version for phpunit-bridge in 5.4-demo
* 3172c8a 2023-12-09 Zombaya  Remove forced version for php 7.2 for composer
* b74e4fb 2023-12-09 Zombaya  Require recent version of phpunit-bridge for root-project
* 53260f6 2023-12-09 Zombaya  Remove lowest for now
* d414bb8 2023-12-09 Zombaya  Add CI-run for demo 7.x
* f58810f 2023-12-09 Zombaya  Restrict CI for sf7 to php 8.2
* a1189b2 2024-02-26 Zombaya  Small cleanup after review
* 7ce2724 2024-02-26 Zombaya  Small fix for missing rename of file
  • Loading branch information
Zombaya committed Feb 26, 2024
1 parent 8689975 commit 8329fb6
Show file tree
Hide file tree
Showing 100 changed files with 7,669 additions and 651 deletions.
35 changes: 24 additions & 11 deletions .github/workflows/ci.yml
Expand Up @@ -54,11 +54,12 @@ jobs:
php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
composer-options: ['--prefer-stable']
dependency-versions: ['highest']
include:
# testing lowest PHP version with lowest dependencies
- php-version: '7.2.5'
dependency-versions: 'lowest'
composer-options: '--prefer-lowest'
# Disable lowest for now
# include:
# # testing lowest PHP version with lowest dependencies
# - php-version: '7.2.5'
# dependency-versions: 'lowest'
# composer-options: '--prefer-lowest'

steps:
- name: "Checkout code"
Expand All @@ -81,7 +82,7 @@ jobs:
composer-options: "--prefer-dist --no-progress"

- name: Unit Tests
run: vendor/bin/phpunit
run: vendor/bin/simple-phpunit

- name: Install symlinks for demo's
uses: "ramsey/composer-install@v2"
Expand All @@ -90,15 +91,15 @@ jobs:
composer-options: "--prefer-dist --no-progress"
working-directory: "demo"

- name: Demo symfony4.4 - Install dependencies
- name: Demo symfony5.4 - Install dependencies
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependency-versions }}"
composer-options: "--prefer-dist --no-progress"
working-directory: "demo/symfony4.4"
working-directory: "demo/symfony5.4"

- name: Demo symfony4.4 - Unit Tests
run: demo/symfony4.4/vendor/bin/simple-phpunit -c demo/symfony4.4/phpunit.xml.dist
- name: Demo symfony5.4 - Unit Tests
run: demo/symfony5.4/bin/phpunit -c demo/symfony5.4/phpunit.xml.dist

- name: Demo symfony6.x - Install dependencies
uses: "ramsey/composer-install@v2"
Expand All @@ -110,4 +111,16 @@ jobs:

- name: Demo symfony6.x - Unit Tests
run: demo/symfony6.x/vendor/bin/simple-phpunit -c demo/symfony6.x/phpunit.xml.dist
if: ${{ startsWith(matrix.php-version , '8.') }}
if: ${{ startsWith(matrix.php-version , '8.') }}

- name: Demo symfony7.x - Install dependencies
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependency-versions }}"
composer-options: "--prefer-dist --no-progress"
working-directory: "demo/symfony7.x"
if: ${{ startsWith(matrix.php-version , '8.2') }}

- name: Demo symfony7.x - Unit Tests
run: demo/symfony7.x/vendor/bin/simple-phpunit -c demo/symfony7.x/phpunit.xml.dist
if: ${{ startsWith(matrix.php-version , '8.2') }}
15 changes: 7 additions & 8 deletions composer.json
Expand Up @@ -9,22 +9,21 @@
"paragonie/halite": "^4.6|^5.0",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^2.0",
"symfony/property-access": "^4.1|^5.0|^6.0",
"symfony/dependency-injection": "^4.1|^5.0|^6.0",
"symfony/yaml": "^4.1|^5.0|^6.0",
"symfony/http-kernel": "^4.1|^5.0|^6.0",
"symfony/config": "^4.1|^5.0|^6.0",
"symfony/property-access": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/yaml": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0",
"symfony/config": "^5.4|^6.0|^7.0",
"doctrine/annotations": "^1.13|^2.0",
"symfony/expression-language": "^4.1|^5.0|^6.0"
"symfony/expression-language": "^5.4|^6.0|^7.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0|^9.0",
"defuse/php-encryption": "^2.1",
"doctrine/cache": "^1.11",
"phpstan/phpstan": "^1.4",
"jetbrains/phpstorm-attributes": "^1.0",
"phpcompatibility/php-compatibility": "^9.3",
"symfony/phpunit-bridge": "^6.0"
"symfony/phpunit-bridge": "^6.4|^7.0"
},
"suggest": {
"defuse/php-encryption": "Alternative for halite for use with older php-versions",
Expand Down
17 changes: 11 additions & 6 deletions demo/composer.json
Expand Up @@ -14,17 +14,22 @@
],
"installScripts" : [
"Kporras07\\ComposerSymlinks\\ScriptHandler::createSymlinks",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.local",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.test.local",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.local",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.test.local"
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.test.local",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.local",
"printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.test.local"
]
},
"extra": {
"symlinks": {
"shared/templates": "symfony4.4/templates",
"./shared/templates": "symfony6.x/templates",
"shared/var/data.db": "symfony4.4/var/data.db",
"./shared/var/data.db": "symfony6.x/var/data.db",
"shared/.Halite.key": "symfony4.4/.Halite.key"
"shared/templates": "symfony5.4/templates",
"./shared/templates": "symfony6.x/templates",
"././shared/templates": "symfony7.x/templates",
"shared/var/data.db": "symfony5.4/var/data.db",
"./shared/var/data.db": "symfony6.x/var/data.db",
"././shared/var/data.db": "symfony7.x/var/data.db"
}
}
}
1 change: 0 additions & 1 deletion demo/symfony4.4/.phpversion

This file was deleted.

42 changes: 0 additions & 42 deletions demo/symfony4.4/bin/console

This file was deleted.

23 changes: 0 additions & 23 deletions demo/symfony4.4/config/bootstrap.php

This file was deleted.

2 changes: 0 additions & 2 deletions demo/symfony4.4/config/packages/ambta_doctrine_encrypt.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions demo/symfony4.4/config/packages/doctrine.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions demo/symfony4.4/config/packages/prod/doctrine.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions demo/symfony4.4/config/packages/prod/routing.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions demo/symfony4.4/config/packages/routing.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions demo/symfony4.4/config/packages/test/doctrine.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions demo/symfony4.4/config/packages/test/framework.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions demo/symfony4.4/config/packages/test/twig.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions demo/symfony4.4/config/packages/twig.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions demo/symfony4.4/config/routes/dev/framework.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions demo/symfony4.4/docker-compose.override.yml

This file was deleted.

21 changes: 0 additions & 21 deletions demo/symfony4.4/docker-compose.yml

This file was deleted.

29 changes: 0 additions & 29 deletions demo/symfony4.4/phpunit.xml.dist

This file was deleted.

27 changes: 0 additions & 27 deletions demo/symfony4.4/public/index.php

This file was deleted.

0 comments on commit 8329fb6

Please sign in to comment.