Skip to content

Add support for Symfony 8 #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
loic425 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add support for Symfony 8 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "8.1", "8.2", "8.3" ]
php: [ "8.2", "8.3" ]
postgres: ["14.6"]
symfony: [ "^6.4", "^7.0" ]
exclude:
- php: "8.1"
symfony: "^7.0"
symfony: [ "^6.4", "^7.4" ]
include:
- php: '8.4'
postgres: "14.6"
symfony: "^8.0"
name: "PHP ${{ matrix.php }} / Symfony ${{ matrix.symfony }}"
env:
APP_ENV: test
Expand All @@ -33,7 +34,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php }}"
tools: symfony
tools: 'symfony, composer:v2, flex'
coverage: none

- name: Shutdown default MySQL
Expand All @@ -46,10 +47,7 @@ jobs:
postgresql password: "postgres"

- name: "Restrict packages' versions"
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex"
composer config extra.symfony.require "${{ matrix.symfony }}"
run: composer config extra.symfony.require "${{ matrix.symfony }}"

- name: Get Composer cache directory
id: composer-cache
Expand Down Expand Up @@ -102,9 +100,7 @@ jobs:

- name: "Restrict packages' versions (Admin Ui)"
run: |
(cd src/AdminUi/ && composer global config --no-plugins allow-plugins.symfony/flex true)
(cd src/AdminUi/ && composer global config --no-plugins allow-plugins.symfony/runtime true)
(cd src/AdminUi/ && composer global require --no-progress --no-scripts --no-plugins "symfony/flex")
(cd src/AdminUi/ && composer config --no-plugins allow-plugins.symfony/runtime true)
(cd src/AdminUi/ && composer config extra.symfony.require "${{ matrix.symfony }}")

- name: "Install dependencies (Admin Ui)"
Expand All @@ -115,9 +111,7 @@ jobs:

- name: "Restrict packages' versions (Bootstrap Admin Ui)"
run: |
(cd src/BootstrapAdminUi/ && composer global config --no-plugins allow-plugins.symfony/flex true)
(cd src/BootstrapAdminUi/ && composer global config --no-plugins allow-plugins.symfony/runtime true)
(cd src/BootstrapAdminUi/ && composer global require --no-progress --no-scripts --no-plugins "symfony/flex")
(cd src/BootstrapAdminUi/ && composer config --no-plugins allow-plugins.symfony/runtime true)
(cd src/BootstrapAdminUi/ && composer config extra.symfony.require "${{ matrix.symfony }}")

- name: "Install dependencies (Bootstrap Admin Ui)"
Expand All @@ -128,9 +122,7 @@ jobs:

- name: "Restrict packages' versions (Twig Hooks)"
run: |
(cd src/TwigHooks/ && composer global config --no-plugins allow-plugins.symfony/flex true)
(cd src/TwigHooks/ && composer global config --no-plugins allow-plugins.symfony/runtime true)
(cd src/TwigHooks/ && composer global require --no-progress --no-scripts --no-plugins "symfony/flex")
(cd src/TwigHooks/ && composer config --no-plugins allow-plugins.symfony/runtime true)
(cd src/TwigHooks/ && composer config extra.symfony.require "${{ matrix.symfony }}")

- name: "Install dependencies (Twig Hooks)"
Expand All @@ -141,9 +133,7 @@ jobs:

- name: "Restrict packages' versions (Twig Extra)"
run: |
(cd src/TwigExtra/ && composer global config --no-plugins allow-plugins.symfony/flex true)
(cd src/TwigExtra/ && composer global config --no-plugins allow-plugins.symfony/runtime true)
(cd src/TwigExtra/ && composer global require --no-progress --no-scripts --no-plugins "symfony/flex")
(cd src/TwigExtra/ && composer config --no-plugins allow-plugins.symfony/runtime true)
(cd src/TwigExtra/ && composer config extra.symfony.require "${{ matrix.symfony }}")

- name: "Install dependencies (Twig Extra)"
Expand All @@ -154,9 +144,7 @@ jobs:

