diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e5db11d4..ee60f8d86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: ['8.1', '8.2', '8.3'] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index a0c1041a6..86557ef99 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -3,6 +3,7 @@ $finder = (new \PhpCsFixer\Finder) ->in(__DIR__) ->exclude('var') + ->exclude('bin') ->exclude('packages/fixer/Tests/fixtures/ClassPrivateStaticCallFixerTest') ->exclude('packages/fixer/Tests/fixtures/ClassStaticCallFixerTest') ; diff --git a/composer.json b/composer.json index 7c4699e9e..4481ed515 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,7 @@ "monolog/monolog": "^2.4.0", "nelmio/cors-bundle": "^2.0", "pdeans/http": "^1.1", - "pelago/emogrifier": "^6.0", + "pelago/emogrifier": "^7.0", "scheb/2fa-bundle": "^6.0", "endroid/qr-code": "^4.8", "scheb/2fa-totp": "^6.0", diff --git a/composer.lock b/composer.lock index 2618c962f..e504370a5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b86c74ba51de3476e4269cb002b8cc93", + "content-hash": "d4f53e3be9d4bd2dbc39fbf691e8e336", "packages": [ { "name": "aws/aws-crt-php", @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.295.4", + "version": "3.296.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2372661db989fe4229abd95f4434b37252076d58" + "reference": "74dda6a5bf570ae4b394c2ed54edd573883426cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2372661db989fe4229abd95f4434b37252076d58", - "reference": "2372661db989fe4229abd95f4434b37252076d58", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/74dda6a5bf570ae4b394c2ed54edd573883426cc", + "reference": "74dda6a5bf570ae4b394c2ed54edd573883426cc", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.295.4" + "source": "https://github.com/aws/aws-sdk-php/tree/3.296.2" }, - "time": "2023-12-29T19:07:49+00:00" + "time": "2024-01-16T19:10:36+00:00" }, { "name": "brick/math", @@ -1299,16 +1299,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.8", + "version": "2.0.9", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", "shasum": "" }, "require": { @@ -1370,7 +1370,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.8" + "source": "https://github.com/doctrine/inflector/tree/2.0.9" }, "funding": [ { @@ -1386,7 +1386,7 @@ "type": "tidelift" } ], - "time": "2023-06-16T13:40:37+00:00" + "time": "2024-01-15T18:05:13+00:00" }, { "name": "doctrine/instantiator", @@ -1647,50 +1647,48 @@ }, { "name": "doctrine/mongodb-odm-bundle", - "version": "4.7.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMongoDBBundle.git", - "reference": "48c29009c24ff74c47782c0c9c2736f1f5fd9b0e" + "reference": "4d8d32b726e7af21a562a2b6a227f0496c7d39d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMongoDBBundle/zipball/48c29009c24ff74c47782c0c9c2736f1f5fd9b0e", - "reference": "48c29009c24ff74c47782c0c9c2736f1f5fd9b0e", + "url": "https://api.github.com/repos/doctrine/DoctrineMongoDBBundle/zipball/4d8d32b726e7af21a562a2b6a227f0496c7d39d5", + "reference": "4d8d32b726e7af21a562a2b6a227f0496c7d39d5", "shasum": "" }, "require": { - "doctrine/annotations": "^1.13 || ^2.0", - "doctrine/mongodb-odm": "^2.3", - "doctrine/persistence": "^2.2 || ^3.0", + "composer-runtime-api": "^2.0", + "doctrine/mongodb-odm": "^2.6", + "doctrine/persistence": "^3.0", "ext-mongodb": "^1.5", - "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1", "php": "^8.1", "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/config": "^5.4 || ^6.2", - "symfony/console": "^5.4 || ^6.2", - "symfony/dependency-injection": "^5.4 || ^6.2", - "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/doctrine-bridge": "^5.4.19 || ^6.2", - "symfony/framework-bundle": "^5.4 || ^6.2", - "symfony/http-kernel": "^5.4 || ^6.2", - "symfony/options-resolver": "^5.4 || ^6.2" + "symfony/config": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0", + "symfony/doctrine-bridge": "^6.4 || ^7.0", + "symfony/framework-bundle": "^6.4 || ^7.0", + "symfony/http-kernel": "^6.4 || ^7.0", + "symfony/options-resolver": "^6.4 || ^7.0" }, "conflict": { "doctrine/data-fixtures": "<1.3" }, "require-dev": { "doctrine/coding-standard": "^11.0", - "doctrine/data-fixtures": "^1.3", + "doctrine/data-fixtures": "^1.7", "phpunit/phpunit": "^9.5.5", "psalm/plugin-symfony": "^5.0", - "symfony/browser-kit": "^5.4 || ^6.2", - "symfony/form": "^5.4 || ^6.2", - "symfony/phpunit-bridge": "^6.2", - "symfony/security-bundle": "^5.4 || ^6.2", - "symfony/stopwatch": "^5.4 || ^6.2", - "symfony/validator": "^5.4 || ^6.2", - "symfony/yaml": "^5.4 || ^6.2", + "symfony/browser-kit": "^6.4 || ^7.0", + "symfony/form": "^6.4 || ^7.0", + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1", + "symfony/security-bundle": "^6.4 || ^7.0", + "symfony/stopwatch": "^6.4 || ^7.0", + "symfony/validator": "^6.4 || ^7.0", + "symfony/yaml": "^6.4 || ^7.0", "vimeo/psalm": "^5.12" }, "suggest": { @@ -1699,11 +1697,8 @@ "type": "symfony-bundle", "autoload": { "psr-4": { - "Doctrine\\Bundle\\MongoDBBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Doctrine\\Bundle\\MongoDBBundle\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1732,9 +1727,9 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineMongoDBBundle/issues", - "source": "https://github.com/doctrine/DoctrineMongoDBBundle/tree/4.7.0" + "source": "https://github.com/doctrine/DoctrineMongoDBBundle/tree/5.0.1" }, - "time": "2023-12-22T13:05:12+00:00" + "time": "2024-01-16T11:03:11+00:00" }, { "name": "doctrine/orm", @@ -2056,21 +2051,22 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.45.0", + "version": "v3.47.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5" + "reference": "173c60d1eff911c9c54322704623a45561d3241d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c0daa33cb2533cd73f48dde1c70c2afa3e7953b5", - "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/173c60d1eff911c9c54322704623a45561d3241d", + "reference": "173c60d1eff911c9c54322704623a45561d3241d", "shasum": "" }, "require": { "composer/semver": "^3.4", "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", @@ -2134,7 +2130,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.45.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.47.1" }, "funding": [ { @@ -2142,7 +2138,7 @@ "type": "github" } ], - "time": "2023-12-30T02:07:07+00:00" + "time": "2024-01-16T18:54:21+00:00" }, { "name": "friendsofphp/proxy-manager-lts", @@ -3437,25 +3433,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -3463,7 +3461,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -3487,9 +3485,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-01-07T17:17:35+00:00" }, { "name": "phar-io/manifest", @@ -3714,16 +3712,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { @@ -3766,22 +3764,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-01-11T11:49:22+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.5", + "version": "1.25.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", - "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", "shasum": "" }, "require": { @@ -3813,9 +3811,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" }, - "time": "2023-12-16T09:33:33+00:00" + "time": "2024-01-04T17:06:16+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4140,16 +4138,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.5", + "version": "10.5.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856" + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856", - "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8", + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8", "shasum": "" }, "require": { @@ -4221,7 +4219,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.5" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.7" }, "funding": [ { @@ -4237,7 +4235,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T15:13:52+00:00" + "time": "2024-01-14T16:40:30+00:00" }, { "name": "psr/cache", @@ -12823,34 +12821,34 @@ }, { "name": "pelago/emogrifier", - "version": "v6.0.0", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae" + "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/aa72d5407efac118f3896bcb995a2cba793df0ae", - "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/727bdf7255b51798307f17dec52ff8a91f1c7de3", + "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0", - "sabberworm/php-css-parser": "^8.3.1", - "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.3 || ^6.0" + "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "sabberworm/php-css-parser": "^8.4.0", + "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0" }, "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.3.0", - "phpunit/phpunit": "^8.5.16", - "rawr/cross-data-providers": "^2.3.0" + "php-parallel-lint/php-parallel-lint": "1.3.2", + "phpunit/phpunit": "9.6.11", + "rawr/cross-data-providers": "2.4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "7.0.x-dev" + "dev-main": "8.0.x-dev" } }, "autoload": { @@ -12897,7 +12895,7 @@ "issues": "https://github.com/MyIntervals/emogrifier/issues", "source": "https://github.com/MyIntervals/emogrifier" }, - "time": "2021-09-16T16:22:04+00:00" + "time": "2023-12-06T02:00:20+00:00" }, { "name": "phpstan/extension-installer", @@ -12945,16 +12943,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.50", + "version": "1.10.56", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" + "reference": "27816a01aea996191ee14d010f325434c0ee76fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa", + "reference": "27816a01aea996191ee14d010f325434c0ee76fa", "shasum": "" }, "require": { @@ -13003,7 +13001,7 @@ "type": "tidelift" } ], - "time": "2023-12-13T10:59:42+00:00" + "time": "2024-01-15T10:43:00+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -13059,16 +13057,16 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.3.6", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "34b3c43684834f6a20aa51af8d455480d9de8b88" + "reference": "ef7db637be9b85fa00278fc3477ac66abe8eb7d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/34b3c43684834f6a20aa51af8d455480d9de8b88", - "reference": "34b3c43684834f6a20aa51af8d455480d9de8b88", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/ef7db637be9b85fa00278fc3477ac66abe8eb7d1", + "reference": "ef7db637be9b85fa00278fc3477ac66abe8eb7d1", "shasum": "" }, "require": { @@ -13125,9 +13123,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.6" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.7" }, - "time": "2023-12-22T11:22:34+00:00" + "time": "2024-01-10T21:54:42+00:00" }, { "name": "sabberworm/php-css-parser", diff --git a/packages/console/EventListener/CommandFlowListener.php b/packages/console/EventListener/CommandFlowListener.php index 10f93684f..396b25d13 100644 --- a/packages/console/EventListener/CommandFlowListener.php +++ b/packages/console/EventListener/CommandFlowListener.php @@ -41,7 +41,7 @@ public static function getSubscribedEvents(): array ['loadIdFromInput', -10], ['generateFromDatabase', -10], ], - Event\ConsoleCommandEvent::class => [ + ConsoleCommandEvent::class => [ ['configureOptions', 1], ['logCommandStart', 0], ], @@ -58,7 +58,7 @@ public function __construct( ) { } - public function configureOptions(Event\ConsoleCommandEvent $event): void + public function configureOptions(ConsoleCommandEvent $event): void { $definition = $event->getCommand()->getDefinition(); @@ -163,7 +163,7 @@ public function generateFromDatabase(LoadExecutionIdEvent $event): void $event->setExecutionId($executionId); } - public function logCommandStart(Event\ConsoleCommandEvent $event): void + public function logCommandStart(ConsoleCommandEvent $event): void { if ($event->getInput()->getOption(self::OPTION_IGNORE)) { return; diff --git a/packages/console/Tests/EventListener/CommandFlowListenerTest.php b/packages/console/Tests/EventListener/CommandFlowListenerTest.php index fea814787..95822890c 100644 --- a/packages/console/Tests/EventListener/CommandFlowListenerTest.php +++ b/packages/console/Tests/EventListener/CommandFlowListenerTest.php @@ -89,7 +89,7 @@ public function testGetSubscribedEvents(): void ['loadIdFromInput', -10], ['generateFromDatabase', -10], ], - Event\ConsoleCommandEvent::class => [ + ConsoleCommandEvent::class => [ ['configureOptions', 1], ['logCommandStart', 0], ], @@ -521,7 +521,7 @@ public function testLogCommandStartNoExecutionId(): void ->method('dispatch') ->willReturnArgument(0); - $event = new Event\ConsoleCommandEvent( + $event = new ConsoleCommandEvent( $command = $this->createMock(Command::class), $this->createMock(InputInterface::class), $this->createMock(OutputInterface::class) @@ -549,7 +549,7 @@ public function testLogCommandStart(Execution $execution): void ) ->willReturnArgument(0); - $event = new Event\ConsoleCommandEvent( + $event = new ConsoleCommandEvent( $command = $this->createMock(Command::class), $this->createMock(InputInterface::class), $this->createMock(OutputInterface::class) @@ -837,14 +837,14 @@ private function createOptionExecutionIdInput(string $id): InputInterface return $input; } - private function createCommandEvent(): Event\ConsoleCommandEvent + private function createCommandEvent(): ConsoleCommandEvent { $command = new PurgeExecutionCommand( self::$entityManager->getConnection(), new NullLogger() ); - return new Event\ConsoleCommandEvent( + return new ConsoleCommandEvent( $command, $this->createMock(InputInterface::class), $this->createMock(OutputInterface::class) diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json index e3fe82467..35faa11fe 100644 --- a/packages/framework-extra-bundle/composer.json +++ b/packages/framework-extra-bundle/composer.json @@ -38,7 +38,7 @@ "draw/validator": "^0.11", "draw/workflow": "^0.11", "monolog/monolog": "^2.4.0", - "pelago/emogrifier": "^6.0", + "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0", "psr/log": "@stable", "symfony/event-dispatcher": "^6.4.0", diff --git a/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php b/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php index b5130a8be..978734d05 100644 --- a/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php +++ b/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php @@ -94,13 +94,7 @@ public function testInlineEmailCss(): void ->expects(static::once()) ->method('html') ->with(' - - - - - -
- +
'); $this->object->inlineEmailCss($event); diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json index 50a4b72ab..f0e7e2191 100644 --- a/packages/mailer/composer.json +++ b/packages/mailer/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "draw/tester": "^0.11", - "pelago/emogrifier": "^6.0", + "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev",