From db4effd727b73ff57a0aec6272228f4fa1e730f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 12 Dec 2023 15:59:16 +0100 Subject: [PATCH 01/46] Revert "Revert "Add configuration for chill-doc-store into skeleton"" This reverts commit 2c9ec9db55b8dd01a4acbf7238d2e557235fd6db. --- config/bundles.php | 2 +- config/packages/champs-libres.yaml | 14 -------------- config/packages/chill_doc_store.yaml | 6 ++++++ 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 config/packages/champs-libres.yaml create mode 100644 config/packages/chill_doc_store.yaml diff --git a/config/bundles.php b/config/bundles.php index a0c6329..a54979e 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -15,7 +15,7 @@ return [ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true], - ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true], + //ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true], Chill\MainBundle\ChillMainBundle::class => ['all' => true], Chill\PersonBundle\ChillPersonBundle::class => ['all' => true], Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true], diff --git a/config/packages/champs-libres.yaml b/config/packages/champs-libres.yaml deleted file mode 100644 index ebea3ef..0000000 --- a/config/packages/champs-libres.yaml +++ /dev/null @@ -1,14 +0,0 @@ -champs_libres_async_uploader: - openstack: - os_username: '%env(resolve:OS_USERNAME)%' # Required - os_password: '%env(resolve:OS_PASSWORD)%' # Required - os_tenant_id: '%env(resolve:OS_TENANT_ID)%' # Required - os_region_name: '%env(resolve:OS_REGION_NAME)%' # Required - os_auth_url: '%env(resolve:OS_AUTH_URL)%' # Required - temp_url: - temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required - container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required - temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required. Do not forget a trailing slash - max_post_file_size: 15000000 # 15Mo (bytes) - max_expires_delay: 180 - max_submit_delay: 3600 diff --git a/config/packages/chill_doc_store.yaml b/config/packages/chill_doc_store.yaml new file mode 100644 index 0000000..994e192 --- /dev/null +++ b/config/packages/chill_doc_store.yaml @@ -0,0 +1,6 @@ +chill_doc_store: + openstack: + temp_url: + temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required + container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required + temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required -- 2.40.1 From 1f6e5a807b0af9feb902e5c79d1ce376dc45f32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 12 Dec 2023 16:02:44 +0100 Subject: [PATCH 02/46] Remove comments into bundles.php file --- config/bundles.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/bundles.php b/config/bundles.php index a54979e..06a8942 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -15,7 +15,6 @@ return [ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true], - //ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true], Chill\MainBundle\ChillMainBundle::class => ['all' => true], Chill\PersonBundle\ChillPersonBundle::class => ['all' => true], Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true], -- 2.40.1 From c3499c18811f930050b2f2a49b6a586109e6eec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 3 Sep 2023 20:47:27 +0200 Subject: [PATCH 03/46] upgrade chill-bundles to upgrade-sf5 branch --- composer.json | 6 ++---- symfony.lock | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index f2d2ed3..e0439ac 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,8 @@ }, "require": { "ext-redis": "*", - "chill-project/chill-bundles": "2.14.1", + "chill-project/chill-bundles": "dev-upgrade-sf5@dev", "symfony/flex": "^1.9", - "symfony/http-client": "^4.4 || ^5", "nelmio/alice": "^3.8", "phpoffice/phpword": "^0.18.2", "phpstan/phpstan": "^1.0", @@ -31,8 +30,7 @@ "symfony/dotenv": "^5.1", "symfony/maker-bundle": "^1.20", "doctrine/doctrine-fixtures-bundle": "^3.3", - "symfony/stopwatch": "^5.1", - "symfony/twig-bundle": "^4.4", + "symfony/stopwatch": "^5.4", "symfony/web-profiler-bundle": "^5.0", "symfony/var-dumper": "4.*", "symfony/phpunit-bridge": "^5.2", diff --git a/symfony.lock b/symfony.lock index de7ab8e..00aa318 100644 --- a/symfony.lock +++ b/symfony.lock @@ -424,9 +424,6 @@ "sebastian/recursion-context": { "version": "3.0.0" }, - "sebastian/resource-operations": { - "version": "2.0.1" - }, "sebastian/type": { "version": "3.0.0" }, @@ -479,9 +476,6 @@ "symfony/css-selector": { "version": "v5.2.3" }, - "symfony/debug": { - "version": "v4.4.11" - }, "symfony/debug-bundle": { "version": "4.1", "recipe": { -- 2.40.1 From 99e1763332d6c44d5b1c8205e71fa0bbb71a17e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 3 Sep 2023 20:49:08 +0200 Subject: [PATCH 04/46] reset templates while upgrade --- .../TwigBundle/Exception/error500.html.twig | 143 ------------------ 1 file changed, 143 deletions(-) delete mode 100644 templates/bundles/TwigBundle/Exception/error500.html.twig diff --git a/templates/bundles/TwigBundle/Exception/error500.html.twig b/templates/bundles/TwigBundle/Exception/error500.html.twig deleted file mode 100644 index e5ad7e6..0000000 --- a/templates/bundles/TwigBundle/Exception/error500.html.twig +++ /dev/null @@ -1,143 +0,0 @@ -{% extends "@ChillMain/layout.html.twig" %} - -{% block content %} - -
-