- name: "Restrict packages' versions (Ui Translations)"
run: |
(cd src/UiTranslations/ && composer global config --no-plugins allow-plugins.symfony/flex true)
(cd src/UiTranslations/ && composer global config --no-plugins allow-plugins.symfony/runtime true)
(cd src/UiTranslations/ && composer global require --no-progress --no-scripts --no-plugins "symfony/flex")
(cd src/UiTranslations/ && composer config --no-plugins allow-plugins.symfony/runtime true)
(cd src/UiTranslations/ && composer config extra.symfony.require "${{ matrix.symfony }}")

- name: "Install dependencies (Ui Translations)"
Expand Down
6 changes: 3 additions & 3 deletions app/Factory/BookFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
namespace App\Factory;

use App\Entity\Book;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
use Zenstruck\Foundry\Persistence\PersistentObjectFactory;

/**
* @extends PersistentProxyObjectFactory<Book>
* @extends PersistentObjectFactory<Book>
*/
final class BookFactory extends PersistentProxyObjectFactory
final class BookFactory extends PersistentObjectFactory
{
public static function class(): string
{
Expand Down
6 changes: 3 additions & 3 deletions app/Factory/ConferenceFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
namespace App\Factory;

use App\Entity\Conference;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
use Zenstruck\Foundry\Persistence\PersistentObjectFactory;

/**
* @extends PersistentProxyObjectFactory<Conference>
* @extends PersistentObjectFactory<Conference>
*/
final class ConferenceFactory extends PersistentProxyObjectFactory
final class ConferenceFactory extends PersistentObjectFactory
{
public static function class(): string
{
Expand Down
6 changes: 3 additions & 3 deletions app/Factory/SpeakerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
use App\Entity\SpeakerAvatar;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
use Zenstruck\Foundry\Persistence\PersistentObjectFactory;

/**
* @extends PersistentProxyObjectFactory<Speaker>
* @extends PersistentObjectFactory<Speaker>
*/
final class SpeakerFactory extends PersistentProxyObjectFactory
final class SpeakerFactory extends PersistentObjectFactory
{
public static function class(): string
{
Expand Down
6 changes: 3 additions & 3 deletions app/Factory/TalkFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
use App\Enum\Track;
use function Zenstruck\Foundry\lazy;
use Zenstruck\Foundry\Persistence\Exception\NotEnoughObjects;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
use Zenstruck\Foundry\Persistence\Proxy;

/**
* @extends PersistentProxyObjectFactory<Talk>
* @extends PersistentObjectFactory<Talk>
*/
final class TalkFactory extends PersistentProxyObjectFactory
final class TalkFactory extends PersistentObjectFactory
{
public static function class(): string
{
Expand Down
6 changes: 3 additions & 3 deletions app/Factory/UserFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

use App\Entity\User;
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
use Zenstruck\Foundry\Persistence\PersistentObjectFactory;

/**
* @extends PersistentProxyObjectFactory<User>
* @extends PersistentObjectFactory<User>
*/
final class UserFactory extends PersistentProxyObjectFactory
final class UserFactory extends PersistentObjectFactory
{
public function __construct(
private UserPasswordHasherInterface $userPasswordHasher,
Expand Down
66 changes: 33 additions & 33 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
],
"require": {
"php": "^8.1",
"doctrine/dbal": "^3",
"doctrine/doctrine-bundle": "^2.12",
"doctrine/orm": "^2.0",
"doctrine/dbal": "^3 || ^4",
"doctrine/doctrine-bundle": "^2.13 || ^3.0 || ^4.0",
"doctrine/orm": "^3.3 || ^4.0",
"knplabs/knp-menu-bundle": "^3.0",
"laminas/laminas-stdlib": "^3.18",
"pagerfanta/doctrine-orm-adapter": "^4.6",
"pagerfanta/twig": "^4.6",
"sylius/grid-bundle": "^1.13",
"sylius/resource-bundle": "^1.11",
"symfony/asset": "^6.4 || ^7.0",
"symfony/asset-mapper": "^6.4 || ^7.0",
"symfony/config": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/expression-language": "^6.4 || ^7.0",
"symfony/filesystem": "^6.4 || ^7.0",
"symfony/http-client": "^6.4 || ^7.0",
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/security-bundle": "^6.4 || ^7.0",
"symfony/security-http": "^6.4 || ^7.0",
"symfony/stopwatch": "^6.4 || ^7.0",
"symfony/twig-bundle": "^6.4 || ^7.0",
"sylius/grid-bundle": "^1.13 || ^1.15@alpha",
"sylius/resource-bundle": "dev-symfony-8 as 1.14.0",
"symfony/asset": "^6.4 || ^7.4 || ^8.0",
"symfony/asset-mapper": "^6.4 || ^7.4 || ^8.0",
"symfony/config": "^6.4 || ^7.4 || ^8.0",
"symfony/dependency-injection": "^6.4 || ^7.4 || ^8.0",
"symfony/expression-language": "^6.4 || ^7.4 || ^8.0",
"symfony/filesystem": "^6.4 || ^7.4 || ^8.0",
"symfony/http-client": "^6.4 || ^7.4 || ^8.0",
"symfony/http-kernel": "^6.4 || ^7.4 || ^8.0",
"symfony/security-bundle": "^6.4 || ^7.4 || ^8.0",
"symfony/security-http": "^6.4 || ^7.4 || ^8.0",
"symfony/stopwatch": "^6.4 || ^7.4 || ^8.0",
"symfony/twig-bundle": "^6.4 || ^7.4 || ^8.0",
"symfony/ux-autocomplete": "^2.17",
"symfony/ux-icons": "^2.20",
"symfony/ux-live-component": "^2.17",
Expand All @@ -44,26 +44,26 @@
"webmozart/assert": "^1.9"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.6",
"matthiasnoback/symfony-config-test": "^5.1",
"matthiasnoback/symfony-dependency-injection-test": "^5.1",
"doctrine/doctrine-fixtures-bundle": "^4.3",
"matthiasnoback/symfony-config-test": "^6.1",
"matthiasnoback/symfony-dependency-injection-test": "^6.1.0",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-symfony": "^1.3",
"phpunit/phpunit": "^9.6",
"phpunit/phpunit": "^10.5",
"sylius-labs/coding-standard": "^4.0",
"symfony/browser-kit": "^6.4 || ^7.0",
"symfony/console": "^6.4 || ^7.0",
"symfony/css-selector": "^6.4 || ^7.0",
"symfony/debug-bundle": "^6.4 || ^7.0",
"symfony/dom-crawler": "^6.4 || ^7.0",
"symfony/dotenv": "^6.4 || ^7.0",
"symfony/browser-kit": "^6.4 || ^7.4 || ^8.0",
"symfony/console": "^6.4 || ^7.4 || ^8.0",
"symfony/css-selector": "^6.4 || ^7.4 || ^8.0",
"symfony/debug-bundle": "^6.4 || ^7.4 || ^8.0",
"symfony/dom-crawler": "^6.4 || ^7.4 || ^8.0",
"symfony/dotenv": "^6.4 || ^7.4 || ^8.0",
"symfony/flex": "^2.4",
"symfony/framework-bundle": "^6.4 || ^7.0",
"symfony/framework-bundle": "^6.4 || ^7.4 || ^8.0",
"symfony/maker-bundle": "^1.61",
"symfony/runtime": "^6.4 || ^7.0",
"symfony/translation": "^6.4 || ^7.0",
"symfony/web-profiler-bundle": "^6.4 || ^7.0",
"symfony/yaml": "^6.4 || ^7.0",
"symfony/runtime": "^6.4 || ^7.4 || ^8.0",
"symfony/translation": "^6.4 || ^7.4 || ^8.0",
"symfony/web-profiler-bundle": "^6.4 || ^7.4 || ^8.0",
"symfony/yaml": "^6.4 || ^7.4 || ^8.0",
"symplify/monorepo-builder": "11.2.*",
"vich/uploader-bundle": "^2.4",
"zenstruck/foundry": "^2.0"
Expand Down Expand Up @@ -109,7 +109,7 @@
},
"extra": {
"symfony": {
"require": "7.1.*"
"require": "8.0.*"
}
},
"scripts": {
Expand Down
4 changes: 0 additions & 4 deletions config/packages/doctrine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ doctrine:
#server_version: '16'

profiling_collect_backtrace: '%kernel.debug%'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
report_fields_where_declared: true
validate_xml_mapping: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
auto_mapping: true
Expand Down
Loading