From 679dc32885ab8458ff1425aee527a5d045e01d07 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 20 Jun 2023 19:28:08 +0200 Subject: [PATCH] Do not autoload fixtures They should only be loaded from `app/config/services_test.yml`. Otherwise we'll have an issue when clearing the cache in prod env: ``` In DefinitionErrorExceptionPass.php line 54: Class "Doctrine\Bundle\FixturesBundle\Fixture" not found while loading "Wal labag\AnnotationBundle\DataFixtures\AnnotationFixtures". ``` Also update deps to latest. --- app/config/services.yml | 6 ++-- composer.lock | 63 +++++++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/app/config/services.yml b/app/config/services.yml index eb5d0e4e2..28eaed1e2 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -33,7 +33,7 @@ services: Wallabag\AnnotationBundle\: resource: '../../src/Wallabag/AnnotationBundle/*' - exclude: '../../src/Wallabag/AnnotationBundle/{Controller,Entity}' + exclude: '../../src/Wallabag/AnnotationBundle/{Controller,Entity,DataFixtures}' Wallabag\ApiBundle\: resource: '../../src/Wallabag/ApiBundle/*' @@ -41,7 +41,7 @@ services: Wallabag\CoreBundle\: resource: '../../src/Wallabag/CoreBundle/*' - exclude: ['../../src/Wallabag/CoreBundle/{Controller,Entity}', '../../src/Wallabag/CoreBundle/Event/*Event.php'] + exclude: ['../../src/Wallabag/CoreBundle/{Controller,Entity,DataFixtures}', '../../src/Wallabag/CoreBundle/Event/*Event.php'] # controllers are imported separately to make sure services can be injected # as action arguments even if you don't extend any base controller class @@ -122,7 +122,7 @@ services: Wallabag\UserBundle\: resource: '../../src/Wallabag/UserBundle/*' - exclude: '../../src/Wallabag/UserBundle/{Controller,Entity}' + exclude: '../../src/Wallabag/UserBundle/{Controller,Entity,DataFixtures}' Doctrine\DBAL\Connection: alias: doctrine.dbal.default_connection diff --git a/composer.lock b/composer.lock index 9adf664cb..972e8d257 100644 --- a/composer.lock +++ b/composer.lock @@ -1358,28 +1358,28 @@ }, { "name": "doctrine/inflector", - "version": "2.0.6", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024" + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^10", + "doctrine/coding-standard": "^11.0", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.3", "phpunit/phpunit": "^8.5 || ^9.5", - "vimeo/psalm": "^4.25" + "vimeo/psalm": "^4.25 || ^5.4" }, "type": "library", "autoload": { @@ -1429,7 +1429,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.6" + "source": "https://github.com/doctrine/inflector/tree/2.0.8" }, "funding": [ { @@ -1445,7 +1445,7 @@ "type": "tidelift" } ], - "time": "2022-10-20T09:10:12+00:00" + "time": "2023-06-16T13:40:37+00:00" }, { "name": "doctrine/instantiator", @@ -2137,16 +2137,16 @@ }, { "name": "fossar/htmlawed", - "version": "1.3.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/fossar/HTMLawed.git", - "reference": "5bd4ce8bca395685a06f7dd18cc40832c77aa60f" + "reference": "8aa21f94a7fc684dda9d62b4134ae5911bbe207c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fossar/HTMLawed/zipball/5bd4ce8bca395685a06f7dd18cc40832c77aa60f", - "reference": "5bd4ce8bca395685a06f7dd18cc40832c77aa60f", + "url": "https://api.github.com/repos/fossar/HTMLawed/zipball/8aa21f94a7fc684dda9d62b4134ae5911bbe207c", + "reference": "8aa21f94a7fc684dda9d62b4134ae5911bbe207c", "shasum": "" }, "require": { @@ -2188,9 +2188,9 @@ ], "support": { "issues": "https://github.com/fossar/HTMLawed/issues", - "source": "https://github.com/fossar/HTMLawed/tree/1.3.1" + "source": "https://github.com/fossar/HTMLawed/tree/1.3.2" }, - "time": "2022-06-07T07:27:07+00:00" + "time": "2023-05-22T07:47:31+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -5753,6 +5753,7 @@ "issues": "https://github.com/lexik/LexikFormFilterBundle/issues", "source": "https://github.com/lexik/LexikFormFilterBundle/tree/v7.0.3" }, + "abandoned": "spiriitlabs/form-filter-bundle", "time": "2022-07-28T11:49:50+00:00" }, { @@ -7491,16 +7492,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.19", + "version": "3.0.20", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "cc181005cf548bfd8a4896383bb825d859259f95" + "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95", - "reference": "cc181005cf548bfd8a4896383bb825d859259f95", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67", + "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67", "shasum": "" }, "require": { @@ -7581,7 +7582,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.20" }, "funding": [ { @@ -7597,7 +7598,7 @@ "type": "tidelift" } ], - "time": "2023-03-05T17:13:09+00:00" + "time": "2023-06-13T06:30:34+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -12430,16 +12431,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -12480,9 +12481,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "php-cs-fixer/diff", @@ -12645,16 +12646,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.19", + "version": "1.10.20", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046" + "reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/af5a296ff02610c1bfb4ddfac9fd4a08657b9046", - "reference": "af5a296ff02610c1bfb4ddfac9fd4a08657b9046", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", + "reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", "shasum": "" }, "require": { @@ -12703,7 +12704,7 @@ "type": "tidelift" } ], - "time": "2023-06-14T15:26:58+00:00" + "time": "2023-06-20T12:07:40+00:00" }, { "name": "phpstan/phpstan-doctrine",