{{ 'Oops, we came across an error!'|trans }}

- -

{{ 'Don\'t panick though, we\'ll fix it as soon as possible. To help us out, please send us the information below.'|trans }}

- -
-
-
{{ 'Date and time of error'|trans }}:
{{ "now"|date("d/m/Y H:i:s") }}
-
{{ 'Error message'|trans }}:
{{ exception.message }}
-
Stacktrace:
{{ exception.traceAsString }}
-
-
- - -
-{% endblock %} - -{% block js %} - - - -{% endblock %} - -- 2.40.1 From 965f2e0281ca9b0a5608d53ad7357ce21f863b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 3 Sep 2023 21:03:00 +0200 Subject: [PATCH 05/46] update doctrine-annotations recipes --- config/routes/annotations.yaml | 7 ------- symfony.lock | 12 +++++------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 config/routes/annotations.yaml diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml deleted file mode 100644 index e92efc5..0000000 --- a/config/routes/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -controllers: - resource: ../../src/Controller/ - type: annotation - -kernel: - resource: ../../src/Kernel.php - type: annotation diff --git a/symfony.lock b/symfony.lock index 00aa318..fd56740 100644 --- a/symfony.lock +++ b/symfony.lock @@ -18,16 +18,14 @@ "version": "1.11.99.5" }, "doctrine/annotations": { - "version": "1.0", + "version": "1.14", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "a2759dd6123694c8d901d0ec80006e044c2e6457" + "branch": "main", + "version": "1.10", + "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" }, - "files": [ - "config/routes/annotations.yaml" - ] + "files": [] }, "doctrine/cache": { "version": "1.10.2" -- 2.40.1 From 28954f036e54560189e07dcac9a53ebcdadfad0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 4 Sep 2023 23:54:43 +0200 Subject: [PATCH 06/46] Upgrade recipes: doctrine-annotation --- config/packages/doctrine.yaml | 29 +++++++++++++++++++++++++++-- config/packages/prod/doctrine.yaml | 17 ----------------- config/packages/test/doctrine.yaml | 4 ---- symfony.lock | 8 +++----- 4 files changed, 30 insertions(+), 28 deletions(-) delete mode 100644 config/packages/prod/doctrine.yaml delete mode 100644 config/packages/test/doctrine.yaml diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index cbd9546..2f7112e 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -12,7 +12,7 @@ doctrine: geometry: string # IMPORTANT: You MUST configure your server version, # either here or in the DATABASE_URL env var (see .env file) - #server_version: '14' + #server_version: '15' orm: auto_generate_proxy_classes: true naming_strategy: doctrine.orm.naming_strategy.default @@ -20,7 +20,32 @@ doctrine: mappings: App: is_bundle: false - type: annotation dir: '%kernel.project_dir%/src/Entity' prefix: 'App\Entity' alias: App + +when@test: + doctrine: + dbal: + # "TEST_TOKEN" is typically set by ParaTest + dbname_suffix: '_test%env(default::TEST_TOKEN)%' + +when@prod: + doctrine: + orm: + auto_generate_proxy_classes: false + proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies' + query_cache_driver: + type: pool + pool: doctrine.system_cache_pool + result_cache_driver: + type: pool + pool: doctrine.result_cache_pool + + framework: + cache: + pools: + doctrine.result_cache_pool: + adapter: cache.app + doctrine.system_cache_pool: + adapter: cache.system diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml deleted file mode 100644 index 17299e2..0000000 --- a/config/packages/prod/doctrine.yaml +++ /dev/null @@ -1,17 +0,0 @@ -doctrine: - orm: - auto_generate_proxy_classes: false - query_cache_driver: - type: pool - pool: doctrine.system_cache_pool - result_cache_driver: - type: pool - pool: doctrine.result_cache_pool - -framework: - cache: - pools: - doctrine.result_cache_pool: - adapter: cache.app - doctrine.system_cache_pool: - adapter: cache.system diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml deleted file mode 100644 index 2ace640..0000000 --- a/config/packages/test/doctrine.yaml +++ /dev/null @@ -1,4 +0,0 @@ -doctrine: - dbal: - # "TEST_TOKEN" is typically set by ParaTest - dbname: 'main_test%env(default::TEST_TOKEN)%' diff --git a/symfony.lock b/symfony.lock index fd56740..7a1fced 100644 --- a/symfony.lock +++ b/symfony.lock @@ -46,17 +46,15 @@ "version": "v0.5.3" }, "doctrine/doctrine-bundle": { - "version": "2.7", + "version": "2.10", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", - "version": "2.3", - "ref": "b8ddff356705ad8e704ea75b6872ce89a15d614d" + "version": "2.4", + "ref": "013b823e7fee65890b23e40f31e6667a1ac519ac" }, "files": [ "config/packages/doctrine.yaml", - "config/packages/prod/doctrine.yaml", - "config/packages/test/doctrine.yaml", "src/Entity/.gitignore", "src/Repository/.gitignore" ] -- 2.40.1 From 04270eea26b640be1d790253966594e5684b2b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 00:08:46 +0200 Subject: [PATCH 07/46] Upgrade recipes: doctrine/doctrine-fixtures-bundle --- symfony.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/symfony.lock b/symfony.lock index 7a1fced..274863e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -60,12 +60,12 @@ ] }, "doctrine/doctrine-fixtures-bundle": { - "version": "3.0", + "version": "3.4", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", + "branch": "main", "version": "3.0", - "ref": "fc52d86631a6dfd9fdf3381d0b7e3df2069e51b3" + "ref": "1f5514cfa15b947298df4d771e694e578d4c204d" }, "files": [ "src/DataFixtures/AppFixtures.php" -- 2.40.1 From b2636e5ab8962a87e16f36fbf7faad6e73a00c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 00:11:51 +0200 Subject: [PATCH 08/46] recipes update: lexik/jwt-authentication-bundle --- symfony.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/symfony.lock b/symfony.lock index 274863e..e3a0d69 100644 --- a/symfony.lock +++ b/symfony.lock @@ -181,12 +181,12 @@ "version": "9.6.2" }, "lexik/jwt-authentication-bundle": { - "version": "2.16", + "version": "2.19", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.5", - "ref": "5b2157bcd5778166a5696e42f552ad36529a07a6" + "ref": "e9481b233a11ef7e15fe055a2b21fd3ac1aa2bb7" }, "files": [ "config/packages/lexik_jwt_authentication.yaml" -- 2.40.1 From 9bb77b136d9c35665089cc969d7f21aa3b75d91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 12:34:26 +0200 Subject: [PATCH 09/46] composer: chill-bundles to upgrade-sf5 branch + downgrade some bundles --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e0439ac..038b924 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,7 @@ "phpoffice/phpword": "^0.18.2", "phpstan/phpstan": "^1.0", "spomky-labs/base64url": "^2.0", - "twig/string-extra": "^3.3", - "symfony/mailer": "^5.4" + "twig/string-extra": "^3.3" }, "require-dev": { "fakerphp/faker": "^1.13", -- 2.40.1 From 93d0e13f813fc5b93cc219a7339663ef5b7e8984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 12:37:21 +0200 Subject: [PATCH 10/46] Upgrade recipes: nelmio/alice --- config/packages/dev/nelmio_alice.yaml | 9 --------- config/packages/nelmio_alice.yaml | 12 ++++++++++++ config/packages/test/nelmio_alice.yaml | 2 -- symfony.lock | 11 +++++------ 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 config/packages/dev/nelmio_alice.yaml create mode 100644 config/packages/nelmio_alice.yaml delete mode 100644 config/packages/test/nelmio_alice.yaml diff --git a/config/packages/dev/nelmio_alice.yaml b/config/packages/dev/nelmio_alice.yaml deleted file mode 100644 index 4cb9065..0000000 --- a/config/packages/dev/nelmio_alice.yaml +++ /dev/null @@ -1,9 +0,0 @@ -nelmio_alice: - functions_blacklist: - - 'current' - - 'shuffle' - - 'date' - - 'time' - - 'file' - - 'md5' - - 'sha1' diff --git a/config/packages/nelmio_alice.yaml b/config/packages/nelmio_alice.yaml new file mode 100644 index 0000000..e82c329 --- /dev/null +++ b/config/packages/nelmio_alice.yaml @@ -0,0 +1,12 @@ +when@dev: &dev + nelmio_alice: + functions_blacklist: + - 'current' + - 'shuffle' + - 'date' + - 'time' + - 'file' + - 'md5' + - 'sha1' + +when@test: *dev diff --git a/config/packages/test/nelmio_alice.yaml b/config/packages/test/nelmio_alice.yaml deleted file mode 100644 index caec543..0000000 --- a/config/packages/test/nelmio_alice.yaml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: ../dev/nelmio_alice.yaml } diff --git a/symfony.lock b/symfony.lock index e3a0d69..f52a60e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -223,16 +223,15 @@ "version": "1.7.7" }, "nelmio/alice": { - "version": "3.2", + "version": "3.12", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "3.2", - "ref": "0b9900ece737bec7752e4155c0164639dd9b0cb0" + "branch": "main", + "version": "3.3", + "ref": "42b52d2065dc3fde27912d502c18ca1926e35ae2" }, "files": [ - "config/packages/dev/nelmio_alice.yaml", - "config/packages/test/nelmio_alice.yaml" + "config/packages/nelmio_alice.yaml" ] }, "nikic/php-parser": { -- 2.40.1 From 498118d434b28a81522eb980691546cd82545e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 12:45:19 +0200 Subject: [PATCH 11/46] Upgrade recipes: nyholm/psr7 --- config/packages/nyholm_psr7.yaml | 10 ---------- symfony.lock | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/config/packages/nyholm_psr7.yaml b/config/packages/nyholm_psr7.yaml index f135723..ade8312 100644 --- a/config/packages/nyholm_psr7.yaml +++ b/config/packages/nyholm_psr7.yaml @@ -7,15 +7,5 @@ services: Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory' Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory' - # Register nyholm/psr7 services for autowiring with HTTPlug factories - Http\Message\MessageFactory: '@nyholm.psr7.httplug_factory' - Http\Message\RequestFactory: '@nyholm.psr7.httplug_factory' - Http\Message\ResponseFactory: '@nyholm.psr7.httplug_factory' - Http\Message\StreamFactory: '@nyholm.psr7.httplug_factory' - Http\Message\UriFactory: '@nyholm.psr7.httplug_factory' - nyholm.psr7.psr17_factory: class: Nyholm\Psr7\Factory\Psr17Factory - - nyholm.psr7.httplug_factory: - class: Nyholm\Psr7\Factory\HttplugFactory diff --git a/symfony.lock b/symfony.lock index f52a60e..05e29fb 100644 --- a/symfony.lock +++ b/symfony.lock @@ -238,12 +238,12 @@ "version": "v4.7.0" }, "nyholm/psr7": { - "version": "1.0", + "version": "1.8", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", + "branch": "main", "version": "1.0", - "ref": "0cd4d2d0e7f646fda75f9944f747a56e6ed13d4c" + "ref": "4a8c0345442dcca1d8a2c65633dcf0285dd5a5a2" }, "files": [ "config/packages/nyholm_psr7.yaml" -- 2.40.1 From 11ab7f01c74347e8513f6e42dfe37a04241f48d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 12:53:11 +0200 Subject: [PATCH 12/46] Upgrade recipes: phpunit/phpunit --- .env.test | 3 +++ phpunit.xml.dist | 33 +++++++++++++++------------------ symfony.lock | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.env.test b/.env.test index 43e431b..5bf6e68 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,7 @@ # define your env variables for the test env here KERNEL_CLASS='App\Kernel' APP_SECRET='$ecretf0rt3st' +SYMFONY_DEPRECATIONS_HELPER=999999 +PANTHER_APP_ENV=panther +PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots ADMIN_PASSWORD=password diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a0f9618..6c4bfed 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -6,36 +6,33 @@ backupGlobals="false" colors="true" bootstrap="tests/bootstrap.php" + convertDeprecationsToExceptions="false" > + - + + - - - - vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/Tests/ - - - - vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/Tests/ - - - - tests/ + + tests + + + src + + + + + + diff --git a/symfony.lock b/symfony.lock index 05e29fb..f2612fd 100644 --- a/symfony.lock +++ b/symfony.lock @@ -319,12 +319,12 @@ "version": "2.1.2" }, "phpunit/phpunit": { - "version": "4.7", + "version": "10.3", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.7", - "ref": "00fdb38c318774cd39f475a753028a5e8d25d47c" + "branch": "main", + "version": "9.6", + "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326" }, "files": [ ".env.test", -- 2.40.1 From 22ff9fe53f433b66a4bc9f7e4ac0e0ea7f2e2695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 14:17:00 +0200 Subject: [PATCH 13/46] Upgrade recipes: symfony/console --- bin/console | 39 +++++++-------------------------------- composer.json | 3 ++- config/bootstrap.php | 23 ----------------------- symfony.lock | 11 +++++------ 4 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 config/bootstrap.php diff --git a/bin/console b/bin/console index 5de0e1c..c933dc5 100755 --- a/bin/console +++ b/bin/console @@ -3,40 +3,15 @@ use App\Kernel; use Symfony\Bundle\FrameworkBundle\Console\Application; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\ErrorHandler\Debug; -if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { - echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; +if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) { + throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".'); } -set_time_limit(0); +require_once dirname(__DIR__).'/vendor/autoload_runtime.php'; -require dirname(__DIR__).'/vendor/autoload.php'; +return function (array $context) { + $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); -if (!class_exists(Application::class)) { - throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.'); -} - -$input = new ArgvInput(); -if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) { - putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env); -} - -if ($input->hasParameterOption('--no-debug', true)) { - putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0'); -} - -require dirname(__DIR__).'/config/bootstrap.php'; - -if ($_SERVER['APP_DEBUG']) { - umask(0000); - - if (class_exists(Debug::class)) { - Debug::enable(); - } -} - -$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']); -$application = new Application($kernel); -$application->run($input); + return new Application($kernel); +}; diff --git a/composer.json b/composer.json index 038b924..4a2612b 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "phpoffice/phpword": "^0.18.2", "phpstan/phpstan": "^1.0", "spomky-labs/base64url": "^2.0", - "twig/string-extra": "^3.3" + "twig/string-extra": "^3.3", + "symfony/runtime": "^5.4" }, "require-dev": { "fakerphp/faker": "^1.13", diff --git a/config/bootstrap.php b/config/bootstrap.php deleted file mode 100644 index 55560fb..0000000 --- a/config/bootstrap.php +++ /dev/null @@ -1,23 +0,0 @@ -=1.2) -if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) { - (new Dotenv(false))->populate($env); -} else { - // load all the .env files - (new Dotenv(false))->loadEnv(dirname(__DIR__).'/.env'); -} - -$_SERVER += $_ENV; -$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev'; -$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV']; -$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0'; diff --git a/symfony.lock b/symfony.lock index f2612fd..5fee9c9 100644 --- a/symfony.lock +++ b/symfony.lock @@ -456,16 +456,15 @@ "version": "v5.1.3" }, "symfony/console": { - "version": "4.4", + "version": "5.4", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.4", - "ref": "ea8c0eda34fda57e7d5cd8cbd889e2a387e3472c" + "branch": "main", + "version": "5.3", + "ref": "da0c8be8157600ad34f10ff0c9cc91232522e047" }, "files": [ - "bin/console", - "config/bootstrap.php" + "bin/console" ] }, "symfony/css-selector": { -- 2.40.1 From 91172e45cb0b316c4da7fa1e56f261c1e8d98515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 14:28:05 +0200 Subject: [PATCH 14/46] Upgrade recipes: symfony/debug-bundle --- config/bundles.php | 2 +- config/packages/debug.yaml | 5 +++++ config/packages/dev/debug.yaml | 4 ---- symfony.lock | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 config/packages/debug.yaml delete mode 100644 config/packages/dev/debug.yaml diff --git a/config/bundles.php b/config/bundles.php index a0c6329..82e5260 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -12,7 +12,7 @@ return [ Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], - Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], + Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true], ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true], diff --git a/config/packages/debug.yaml b/config/packages/debug.yaml new file mode 100644 index 0000000..ad874af --- /dev/null +++ b/config/packages/debug.yaml @@ -0,0 +1,5 @@ +when@dev: + debug: + # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser. + # See the "server:dump" command to start a new server. + dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%" diff --git a/config/packages/dev/debug.yaml b/config/packages/dev/debug.yaml deleted file mode 100644 index 26d4e53..0000000 --- a/config/packages/dev/debug.yaml +++ /dev/null @@ -1,4 +0,0 @@ -debug: - # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser. - # See the "server:dump" command to start a new server. - dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%" diff --git a/symfony.lock b/symfony.lock index 5fee9c9..fe1fbb1 100644 --- a/symfony.lock +++ b/symfony.lock @@ -471,15 +471,15 @@ "version": "v5.2.3" }, "symfony/debug-bundle": { - "version": "4.1", + "version": "5.4", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.1", - "ref": "f8863cbad2f2e58c4b65fa1eac892ab189971bea" + "branch": "main", + "version": "5.3", + "ref": "5aa8aa48234c8eb6dbdd7b3cd5d791485d2cec4b" }, "files": [ - "config/packages/dev/debug.yaml" + "config/packages/debug.yaml" ] }, "symfony/dependency-injection": { -- 2.40.1 From 9dd52af2c66cddf8696541d23fe892b0e1a37609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 14:30:52 +0200 Subject: [PATCH 15/46] Upgrade recipes: symfony/flex --- .env | 16 ++++++++++++---- symfony.lock | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 5e82c42..a2c6bac 100644 --- a/.env +++ b/.env @@ -1,7 +1,15 @@ -## -## Manually dump .env files in .env.local.php with -## `$ composer symfony:dump-env prod` -## +# * .env contains default values for the environment variables needed by the app +# * .env.local uncommitted file with local overrides +# * .env.$APP_ENV committed environment-specific defaults +# * .env.$APP_ENV.local uncommitted environment-specific overrides +# +# Real environment variables win over .env files. +# +# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. +# https://symfony.com/doc/current/configuration/secrets.html +# +# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). +# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration ## Locale LOCALE=fr diff --git a/symfony.lock b/symfony.lock index fe1fbb1..3aeb1c2 100644 --- a/symfony.lock +++ b/symfony.lock @@ -516,12 +516,12 @@ "version": "v5.1.3" }, "symfony/flex": { - "version": "1.0", + "version": "1.20", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", + "branch": "main", "version": "1.0", - "ref": "c0eeb50665f0f77226616b6038a9b06c03752d8e" + "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172" }, "files": [ ".env" -- 2.40.1 From 070c1f963ad74ffe7c1746b933e81eae3d9b076a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 15:22:31 +0200 Subject: [PATCH 16/46] Upgrade recipes: symfony/framework --- config/packages/framework.yaml | 9 +++++- config/packages/test/framework.yaml | 6 ---- config/preload.php | 4 --- config/routes/dev/framework.yaml | 3 -- config/routes/framework.yaml | 4 +++ config/services.yaml | 8 +----- public/index.php | 26 +++-------------- src/Kernel.php | 43 ----------------------------- symfony.lock | 10 +++---- 9 files changed, 21 insertions(+), 92 deletions(-) delete mode 100644 config/packages/test/framework.yaml delete mode 100644 config/routes/dev/framework.yaml create mode 100644 config/routes/framework.yaml diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 9fe9aff..b996de4 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -14,7 +14,7 @@ framework: - '%env(resolve:TRUSTED_HOSTS)%' #csrf_protection: true - #http_method_override: true + http_method_override: false # Enables session support. Note that the session will ONLY be started if you read or write from it. # Remove or comment this section to explicitly disable session support. @@ -22,6 +22,7 @@ framework: handler_id: null cookie_secure: auto cookie_samesite: lax + storage_factory_id: session.storage.factory.native #esi: true #fragments: true @@ -33,3 +34,9 @@ framework: ## sf4 check: ou à déplacer dans un chill.yaml assets: json_manifest_path: '%kernel.project_dir%/public/build/manifest.json' + +when@test: + framework: + test: true + session: + storage_factory_id: session.storage.factory.mock_file diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml deleted file mode 100644 index 23906ec..0000000 --- a/config/packages/test/framework.yaml +++ /dev/null @@ -1,6 +0,0 @@ -framework: - test: true - session: - storage_id: session.storage.mock_file - assets: - json_manifest_path: NULL diff --git a/config/preload.php b/config/preload.php index 064bdcd..5ebcdb2 100644 --- a/config/preload.php +++ b/config/preload.php @@ -1,9 +1,5 @@ handle($request); -$response->send(); -$kernel->terminate($request, $response); +return function (array $context) { + return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); +}; diff --git a/src/Kernel.php b/src/Kernel.php index 1cd0572..779cd1f 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -3,52 +3,9 @@ namespace App; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\RouteCollectionBuilder; class Kernel extends BaseKernel { use MicroKernelTrait; - - private const CONFIG_EXTS = '.{php,xml,yaml,yml}'; - - public function registerBundles(): iterable - { - $contents = require $this->getProjectDir().'/config/bundles.php'; - foreach ($contents as $class => $envs) { - if ($envs[$this->environment] ?? $envs['all'] ?? false) { - yield new $class(); - } - } - } - - public function getProjectDir(): string - { - return \dirname(__DIR__); - } - - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void - { - $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php')); - $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug); - $container->setParameter('container.dumper.inline_factories', true); - $confDir = $this->getProjectDir().'/config'; - - $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); - } - - protected function configureRoutes(RouteCollectionBuilder $routes): void - { - $confDir = $this->getProjectDir().'/config'; - - $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob'); - } } diff --git a/symfony.lock b/symfony.lock index 3aeb1c2..6f1bff0 100644 --- a/symfony.lock +++ b/symfony.lock @@ -531,20 +531,18 @@ "version": "v5.1.3" }, "symfony/framework-bundle": { - "version": "4.4", + "version": "5.4", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", - "version": "4.4", - "ref": "24eb45d1355810154890460e6a05c0ca27318fe7" + "version": "5.4", + "ref": "3cd216a4d007b78d8554d44a5b1c0a446dab24fb" }, "files": [ - "config/bootstrap.php", "config/packages/cache.yaml", "config/packages/framework.yaml", - "config/packages/test/framework.yaml", "config/preload.php", - "config/routes/dev/framework.yaml", + "config/routes/framework.yaml", "config/services.yaml", "public/index.php", "src/Controller/.gitignore", -- 2.40.1 From cda9ecc8ec4df77afc71301f1d945dad156b1125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 5 Sep 2023 15:26:19 +0200 Subject: [PATCH 17/46] Upgrade recipes: symfony/mailer --- .env | 5 +---- symfony.lock | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.env b/.env index a2c6bac..fae2fba 100644 --- a/.env +++ b/.env @@ -28,11 +28,8 @@ WOPI_SERVER=http://collabora:9980 # must be manually set in .env.local # ADMIN_PASSWORD= -## Symfony/swiftmailer -## Mailer ###> symfony/mailer ### -# MAILER_DSN=smtp://localhost -MAILER_DSN= +# MAILER_DSN=null://null ###< symfony/mailer ### ## Notifications diff --git a/symfony.lock b/symfony.lock index 6f1bff0..be5bb6f 100644 --- a/symfony.lock +++ b/symfony.lock @@ -568,9 +568,9 @@ "version": "5.4", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", + "branch": "main", "version": "4.3", - "ref": "bbfc7e27257d3a3f12a6fb0a42540a42d9623a37" + "ref": "2bf89438209656b85b9a49238c4467bff1b1f939" }, "files": [ "config/packages/mailer.yaml" -- 2.40.1 From d2717b087562f25b58e1fec920336b49a1d2d046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Sep 2023 12:06:08 +0200 Subject: [PATCH 18/46] Upgrade recipes: symfony/messenger --- .env | 2 +- symfony.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index fae2fba..1714966 100644 --- a/.env +++ b/.env @@ -74,10 +74,10 @@ SHORT_MESSAGE_DSN=null://null ###> symfony/messenger ### # Choose one of the transports below -# MESSENGER_TRANSPORT_DSN=doctrine://default # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages MESSENGER_TRANSPORT_DSN=sync:// +MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 ###< symfony/messenger ### ###> doctrine/doctrine-bundle ### diff --git a/symfony.lock b/symfony.lock index be5bb6f..4c5890c 100644 --- a/symfony.lock +++ b/symfony.lock @@ -591,7 +591,7 @@ "repo": "github.com/symfony/recipes", "branch": "main", "version": "5.4", - "ref": "dfe610928a5c61619bdfc830cd7fa7f091368023" + "ref": "8bd5f27013fb1d7217191c548e340f0bdb11912c" }, "files": [ "config/packages/messenger.yaml" -- 2.40.1 From cd876bd889963d4be19cdf5e60b0e93a7852530b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Sep 2023 12:14:53 +0200 Subject: [PATCH 19/46] Upgrade recipes: symfony/monolog-bundle --- config/packages/dev/monolog.yaml | 21 --------- config/packages/monolog.yaml | 62 ++++++++++++++++++++++++++ config/packages/prod/deprecations.yaml | 8 ---- config/packages/prod/monolog.yaml | 1 + config/packages/test/monolog.yaml | 12 ----- symfony.lock | 13 +++--- 6 files changed, 68 insertions(+), 49 deletions(-) delete mode 100644 config/packages/dev/monolog.yaml create mode 100644 config/packages/monolog.yaml delete mode 100644 config/packages/prod/deprecations.yaml delete mode 100644 config/packages/test/monolog.yaml diff --git a/config/packages/dev/monolog.yaml b/config/packages/dev/monolog.yaml deleted file mode 100644 index 423fc10..0000000 --- a/config/packages/dev/monolog.yaml +++ /dev/null @@ -1,21 +0,0 @@ -monolog: - handlers: - main: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" - level: debug - channels: ["!event"] - # uncomment to get logging in your browser - # you may have to allow bigger header sizes in your Web server configuration - #firephp: - # type: firephp - # level: info - #chromephp: - # type: chromephp - # level: info - console: - type: console - process_psr_3_messages: false - channels: ['!event', '!doctrine', '!console'] - bubble: false - diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml new file mode 100644 index 0000000..6ba3347 --- /dev/null +++ b/config/packages/monolog.yaml @@ -0,0 +1,62 @@ +monolog: + channels: + - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists + +when@dev: + monolog: + handlers: + main: + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + channels: ["!event"] + # uncomment to get logging in your browser + # you may have to allow bigger header sizes in your Web server configuration + #firephp: + # type: firephp + # level: info + #chromephp: + # type: chromephp + # level: info + console: + type: console + process_psr_3_messages: false + channels: ["!event", "!doctrine", "!console"] + +when@test: + monolog: + handlers: + main: + type: fingers_crossed + action_level: error + handler: nested + excluded_http_codes: [404, 405] + channels: ["!event"] + nested: + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + +# those comes from the symfony recipe. But this is overriden by the ./prod/monolog.yaml config +# when@prod: +# monolog: +# handlers: +# main: +# type: fingers_crossed +# action_level: error +# handler: nested +# excluded_http_codes: [404, 405] +# buffer_size: 50 # How many messages should be saved? Prevent memory leaks +# nested: +# type: stream +# path: php://stderr +# level: debug +# formatter: monolog.formatter.json +# console: +# type: console +# process_psr_3_messages: false +# channels: ["!event", "!doctrine"] +# deprecation: +# type: stream +# channels: [deprecation] +# path: php://stderr diff --git a/config/packages/prod/deprecations.yaml b/config/packages/prod/deprecations.yaml deleted file mode 100644 index 920a061..0000000 --- a/config/packages/prod/deprecations.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# As of Symfony 5.1, deprecations are logged in the dedicated "deprecation" channel when it exists -#monolog: -# channels: [deprecation] -# handlers: -# deprecation: -# type: stream -# channels: [deprecation] -# path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log" diff --git a/config/packages/prod/monolog.yaml b/config/packages/prod/monolog.yaml index e3a255d..e4a85e4 100644 --- a/config/packages/prod/monolog.yaml +++ b/config/packages/prod/monolog.yaml @@ -25,6 +25,7 @@ monolog: id: monolog.gelf_handler level: info channels: ['!event', '!php'] + excluded_http_codes: [404, 405] console: type: console diff --git a/config/packages/test/monolog.yaml b/config/packages/test/monolog.yaml deleted file mode 100644 index fc40641..0000000 --- a/config/packages/test/monolog.yaml +++ /dev/null @@ -1,12 +0,0 @@ -monolog: - handlers: - main: - type: fingers_crossed - action_level: error - handler: nested - excluded_http_codes: [404, 405] - channels: ["!event"] - nested: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" - level: debug diff --git a/symfony.lock b/symfony.lock index 4c5890c..fb6078c 100644 --- a/symfony.lock +++ b/symfony.lock @@ -604,18 +604,15 @@ "version": "v5.1.3" }, "symfony/monolog-bundle": { - "version": "3.3", + "version": "3.8", "recipe": { "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "3.3", - "ref": "d7249f7d560f6736115eee1851d02a65826f0a56" + "branch": "main", + "version": "3.7", + "ref": "213676c4ec929f046dfde5ea8e97625b81bc0578" }, "files": [ - "config/packages/dev/monolog.yaml", - "config/packages/prod/deprecations.yaml", - "config/packages/prod/monolog.yaml", - "config/packages/test/monolog.yaml" + "config/packages/monolog.yaml" ] }, "symfony/options-resolver": { -- 2.40.1 From fb1259ba81ad2eba22814f4ad084165b7b02a307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Sep 2023 12:19:04 +0200 Subject: [PATCH 20/46] Upgrade recipes: symfony/phpunit-bridge --- .gitignore | 1 - phpunit.xml.dist | 1 + symfony.lock | 8 ++++---- tests/bootstrap.php | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4971775..4bc1b26 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,6 @@ yarn-error.log ###< symfony/webpack-encore-bundle ### ###> symfony/phpunit-bridge ### -.phpunit .phpunit.result.cache /phpunit.xml ###< symfony/phpunit-bridge ### diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6c4bfed..d6cdb48 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -33,6 +33,7 @@ +