From ace41e1766bcf52abb63d30d6f21068b1ac606a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 09:32:48 -0400 Subject: [PATCH 1/6] [CronJob] close connection during cron execution --- packages/cron-job/CronJobProcessor.php | 7 ++++++ .../cron-job/Tests/CronJobProcessorTest.php | 23 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/packages/cron-job/CronJobProcessor.php b/packages/cron-job/CronJobProcessor.php index 213bed82..f23ef489 100644 --- a/packages/cron-job/CronJobProcessor.php +++ b/packages/cron-job/CronJobProcessor.php @@ -4,6 +4,7 @@ namespace Draw\Component\CronJob; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\ManagerRegistry; use Draw\Component\CronJob\Entity\CronJob; use Draw\Component\CronJob\Entity\CronJobExecution; @@ -40,6 +41,8 @@ public function process(CronJobExecution $execution): void { $manager = $this->managerRegistry->getManagerForClass(CronJobExecution::class); + \assert($manager instanceof EntityManagerInterface); + if (!$execution->isExecutable(new \DateTimeImmutable())) { $execution->skip(); $manager->flush(); @@ -59,6 +62,10 @@ public function process(CronJobExecution $execution): void $execution->start(); $manager->flush(); + // This allows long process cron to release connection + // Also allow issue with server "gone away" to be resolved + $manager->getConnection()->close(); + $process = $this->processFactory->createFromShellCommandLine( $this->parameterBag->resolveValue( $event->getCommand() diff --git a/packages/cron-job/Tests/CronJobProcessorTest.php b/packages/cron-job/Tests/CronJobProcessorTest.php index fa0daa9f..c1aa8709 100644 --- a/packages/cron-job/Tests/CronJobProcessorTest.php +++ b/packages/cron-job/Tests/CronJobProcessorTest.php @@ -4,6 +4,7 @@ namespace Draw\Component\CronJob\Tests; +use Doctrine\DBAL\Connection; use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\ManagerRegistry; use Draw\Component\CronJob\CronJobProcessor; @@ -130,6 +131,17 @@ public function testProcess( ->expects(static::exactly(2)) ->method('flush'); + $this->entityManager + ->expects(static::once()) + ->method('getConnection') + ->willReturn( + $connection = $this->createMock(Connection::class) + ); + + $connection + ->expects(static::once()) + ->method('close'); + $this->processFactory ->expects(static::once()) ->method('createFromShellCommandLine') @@ -197,6 +209,17 @@ public function testProcessWithError(): void ->expects(static::exactly(2)) ->method('flush'); + $this->entityManager + ->expects(static::once()) + ->method('getConnection') + ->willReturn( + $connection = $this->createMock(Connection::class) + ); + + $connection + ->expects(static::once()) + ->method('close'); + $process = $this->createMock(Process::class); $process ->expects(static::any()) From 9dc1cc073ae2f68673e7dd75d6e9a55850e8df9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 13:39:22 +0000 Subject: [PATCH 2/6] prepare release 0.10.24 --- packages/application/composer.json | 6 +-- packages/aws-tool-kit/composer.json | 4 +- packages/console/composer.json | 4 +- packages/cron-job/composer.json | 8 ++-- packages/entity-migrator/composer.json | 4 +- packages/framework-extra-bundle/composer.json | 40 +++++++++---------- packages/mailer/composer.json | 4 +- packages/messenger/composer.json | 6 +-- packages/open-api/composer.json | 4 +- packages/process/composer.json | 2 +- packages/profiling/composer.json | 2 +- packages/security/composer.json | 8 ++-- packages/sonata-extra-bundle/composer.json | 4 +- packages/sonata-import-bundle/composer.json | 4 +- .../sonata-integration-bundle/composer.json | 16 ++++---- packages/tester-bundle/composer.json | 6 +-- packages/tester/composer.json | 2 +- packages/user-bundle/composer.json | 14 +++---- packages/workflow/composer.json | 2 +- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/application/composer.json b/packages/application/composer.json index 7ee91aac..a46060e6 100644 --- a/packages/application/composer.json +++ b/packages/application/composer.json @@ -10,14 +10,14 @@ "ext-iconv": "*", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.24", + "draw/core": "^0.10.24", "symfony/doctrine-bridge": "^6.4.0", "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "symfony/cache": "^6.4.0", "symfony/console": "^6.4.0" }, diff --git a/packages/aws-tool-kit/composer.json b/packages/aws-tool-kit/composer.json index feb67497..cf2e9bf5 100644 --- a/packages/aws-tool-kit/composer.json +++ b/packages/aws-tool-kit/composer.json @@ -10,8 +10,8 @@ "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.24", + "draw/tester": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0", "symfony/http-client": "^6.4.0", diff --git a/packages/console/composer.json b/packages/console/composer.json index 3da474ff..3353a896 100644 --- a/packages/console/composer.json +++ b/packages/console/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "console"], "require": { "doctrine/dbal": "^3.3", - "draw/core": "^0.11", + "draw/core": "^0.10.24", "psr/log": "@stable", "ramsey/uuid": "^4.2", "sensiolabs/ansi-to-html": "^1.2", @@ -15,7 +15,7 @@ }, "require-dev": { "doctrine/orm": "^2.11", - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0" }, diff --git a/packages/cron-job/composer.json b/packages/cron-job/composer.json index fe37ae82..af201bf5 100644 --- a/packages/cron-job/composer.json +++ b/packages/cron-job/composer.json @@ -14,9 +14,9 @@ "php": ">=8.1", "doctrine/orm": "^2.11", "dragonmantank/cron-expression": "^3.3", - "draw/core": "^0.11", - "draw/messenger": "^0.11", - "draw/process": "^0.11", + "draw/core": "^0.10.24", + "draw/messenger": "^0.10.24", + "draw/process": "^0.10.24", "symfony/amqp-messenger": "^6.4.0", "symfony/console": "^6.4.0", "symfony/dependency-injection": "^6.4.0", @@ -25,7 +25,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "nesbot/carbon": "^2.0" }, "minimum-stability": "dev", diff --git a/packages/entity-migrator/composer.json b/packages/entity-migrator/composer.json index 9257f1f4..be7191ff 100644 --- a/packages/entity-migrator/composer.json +++ b/packages/entity-migrator/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "draw/messenger": "^0.11", + "draw/messenger": "^0.10.24", "symfony/console": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", "symfony/lock": "^6.4.0", @@ -18,7 +18,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json index eb9dbd95..4e139822 100644 --- a/packages/framework-extra-bundle/composer.json +++ b/packages/framework-extra-bundle/composer.json @@ -13,31 +13,31 @@ "require": { "php": ">=8.1", "ext-json": "*", - "draw/core": "^0.11", + "draw/core": "^0.10.24", "symfony/config": "^6.4.0", "symfony/dependency-injection": "^6.4.0", "symfony/http-kernel": "^6.4.0" }, "require-dev": { - "draw/application": "^0.11", - "draw/aws-tool-kit": "^0.11", - "draw/console": "^0.11", - "draw/contracts": "^0.11", - "draw/cron-job": "^0.11", - "draw/doctrine-extra": "^0.11", - "draw/entity-migrator": "^0.11", - "draw/log": "^0.11", - "draw/mailer": "^0.11", - "draw/messenger": "^0.11", - "draw/open-api": "^0.11", - "draw/process": "^0.11", - "draw/sonata-integration-bundle": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", - "draw/tester-bundle": "^0.11", - "draw/user-bundle": "^0.11", - "draw/validator": "^0.11", - "draw/workflow": "^0.11", + "draw/application": "^0.10.24", + "draw/aws-tool-kit": "^0.10.24", + "draw/console": "^0.10.24", + "draw/contracts": "^0.10.24", + "draw/cron-job": "^0.10.24", + "draw/doctrine-extra": "^0.10.24", + "draw/entity-migrator": "^0.10.24", + "draw/log": "^0.10.24", + "draw/mailer": "^0.10.24", + "draw/messenger": "^0.10.24", + "draw/open-api": "^0.10.24", + "draw/process": "^0.10.24", + "draw/sonata-integration-bundle": "^0.10.24", + "draw/security": "^0.10.24", + "draw/tester": "^0.10.24", + "draw/tester-bundle": "^0.10.24", + "draw/user-bundle": "^0.10.24", + "draw/validator": "^0.10.24", + "draw/workflow": "^0.10.24", "monolog/monolog": "^3.5.0", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json index f0e7e219..0c45be1b 100644 --- a/packages/mailer/composer.json +++ b/packages/mailer/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "mailer", "symfony"], "require": { "php": ">=8.1", - "draw/core": "^0.11", + "draw/core": "^0.10.24", "symfony/dom-crawler": "^6.4.0", "symfony/css-selector": "^6.4.0", "symfony/console": "^6.4.0", @@ -16,7 +16,7 @@ "twig/twig": "^3.3" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0" }, diff --git a/packages/messenger/composer.json b/packages/messenger/composer.json index c141bd73..30da8d64 100644 --- a/packages/messenger/composer.json +++ b/packages/messenger/composer.json @@ -15,8 +15,8 @@ "ext-json": "*", "doctrine/dbal": "^3.3", "doctrine/persistence": "^2.2 || ^3.0", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.24", + "draw/core": "^0.10.24", "symfony/doctrine-bridge": "^6.4.0", "symfony/doctrine-messenger": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", @@ -31,7 +31,7 @@ "ext-pcntl": "*", "colinodell/psr-testlogger": "^1.1", "doctrine/orm": "^2.11", - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "psr/log": "@stable" }, diff --git a/packages/open-api/composer.json b/packages/open-api/composer.json index ffcaebb8..9580ee6a 100644 --- a/packages/open-api/composer.json +++ b/packages/open-api/composer.json @@ -14,8 +14,8 @@ }, "require-dev": { "ext-zip": "*", - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.24", + "draw/tester": "^0.10.24", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/process/composer.json b/packages/process/composer.json index 9c954c27..587ebd54 100644 --- a/packages/process/composer.json +++ b/packages/process/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "draw/contracts": "^0.11", + "draw/contracts": "^0.10.24", "symfony/process": "^6.4.0" }, "require-dev": { diff --git a/packages/profiling/composer.json b/packages/profiling/composer.json index 2508d280..7505ed05 100644 --- a/packages/profiling/composer.json +++ b/packages/profiling/composer.json @@ -10,7 +10,7 @@ } ], "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/security/composer.json b/packages/security/composer.json index 2f2d1f02..fce37c60 100644 --- a/packages/security/composer.json +++ b/packages/security/composer.json @@ -14,10 +14,10 @@ "php": ">=8.1" }, "require-dev": { - "draw/core": "^0.11", - "draw/framework-extra-bundle": "^0.11", - "draw/messenger": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.24", + "draw/framework-extra-bundle": "^0.10.24", + "draw/messenger": "^0.10.24", + "draw/tester": "^0.10.24", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/console": "^6.4.0", diff --git a/packages/sonata-extra-bundle/composer.json b/packages/sonata-extra-bundle/composer.json index 43585cf4..7753f6d2 100644 --- a/packages/sonata-extra-bundle/composer.json +++ b/packages/sonata-extra-bundle/composer.json @@ -11,8 +11,8 @@ }, "require-dev": { "cweagans/composer-patches": "^1.7", - "draw/tester": "^0.11", - "draw/security": "^0.11", + "draw/tester": "^0.10.24", + "draw/security": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", diff --git a/packages/sonata-import-bundle/composer.json b/packages/sonata-import-bundle/composer.json index b56d9de1..f8400d23 100644 --- a/packages/sonata-import-bundle/composer.json +++ b/packages/sonata-import-bundle/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=8.1", - "draw/sonata-extra-bundle": "^0.11", + "draw/sonata-extra-bundle": "^0.10.24", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", "symfony/event-dispatcher": "^6.4", @@ -20,7 +20,7 @@ "symfony/validator": "^6.4" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.24", "knplabs/doctrine-behaviors": "*", "phpunit/phpunit": "^10.0" }, diff --git a/packages/sonata-integration-bundle/composer.json b/packages/sonata-integration-bundle/composer.json index d489ed87..d92110b9 100644 --- a/packages/sonata-integration-bundle/composer.json +++ b/packages/sonata-integration-bundle/composer.json @@ -6,20 +6,20 @@ "keywords": ["symfony", "sonata"], "require": { "php": ">=8.1", - "draw/framework-extra-bundle": "^0.11", - "draw/sonata-extra-bundle": "^0.11", + "draw/framework-extra-bundle": "^0.10.24", + "draw/sonata-extra-bundle": "^0.10.24", "symfony/framework-bundle": "^6.4.0", "symfony/expression-language": "^6.4.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2" }, "require-dev": { - "draw/application": "^0.11", - "draw/console": "^0.11", - "draw/messenger": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", - "draw/user-bundle": "^0.11", + "draw/application": "^0.10.24", + "draw/console": "^0.10.24", + "draw/messenger": "^0.10.24", + "draw/security": "^0.10.24", + "draw/tester": "^0.10.24", + "draw/user-bundle": "^0.10.24", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "scheb/2fa-bundle": "^6.0", diff --git a/packages/tester-bundle/composer.json b/packages/tester-bundle/composer.json index 532eba82..85268866 100644 --- a/packages/tester-bundle/composer.json +++ b/packages/tester-bundle/composer.json @@ -5,15 +5,15 @@ "type": "symfony-bundle", "keywords": ["symfony", "automation test", "test", "unit test", "integration test"], "require": { - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.24", + "draw/tester": "^0.10.24", "symfony/browser-kit": "^6.4.0", "symfony/framework-bundle": "^6.4.0", "symfony/http-foundation": "^6.4.0", "symfony/validator": "^6.4.0" }, "require-dev": { - "draw/profiling": "^0.11", + "draw/profiling": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/messenger": "^6.4.0", "symfony/yaml": "^6.4.0" diff --git a/packages/tester/composer.json b/packages/tester/composer.json index dafe748f..2c6ab6eb 100644 --- a/packages/tester/composer.json +++ b/packages/tester/composer.json @@ -12,7 +12,7 @@ ], "require": { "ext-simplexml": "*", - "draw/core": "^0.11", + "draw/core": "^0.10.24", "guzzlehttp/psr7": "^1.8 || ^2.0", "phpunit/phpunit": "^9.0 || ^10.0", "psr/http-message": "^1.0", diff --git a/packages/user-bundle/composer.json b/packages/user-bundle/composer.json index ddf2dfda..83338102 100644 --- a/packages/user-bundle/composer.json +++ b/packages/user-bundle/composer.json @@ -11,8 +11,8 @@ "doctrine/common": "^3.1", "doctrine/doctrine-bundle": "^2.5", "doctrine/orm": "^2.11", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.24", + "draw/core": "^0.10.24", "ramsey/uuid": "^4.2", "symfony/framework-bundle": "^6.4.0", "symfony/security-core": "^6.4.0", @@ -20,11 +20,11 @@ "symfony/yaml": "^6.4.0" }, "require-dev": { - "draw/framework-extra-bundle": "^0.11", - "draw/mailer": "^0.11", - "draw/messenger": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", + "draw/framework-extra-bundle": "^0.10.24", + "draw/mailer": "^0.10.24", + "draw/messenger": "^0.10.24", + "draw/security": "^0.10.24", + "draw/tester": "^0.10.24", "endroid/qr-code": "^5.0", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/workflow/composer.json b/packages/workflow/composer.json index 39a53db2..fe67e499 100644 --- a/packages/workflow/composer.json +++ b/packages/workflow/composer.json @@ -15,7 +15,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/security": "^0.11", + "draw/security": "^0.10.24", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/security-core": "^6.4.0" }, From 69b4495a85a73bf9ce9bcdc02e414f6b0c560b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 13:39:24 +0000 Subject: [PATCH 3/6] current 0.11-dev --- packages/application/composer.json | 6 +-- packages/aws-tool-kit/composer.json | 4 +- packages/console/composer.json | 4 +- packages/cron-job/composer.json | 8 ++-- packages/entity-migrator/composer.json | 4 +- packages/framework-extra-bundle/composer.json | 40 +++++++++---------- packages/mailer/composer.json | 4 +- packages/messenger/composer.json | 6 +-- packages/open-api/composer.json | 4 +- packages/process/composer.json | 2 +- packages/profiling/composer.json | 2 +- packages/security/composer.json | 8 ++-- packages/sonata-extra-bundle/composer.json | 4 +- packages/sonata-import-bundle/composer.json | 4 +- .../sonata-integration-bundle/composer.json | 16 ++++---- packages/tester-bundle/composer.json | 6 +-- packages/tester/composer.json | 2 +- packages/user-bundle/composer.json | 14 +++---- packages/workflow/composer.json | 2 +- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/application/composer.json b/packages/application/composer.json index a46060e6..7ee91aac 100644 --- a/packages/application/composer.json +++ b/packages/application/composer.json @@ -10,14 +10,14 @@ "ext-iconv": "*", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", - "draw/contracts": "^0.10.24", - "draw/core": "^0.10.24", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "symfony/doctrine-bridge": "^6.4.0", "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "symfony/cache": "^6.4.0", "symfony/console": "^6.4.0" }, diff --git a/packages/aws-tool-kit/composer.json b/packages/aws-tool-kit/composer.json index cf2e9bf5..feb67497 100644 --- a/packages/aws-tool-kit/composer.json +++ b/packages/aws-tool-kit/composer.json @@ -10,8 +10,8 @@ "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { - "draw/core": "^0.10.24", - "draw/tester": "^0.10.24", + "draw/core": "^0.11", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0", "symfony/http-client": "^6.4.0", diff --git a/packages/console/composer.json b/packages/console/composer.json index 3353a896..3da474ff 100644 --- a/packages/console/composer.json +++ b/packages/console/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "console"], "require": { "doctrine/dbal": "^3.3", - "draw/core": "^0.10.24", + "draw/core": "^0.11", "psr/log": "@stable", "ramsey/uuid": "^4.2", "sensiolabs/ansi-to-html": "^1.2", @@ -15,7 +15,7 @@ }, "require-dev": { "doctrine/orm": "^2.11", - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0" }, diff --git a/packages/cron-job/composer.json b/packages/cron-job/composer.json index af201bf5..fe37ae82 100644 --- a/packages/cron-job/composer.json +++ b/packages/cron-job/composer.json @@ -14,9 +14,9 @@ "php": ">=8.1", "doctrine/orm": "^2.11", "dragonmantank/cron-expression": "^3.3", - "draw/core": "^0.10.24", - "draw/messenger": "^0.10.24", - "draw/process": "^0.10.24", + "draw/core": "^0.11", + "draw/messenger": "^0.11", + "draw/process": "^0.11", "symfony/amqp-messenger": "^6.4.0", "symfony/console": "^6.4.0", "symfony/dependency-injection": "^6.4.0", @@ -25,7 +25,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "nesbot/carbon": "^2.0" }, "minimum-stability": "dev", diff --git a/packages/entity-migrator/composer.json b/packages/entity-migrator/composer.json index be7191ff..9257f1f4 100644 --- a/packages/entity-migrator/composer.json +++ b/packages/entity-migrator/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "draw/messenger": "^0.10.24", + "draw/messenger": "^0.11", "symfony/console": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", "symfony/lock": "^6.4.0", @@ -18,7 +18,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json index 4e139822..eb9dbd95 100644 --- a/packages/framework-extra-bundle/composer.json +++ b/packages/framework-extra-bundle/composer.json @@ -13,31 +13,31 @@ "require": { "php": ">=8.1", "ext-json": "*", - "draw/core": "^0.10.24", + "draw/core": "^0.11", "symfony/config": "^6.4.0", "symfony/dependency-injection": "^6.4.0", "symfony/http-kernel": "^6.4.0" }, "require-dev": { - "draw/application": "^0.10.24", - "draw/aws-tool-kit": "^0.10.24", - "draw/console": "^0.10.24", - "draw/contracts": "^0.10.24", - "draw/cron-job": "^0.10.24", - "draw/doctrine-extra": "^0.10.24", - "draw/entity-migrator": "^0.10.24", - "draw/log": "^0.10.24", - "draw/mailer": "^0.10.24", - "draw/messenger": "^0.10.24", - "draw/open-api": "^0.10.24", - "draw/process": "^0.10.24", - "draw/sonata-integration-bundle": "^0.10.24", - "draw/security": "^0.10.24", - "draw/tester": "^0.10.24", - "draw/tester-bundle": "^0.10.24", - "draw/user-bundle": "^0.10.24", - "draw/validator": "^0.10.24", - "draw/workflow": "^0.10.24", + "draw/application": "^0.11", + "draw/aws-tool-kit": "^0.11", + "draw/console": "^0.11", + "draw/contracts": "^0.11", + "draw/cron-job": "^0.11", + "draw/doctrine-extra": "^0.11", + "draw/entity-migrator": "^0.11", + "draw/log": "^0.11", + "draw/mailer": "^0.11", + "draw/messenger": "^0.11", + "draw/open-api": "^0.11", + "draw/process": "^0.11", + "draw/sonata-integration-bundle": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", + "draw/tester-bundle": "^0.11", + "draw/user-bundle": "^0.11", + "draw/validator": "^0.11", + "draw/workflow": "^0.11", "monolog/monolog": "^3.5.0", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json index 0c45be1b..f0e7e219 100644 --- a/packages/mailer/composer.json +++ b/packages/mailer/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "mailer", "symfony"], "require": { "php": ">=8.1", - "draw/core": "^0.10.24", + "draw/core": "^0.11", "symfony/dom-crawler": "^6.4.0", "symfony/css-selector": "^6.4.0", "symfony/console": "^6.4.0", @@ -16,7 +16,7 @@ "twig/twig": "^3.3" }, "require-dev": { - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0" }, diff --git a/packages/messenger/composer.json b/packages/messenger/composer.json index 30da8d64..c141bd73 100644 --- a/packages/messenger/composer.json +++ b/packages/messenger/composer.json @@ -15,8 +15,8 @@ "ext-json": "*", "doctrine/dbal": "^3.3", "doctrine/persistence": "^2.2 || ^3.0", - "draw/contracts": "^0.10.24", - "draw/core": "^0.10.24", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "symfony/doctrine-bridge": "^6.4.0", "symfony/doctrine-messenger": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", @@ -31,7 +31,7 @@ "ext-pcntl": "*", "colinodell/psr-testlogger": "^1.1", "doctrine/orm": "^2.11", - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "psr/log": "@stable" }, diff --git a/packages/open-api/composer.json b/packages/open-api/composer.json index 9580ee6a..ffcaebb8 100644 --- a/packages/open-api/composer.json +++ b/packages/open-api/composer.json @@ -14,8 +14,8 @@ }, "require-dev": { "ext-zip": "*", - "draw/core": "^0.10.24", - "draw/tester": "^0.10.24", + "draw/core": "^0.11", + "draw/tester": "^0.11", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/process/composer.json b/packages/process/composer.json index 587ebd54..9c954c27 100644 --- a/packages/process/composer.json +++ b/packages/process/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "draw/contracts": "^0.10.24", + "draw/contracts": "^0.11", "symfony/process": "^6.4.0" }, "require-dev": { diff --git a/packages/profiling/composer.json b/packages/profiling/composer.json index 7505ed05..2508d280 100644 --- a/packages/profiling/composer.json +++ b/packages/profiling/composer.json @@ -10,7 +10,7 @@ } ], "require-dev": { - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/security/composer.json b/packages/security/composer.json index fce37c60..2f2d1f02 100644 --- a/packages/security/composer.json +++ b/packages/security/composer.json @@ -14,10 +14,10 @@ "php": ">=8.1" }, "require-dev": { - "draw/core": "^0.10.24", - "draw/framework-extra-bundle": "^0.10.24", - "draw/messenger": "^0.10.24", - "draw/tester": "^0.10.24", + "draw/core": "^0.11", + "draw/framework-extra-bundle": "^0.11", + "draw/messenger": "^0.11", + "draw/tester": "^0.11", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/console": "^6.4.0", diff --git a/packages/sonata-extra-bundle/composer.json b/packages/sonata-extra-bundle/composer.json index 7753f6d2..43585cf4 100644 --- a/packages/sonata-extra-bundle/composer.json +++ b/packages/sonata-extra-bundle/composer.json @@ -11,8 +11,8 @@ }, "require-dev": { "cweagans/composer-patches": "^1.7", - "draw/tester": "^0.10.24", - "draw/security": "^0.10.24", + "draw/tester": "^0.11", + "draw/security": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", diff --git a/packages/sonata-import-bundle/composer.json b/packages/sonata-import-bundle/composer.json index f8400d23..b56d9de1 100644 --- a/packages/sonata-import-bundle/composer.json +++ b/packages/sonata-import-bundle/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=8.1", - "draw/sonata-extra-bundle": "^0.10.24", + "draw/sonata-extra-bundle": "^0.11", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", "symfony/event-dispatcher": "^6.4", @@ -20,7 +20,7 @@ "symfony/validator": "^6.4" }, "require-dev": { - "draw/tester": "^0.10.24", + "draw/tester": "^0.11", "knplabs/doctrine-behaviors": "*", "phpunit/phpunit": "^10.0" }, diff --git a/packages/sonata-integration-bundle/composer.json b/packages/sonata-integration-bundle/composer.json index d92110b9..d489ed87 100644 --- a/packages/sonata-integration-bundle/composer.json +++ b/packages/sonata-integration-bundle/composer.json @@ -6,20 +6,20 @@ "keywords": ["symfony", "sonata"], "require": { "php": ">=8.1", - "draw/framework-extra-bundle": "^0.10.24", - "draw/sonata-extra-bundle": "^0.10.24", + "draw/framework-extra-bundle": "^0.11", + "draw/sonata-extra-bundle": "^0.11", "symfony/framework-bundle": "^6.4.0", "symfony/expression-language": "^6.4.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2" }, "require-dev": { - "draw/application": "^0.10.24", - "draw/console": "^0.10.24", - "draw/messenger": "^0.10.24", - "draw/security": "^0.10.24", - "draw/tester": "^0.10.24", - "draw/user-bundle": "^0.10.24", + "draw/application": "^0.11", + "draw/console": "^0.11", + "draw/messenger": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", + "draw/user-bundle": "^0.11", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "scheb/2fa-bundle": "^6.0", diff --git a/packages/tester-bundle/composer.json b/packages/tester-bundle/composer.json index 85268866..532eba82 100644 --- a/packages/tester-bundle/composer.json +++ b/packages/tester-bundle/composer.json @@ -5,15 +5,15 @@ "type": "symfony-bundle", "keywords": ["symfony", "automation test", "test", "unit test", "integration test"], "require": { - "draw/core": "^0.10.24", - "draw/tester": "^0.10.24", + "draw/core": "^0.11", + "draw/tester": "^0.11", "symfony/browser-kit": "^6.4.0", "symfony/framework-bundle": "^6.4.0", "symfony/http-foundation": "^6.4.0", "symfony/validator": "^6.4.0" }, "require-dev": { - "draw/profiling": "^0.10.24", + "draw/profiling": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/messenger": "^6.4.0", "symfony/yaml": "^6.4.0" diff --git a/packages/tester/composer.json b/packages/tester/composer.json index 2c6ab6eb..dafe748f 100644 --- a/packages/tester/composer.json +++ b/packages/tester/composer.json @@ -12,7 +12,7 @@ ], "require": { "ext-simplexml": "*", - "draw/core": "^0.10.24", + "draw/core": "^0.11", "guzzlehttp/psr7": "^1.8 || ^2.0", "phpunit/phpunit": "^9.0 || ^10.0", "psr/http-message": "^1.0", diff --git a/packages/user-bundle/composer.json b/packages/user-bundle/composer.json index 83338102..ddf2dfda 100644 --- a/packages/user-bundle/composer.json +++ b/packages/user-bundle/composer.json @@ -11,8 +11,8 @@ "doctrine/common": "^3.1", "doctrine/doctrine-bundle": "^2.5", "doctrine/orm": "^2.11", - "draw/contracts": "^0.10.24", - "draw/core": "^0.10.24", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "ramsey/uuid": "^4.2", "symfony/framework-bundle": "^6.4.0", "symfony/security-core": "^6.4.0", @@ -20,11 +20,11 @@ "symfony/yaml": "^6.4.0" }, "require-dev": { - "draw/framework-extra-bundle": "^0.10.24", - "draw/mailer": "^0.10.24", - "draw/messenger": "^0.10.24", - "draw/security": "^0.10.24", - "draw/tester": "^0.10.24", + "draw/framework-extra-bundle": "^0.11", + "draw/mailer": "^0.11", + "draw/messenger": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", "endroid/qr-code": "^5.0", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/workflow/composer.json b/packages/workflow/composer.json index fe67e499..39a53db2 100644 --- a/packages/workflow/composer.json +++ b/packages/workflow/composer.json @@ -15,7 +15,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/security": "^0.10.24", + "draw/security": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/security-core": "^6.4.0" }, From af3bba8de1d3344a957d432f101434356c53d8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 15:47:17 -0400 Subject: [PATCH 4/6] [SonataExtradBundle] translate show grid column name --- .../Resources/views/CRUD/show_grid.html.twig | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/sonata-extra-bundle/Resources/views/CRUD/show_grid.html.twig b/packages/sonata-extra-bundle/Resources/views/CRUD/show_grid.html.twig index 836ad474..11901b83 100644 --- a/packages/sonata-extra-bundle/Resources/views/CRUD/show_grid.html.twig +++ b/packages/sonata-extra-bundle/Resources/views/CRUD/show_grid.html.twig @@ -12,7 +12,17 @@ {% for field in field_description.options.fields %} {% if field.type != 'grid' %} {% set colCount = colCount +1 %} - {{ field.label }} + + {% apply spaceless %} + {% if field.label is not same as(false) %} + {% if field.translationDomain is same as(false) %} + {{ field.label }} + {% else %} + {{ field.label|trans({}, field.translationDomain) }} + {% endif %} + {% endif %} + {% endapply %} + {% endif %} {% endfor %} From be3ce060a5e405e684fecbf34cf7c0d88db7dd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 19:52:46 +0000 Subject: [PATCH 5/6] prepare release 0.10.25 --- packages/application/composer.json | 6 +-- packages/aws-tool-kit/composer.json | 4 +- packages/console/composer.json | 4 +- packages/cron-job/composer.json | 8 ++-- packages/entity-migrator/composer.json | 4 +- packages/framework-extra-bundle/composer.json | 40 +++++++++---------- packages/mailer/composer.json | 4 +- packages/messenger/composer.json | 6 +-- packages/open-api/composer.json | 4 +- packages/process/composer.json | 2 +- packages/profiling/composer.json | 2 +- packages/security/composer.json | 8 ++-- packages/sonata-extra-bundle/composer.json | 4 +- packages/sonata-import-bundle/composer.json | 4 +- .../sonata-integration-bundle/composer.json | 16 ++++---- packages/tester-bundle/composer.json | 6 +-- packages/tester/composer.json | 2 +- packages/user-bundle/composer.json | 14 +++---- packages/workflow/composer.json | 2 +- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/application/composer.json b/packages/application/composer.json index 7ee91aac..d4d93a48 100644 --- a/packages/application/composer.json +++ b/packages/application/composer.json @@ -10,14 +10,14 @@ "ext-iconv": "*", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.25", + "draw/core": "^0.10.25", "symfony/doctrine-bridge": "^6.4.0", "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "symfony/cache": "^6.4.0", "symfony/console": "^6.4.0" }, diff --git a/packages/aws-tool-kit/composer.json b/packages/aws-tool-kit/composer.json index feb67497..42e7560d 100644 --- a/packages/aws-tool-kit/composer.json +++ b/packages/aws-tool-kit/composer.json @@ -10,8 +10,8 @@ "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.25", + "draw/tester": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0", "symfony/http-client": "^6.4.0", diff --git a/packages/console/composer.json b/packages/console/composer.json index 3da474ff..727eb119 100644 --- a/packages/console/composer.json +++ b/packages/console/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "console"], "require": { "doctrine/dbal": "^3.3", - "draw/core": "^0.11", + "draw/core": "^0.10.25", "psr/log": "@stable", "ramsey/uuid": "^4.2", "sensiolabs/ansi-to-html": "^1.2", @@ -15,7 +15,7 @@ }, "require-dev": { "doctrine/orm": "^2.11", - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0" }, diff --git a/packages/cron-job/composer.json b/packages/cron-job/composer.json index fe37ae82..5327c4de 100644 --- a/packages/cron-job/composer.json +++ b/packages/cron-job/composer.json @@ -14,9 +14,9 @@ "php": ">=8.1", "doctrine/orm": "^2.11", "dragonmantank/cron-expression": "^3.3", - "draw/core": "^0.11", - "draw/messenger": "^0.11", - "draw/process": "^0.11", + "draw/core": "^0.10.25", + "draw/messenger": "^0.10.25", + "draw/process": "^0.10.25", "symfony/amqp-messenger": "^6.4.0", "symfony/console": "^6.4.0", "symfony/dependency-injection": "^6.4.0", @@ -25,7 +25,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "nesbot/carbon": "^2.0" }, "minimum-stability": "dev", diff --git a/packages/entity-migrator/composer.json b/packages/entity-migrator/composer.json index 9257f1f4..7d9f933f 100644 --- a/packages/entity-migrator/composer.json +++ b/packages/entity-migrator/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "draw/messenger": "^0.11", + "draw/messenger": "^0.10.25", "symfony/console": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", "symfony/lock": "^6.4.0", @@ -18,7 +18,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json index eb9dbd95..f9ff00c7 100644 --- a/packages/framework-extra-bundle/composer.json +++ b/packages/framework-extra-bundle/composer.json @@ -13,31 +13,31 @@ "require": { "php": ">=8.1", "ext-json": "*", - "draw/core": "^0.11", + "draw/core": "^0.10.25", "symfony/config": "^6.4.0", "symfony/dependency-injection": "^6.4.0", "symfony/http-kernel": "^6.4.0" }, "require-dev": { - "draw/application": "^0.11", - "draw/aws-tool-kit": "^0.11", - "draw/console": "^0.11", - "draw/contracts": "^0.11", - "draw/cron-job": "^0.11", - "draw/doctrine-extra": "^0.11", - "draw/entity-migrator": "^0.11", - "draw/log": "^0.11", - "draw/mailer": "^0.11", - "draw/messenger": "^0.11", - "draw/open-api": "^0.11", - "draw/process": "^0.11", - "draw/sonata-integration-bundle": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", - "draw/tester-bundle": "^0.11", - "draw/user-bundle": "^0.11", - "draw/validator": "^0.11", - "draw/workflow": "^0.11", + "draw/application": "^0.10.25", + "draw/aws-tool-kit": "^0.10.25", + "draw/console": "^0.10.25", + "draw/contracts": "^0.10.25", + "draw/cron-job": "^0.10.25", + "draw/doctrine-extra": "^0.10.25", + "draw/entity-migrator": "^0.10.25", + "draw/log": "^0.10.25", + "draw/mailer": "^0.10.25", + "draw/messenger": "^0.10.25", + "draw/open-api": "^0.10.25", + "draw/process": "^0.10.25", + "draw/sonata-integration-bundle": "^0.10.25", + "draw/security": "^0.10.25", + "draw/tester": "^0.10.25", + "draw/tester-bundle": "^0.10.25", + "draw/user-bundle": "^0.10.25", + "draw/validator": "^0.10.25", + "draw/workflow": "^0.10.25", "monolog/monolog": "^3.5.0", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json index f0e7e219..8b82555a 100644 --- a/packages/mailer/composer.json +++ b/packages/mailer/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "mailer", "symfony"], "require": { "php": ">=8.1", - "draw/core": "^0.11", + "draw/core": "^0.10.25", "symfony/dom-crawler": "^6.4.0", "symfony/css-selector": "^6.4.0", "symfony/console": "^6.4.0", @@ -16,7 +16,7 @@ "twig/twig": "^3.3" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0" }, diff --git a/packages/messenger/composer.json b/packages/messenger/composer.json index c141bd73..0f24389c 100644 --- a/packages/messenger/composer.json +++ b/packages/messenger/composer.json @@ -15,8 +15,8 @@ "ext-json": "*", "doctrine/dbal": "^3.3", "doctrine/persistence": "^2.2 || ^3.0", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.25", + "draw/core": "^0.10.25", "symfony/doctrine-bridge": "^6.4.0", "symfony/doctrine-messenger": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", @@ -31,7 +31,7 @@ "ext-pcntl": "*", "colinodell/psr-testlogger": "^1.1", "doctrine/orm": "^2.11", - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "psr/log": "@stable" }, diff --git a/packages/open-api/composer.json b/packages/open-api/composer.json index ffcaebb8..2dac386e 100644 --- a/packages/open-api/composer.json +++ b/packages/open-api/composer.json @@ -14,8 +14,8 @@ }, "require-dev": { "ext-zip": "*", - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.25", + "draw/tester": "^0.10.25", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/process/composer.json b/packages/process/composer.json index 9c954c27..318ab6be 100644 --- a/packages/process/composer.json +++ b/packages/process/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "draw/contracts": "^0.11", + "draw/contracts": "^0.10.25", "symfony/process": "^6.4.0" }, "require-dev": { diff --git a/packages/profiling/composer.json b/packages/profiling/composer.json index 2508d280..4329289e 100644 --- a/packages/profiling/composer.json +++ b/packages/profiling/composer.json @@ -10,7 +10,7 @@ } ], "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/security/composer.json b/packages/security/composer.json index 2f2d1f02..2de9177c 100644 --- a/packages/security/composer.json +++ b/packages/security/composer.json @@ -14,10 +14,10 @@ "php": ">=8.1" }, "require-dev": { - "draw/core": "^0.11", - "draw/framework-extra-bundle": "^0.11", - "draw/messenger": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.25", + "draw/framework-extra-bundle": "^0.10.25", + "draw/messenger": "^0.10.25", + "draw/tester": "^0.10.25", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/console": "^6.4.0", diff --git a/packages/sonata-extra-bundle/composer.json b/packages/sonata-extra-bundle/composer.json index 43585cf4..1b9dcc71 100644 --- a/packages/sonata-extra-bundle/composer.json +++ b/packages/sonata-extra-bundle/composer.json @@ -11,8 +11,8 @@ }, "require-dev": { "cweagans/composer-patches": "^1.7", - "draw/tester": "^0.11", - "draw/security": "^0.11", + "draw/tester": "^0.10.25", + "draw/security": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", diff --git a/packages/sonata-import-bundle/composer.json b/packages/sonata-import-bundle/composer.json index b56d9de1..ba9f258f 100644 --- a/packages/sonata-import-bundle/composer.json +++ b/packages/sonata-import-bundle/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=8.1", - "draw/sonata-extra-bundle": "^0.11", + "draw/sonata-extra-bundle": "^0.10.25", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", "symfony/event-dispatcher": "^6.4", @@ -20,7 +20,7 @@ "symfony/validator": "^6.4" }, "require-dev": { - "draw/tester": "^0.11", + "draw/tester": "^0.10.25", "knplabs/doctrine-behaviors": "*", "phpunit/phpunit": "^10.0" }, diff --git a/packages/sonata-integration-bundle/composer.json b/packages/sonata-integration-bundle/composer.json index d489ed87..87719d3c 100644 --- a/packages/sonata-integration-bundle/composer.json +++ b/packages/sonata-integration-bundle/composer.json @@ -6,20 +6,20 @@ "keywords": ["symfony", "sonata"], "require": { "php": ">=8.1", - "draw/framework-extra-bundle": "^0.11", - "draw/sonata-extra-bundle": "^0.11", + "draw/framework-extra-bundle": "^0.10.25", + "draw/sonata-extra-bundle": "^0.10.25", "symfony/framework-bundle": "^6.4.0", "symfony/expression-language": "^6.4.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2" }, "require-dev": { - "draw/application": "^0.11", - "draw/console": "^0.11", - "draw/messenger": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", - "draw/user-bundle": "^0.11", + "draw/application": "^0.10.25", + "draw/console": "^0.10.25", + "draw/messenger": "^0.10.25", + "draw/security": "^0.10.25", + "draw/tester": "^0.10.25", + "draw/user-bundle": "^0.10.25", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "scheb/2fa-bundle": "^6.0", diff --git a/packages/tester-bundle/composer.json b/packages/tester-bundle/composer.json index 532eba82..5f61ff50 100644 --- a/packages/tester-bundle/composer.json +++ b/packages/tester-bundle/composer.json @@ -5,15 +5,15 @@ "type": "symfony-bundle", "keywords": ["symfony", "automation test", "test", "unit test", "integration test"], "require": { - "draw/core": "^0.11", - "draw/tester": "^0.11", + "draw/core": "^0.10.25", + "draw/tester": "^0.10.25", "symfony/browser-kit": "^6.4.0", "symfony/framework-bundle": "^6.4.0", "symfony/http-foundation": "^6.4.0", "symfony/validator": "^6.4.0" }, "require-dev": { - "draw/profiling": "^0.11", + "draw/profiling": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/messenger": "^6.4.0", "symfony/yaml": "^6.4.0" diff --git a/packages/tester/composer.json b/packages/tester/composer.json index dafe748f..234b8229 100644 --- a/packages/tester/composer.json +++ b/packages/tester/composer.json @@ -12,7 +12,7 @@ ], "require": { "ext-simplexml": "*", - "draw/core": "^0.11", + "draw/core": "^0.10.25", "guzzlehttp/psr7": "^1.8 || ^2.0", "phpunit/phpunit": "^9.0 || ^10.0", "psr/http-message": "^1.0", diff --git a/packages/user-bundle/composer.json b/packages/user-bundle/composer.json index ddf2dfda..88a8c5a7 100644 --- a/packages/user-bundle/composer.json +++ b/packages/user-bundle/composer.json @@ -11,8 +11,8 @@ "doctrine/common": "^3.1", "doctrine/doctrine-bundle": "^2.5", "doctrine/orm": "^2.11", - "draw/contracts": "^0.11", - "draw/core": "^0.11", + "draw/contracts": "^0.10.25", + "draw/core": "^0.10.25", "ramsey/uuid": "^4.2", "symfony/framework-bundle": "^6.4.0", "symfony/security-core": "^6.4.0", @@ -20,11 +20,11 @@ "symfony/yaml": "^6.4.0" }, "require-dev": { - "draw/framework-extra-bundle": "^0.11", - "draw/mailer": "^0.11", - "draw/messenger": "^0.11", - "draw/security": "^0.11", - "draw/tester": "^0.11", + "draw/framework-extra-bundle": "^0.10.25", + "draw/mailer": "^0.10.25", + "draw/messenger": "^0.10.25", + "draw/security": "^0.10.25", + "draw/tester": "^0.10.25", "endroid/qr-code": "^5.0", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/workflow/composer.json b/packages/workflow/composer.json index 39a53db2..22336bff 100644 --- a/packages/workflow/composer.json +++ b/packages/workflow/composer.json @@ -15,7 +15,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/security": "^0.11", + "draw/security": "^0.10.25", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/security-core": "^6.4.0" }, From a9fe129c2e36307889afeff4881aef58e9a91c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Poirier=20Th=C3=A9or=C3=AAt?= Date: Fri, 3 May 2024 19:52:49 +0000 Subject: [PATCH 6/6] current 0.11-dev --- packages/application/composer.json | 6 +-- packages/aws-tool-kit/composer.json | 4 +- packages/console/composer.json | 4 +- packages/cron-job/composer.json | 8 ++-- packages/entity-migrator/composer.json | 4 +- packages/framework-extra-bundle/composer.json | 40 +++++++++---------- packages/mailer/composer.json | 4 +- packages/messenger/composer.json | 6 +-- packages/open-api/composer.json | 4 +- packages/process/composer.json | 2 +- packages/profiling/composer.json | 2 +- packages/security/composer.json | 8 ++-- packages/sonata-extra-bundle/composer.json | 4 +- packages/sonata-import-bundle/composer.json | 4 +- .../sonata-integration-bundle/composer.json | 16 ++++---- packages/tester-bundle/composer.json | 6 +-- packages/tester/composer.json | 2 +- packages/user-bundle/composer.json | 14 +++---- packages/workflow/composer.json | 2 +- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/application/composer.json b/packages/application/composer.json index d4d93a48..7ee91aac 100644 --- a/packages/application/composer.json +++ b/packages/application/composer.json @@ -10,14 +10,14 @@ "ext-iconv": "*", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", - "draw/contracts": "^0.10.25", - "draw/core": "^0.10.25", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "symfony/doctrine-bridge": "^6.4.0", "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "symfony/cache": "^6.4.0", "symfony/console": "^6.4.0" }, diff --git a/packages/aws-tool-kit/composer.json b/packages/aws-tool-kit/composer.json index 42e7560d..feb67497 100644 --- a/packages/aws-tool-kit/composer.json +++ b/packages/aws-tool-kit/composer.json @@ -10,8 +10,8 @@ "symfony/event-dispatcher": "^6.4.0" }, "require-dev": { - "draw/core": "^0.10.25", - "draw/tester": "^0.10.25", + "draw/core": "^0.11", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0", "symfony/http-client": "^6.4.0", diff --git a/packages/console/composer.json b/packages/console/composer.json index 727eb119..3da474ff 100644 --- a/packages/console/composer.json +++ b/packages/console/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "console"], "require": { "doctrine/dbal": "^3.3", - "draw/core": "^0.10.25", + "draw/core": "^0.11", "psr/log": "@stable", "ramsey/uuid": "^4.2", "sensiolabs/ansi-to-html": "^1.2", @@ -15,7 +15,7 @@ }, "require-dev": { "doctrine/orm": "^2.11", - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/cache": "^6.4.0" }, diff --git a/packages/cron-job/composer.json b/packages/cron-job/composer.json index 5327c4de..fe37ae82 100644 --- a/packages/cron-job/composer.json +++ b/packages/cron-job/composer.json @@ -14,9 +14,9 @@ "php": ">=8.1", "doctrine/orm": "^2.11", "dragonmantank/cron-expression": "^3.3", - "draw/core": "^0.10.25", - "draw/messenger": "^0.10.25", - "draw/process": "^0.10.25", + "draw/core": "^0.11", + "draw/messenger": "^0.11", + "draw/process": "^0.11", "symfony/amqp-messenger": "^6.4.0", "symfony/console": "^6.4.0", "symfony/dependency-injection": "^6.4.0", @@ -25,7 +25,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.0 || ^10.0", - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "nesbot/carbon": "^2.0" }, "minimum-stability": "dev", diff --git a/packages/entity-migrator/composer.json b/packages/entity-migrator/composer.json index 7d9f933f..9257f1f4 100644 --- a/packages/entity-migrator/composer.json +++ b/packages/entity-migrator/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "draw/messenger": "^0.10.25", + "draw/messenger": "^0.11", "symfony/console": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", "symfony/lock": "^6.4.0", @@ -18,7 +18,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json index f9ff00c7..eb9dbd95 100644 --- a/packages/framework-extra-bundle/composer.json +++ b/packages/framework-extra-bundle/composer.json @@ -13,31 +13,31 @@ "require": { "php": ">=8.1", "ext-json": "*", - "draw/core": "^0.10.25", + "draw/core": "^0.11", "symfony/config": "^6.4.0", "symfony/dependency-injection": "^6.4.0", "symfony/http-kernel": "^6.4.0" }, "require-dev": { - "draw/application": "^0.10.25", - "draw/aws-tool-kit": "^0.10.25", - "draw/console": "^0.10.25", - "draw/contracts": "^0.10.25", - "draw/cron-job": "^0.10.25", - "draw/doctrine-extra": "^0.10.25", - "draw/entity-migrator": "^0.10.25", - "draw/log": "^0.10.25", - "draw/mailer": "^0.10.25", - "draw/messenger": "^0.10.25", - "draw/open-api": "^0.10.25", - "draw/process": "^0.10.25", - "draw/sonata-integration-bundle": "^0.10.25", - "draw/security": "^0.10.25", - "draw/tester": "^0.10.25", - "draw/tester-bundle": "^0.10.25", - "draw/user-bundle": "^0.10.25", - "draw/validator": "^0.10.25", - "draw/workflow": "^0.10.25", + "draw/application": "^0.11", + "draw/aws-tool-kit": "^0.11", + "draw/console": "^0.11", + "draw/contracts": "^0.11", + "draw/cron-job": "^0.11", + "draw/doctrine-extra": "^0.11", + "draw/entity-migrator": "^0.11", + "draw/log": "^0.11", + "draw/mailer": "^0.11", + "draw/messenger": "^0.11", + "draw/open-api": "^0.11", + "draw/process": "^0.11", + "draw/sonata-integration-bundle": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", + "draw/tester-bundle": "^0.11", + "draw/user-bundle": "^0.11", + "draw/validator": "^0.11", + "draw/workflow": "^0.11", "monolog/monolog": "^3.5.0", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json index 8b82555a..f0e7e219 100644 --- a/packages/mailer/composer.json +++ b/packages/mailer/composer.json @@ -6,7 +6,7 @@ "keywords": ["draw", "mailer", "symfony"], "require": { "php": ">=8.1", - "draw/core": "^0.10.25", + "draw/core": "^0.11", "symfony/dom-crawler": "^6.4.0", "symfony/css-selector": "^6.4.0", "symfony/console": "^6.4.0", @@ -16,7 +16,7 @@ "twig/twig": "^3.3" }, "require-dev": { - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "pelago/emogrifier": "^7.0", "phpunit/phpunit": "^9.0 || ^10.0" }, diff --git a/packages/messenger/composer.json b/packages/messenger/composer.json index 0f24389c..c141bd73 100644 --- a/packages/messenger/composer.json +++ b/packages/messenger/composer.json @@ -15,8 +15,8 @@ "ext-json": "*", "doctrine/dbal": "^3.3", "doctrine/persistence": "^2.2 || ^3.0", - "draw/contracts": "^0.10.25", - "draw/core": "^0.10.25", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "symfony/doctrine-bridge": "^6.4.0", "symfony/doctrine-messenger": "^6.4.0", "symfony/event-dispatcher": "^6.4.0", @@ -31,7 +31,7 @@ "ext-pcntl": "*", "colinodell/psr-testlogger": "^1.1", "doctrine/orm": "^2.11", - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "psr/log": "@stable" }, diff --git a/packages/open-api/composer.json b/packages/open-api/composer.json index 2dac386e..ffcaebb8 100644 --- a/packages/open-api/composer.json +++ b/packages/open-api/composer.json @@ -14,8 +14,8 @@ }, "require-dev": { "ext-zip": "*", - "draw/core": "^0.10.25", - "draw/tester": "^0.10.25", + "draw/core": "^0.11", + "draw/tester": "^0.11", "doctrine/common": "^3.1", "doctrine/orm": "^2.11", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/process/composer.json b/packages/process/composer.json index 318ab6be..9c954c27 100644 --- a/packages/process/composer.json +++ b/packages/process/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "draw/contracts": "^0.10.25", + "draw/contracts": "^0.11", "symfony/process": "^6.4.0" }, "require-dev": { diff --git a/packages/profiling/composer.json b/packages/profiling/composer.json index 4329289e..2508d280 100644 --- a/packages/profiling/composer.json +++ b/packages/profiling/composer.json @@ -10,7 +10,7 @@ } ], "require-dev": { - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0" }, "minimum-stability": "dev", diff --git a/packages/security/composer.json b/packages/security/composer.json index 2de9177c..2f2d1f02 100644 --- a/packages/security/composer.json +++ b/packages/security/composer.json @@ -14,10 +14,10 @@ "php": ">=8.1" }, "require-dev": { - "draw/core": "^0.10.25", - "draw/framework-extra-bundle": "^0.10.25", - "draw/messenger": "^0.10.25", - "draw/tester": "^0.10.25", + "draw/core": "^0.11", + "draw/framework-extra-bundle": "^0.11", + "draw/messenger": "^0.11", + "draw/tester": "^0.11", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/console": "^6.4.0", diff --git a/packages/sonata-extra-bundle/composer.json b/packages/sonata-extra-bundle/composer.json index 1b9dcc71..43585cf4 100644 --- a/packages/sonata-extra-bundle/composer.json +++ b/packages/sonata-extra-bundle/composer.json @@ -11,8 +11,8 @@ }, "require-dev": { "cweagans/composer-patches": "^1.7", - "draw/tester": "^0.10.25", - "draw/security": "^0.10.25", + "draw/tester": "^0.11", + "draw/security": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", diff --git a/packages/sonata-import-bundle/composer.json b/packages/sonata-import-bundle/composer.json index ba9f258f..b56d9de1 100644 --- a/packages/sonata-import-bundle/composer.json +++ b/packages/sonata-import-bundle/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=8.1", - "draw/sonata-extra-bundle": "^0.10.25", + "draw/sonata-extra-bundle": "^0.11", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2", "symfony/event-dispatcher": "^6.4", @@ -20,7 +20,7 @@ "symfony/validator": "^6.4" }, "require-dev": { - "draw/tester": "^0.10.25", + "draw/tester": "^0.11", "knplabs/doctrine-behaviors": "*", "phpunit/phpunit": "^10.0" }, diff --git a/packages/sonata-integration-bundle/composer.json b/packages/sonata-integration-bundle/composer.json index 87719d3c..d489ed87 100644 --- a/packages/sonata-integration-bundle/composer.json +++ b/packages/sonata-integration-bundle/composer.json @@ -6,20 +6,20 @@ "keywords": ["symfony", "sonata"], "require": { "php": ">=8.1", - "draw/framework-extra-bundle": "^0.10.25", - "draw/sonata-extra-bundle": "^0.10.25", + "draw/framework-extra-bundle": "^0.11", + "draw/sonata-extra-bundle": "^0.11", "symfony/framework-bundle": "^6.4.0", "symfony/expression-language": "^6.4.0", "sonata-project/admin-bundle": "^4.8", "sonata-project/doctrine-orm-admin-bundle": "^4.2" }, "require-dev": { - "draw/application": "^0.10.25", - "draw/console": "^0.10.25", - "draw/messenger": "^0.10.25", - "draw/security": "^0.10.25", - "draw/tester": "^0.10.25", - "draw/user-bundle": "^0.10.25", + "draw/application": "^0.11", + "draw/console": "^0.11", + "draw/messenger": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", + "draw/user-bundle": "^0.11", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", "scheb/2fa-bundle": "^6.0", diff --git a/packages/tester-bundle/composer.json b/packages/tester-bundle/composer.json index 5f61ff50..532eba82 100644 --- a/packages/tester-bundle/composer.json +++ b/packages/tester-bundle/composer.json @@ -5,15 +5,15 @@ "type": "symfony-bundle", "keywords": ["symfony", "automation test", "test", "unit test", "integration test"], "require": { - "draw/core": "^0.10.25", - "draw/tester": "^0.10.25", + "draw/core": "^0.11", + "draw/tester": "^0.11", "symfony/browser-kit": "^6.4.0", "symfony/framework-bundle": "^6.4.0", "symfony/http-foundation": "^6.4.0", "symfony/validator": "^6.4.0" }, "require-dev": { - "draw/profiling": "^0.10.25", + "draw/profiling": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/messenger": "^6.4.0", "symfony/yaml": "^6.4.0" diff --git a/packages/tester/composer.json b/packages/tester/composer.json index 234b8229..dafe748f 100644 --- a/packages/tester/composer.json +++ b/packages/tester/composer.json @@ -12,7 +12,7 @@ ], "require": { "ext-simplexml": "*", - "draw/core": "^0.10.25", + "draw/core": "^0.11", "guzzlehttp/psr7": "^1.8 || ^2.0", "phpunit/phpunit": "^9.0 || ^10.0", "psr/http-message": "^1.0", diff --git a/packages/user-bundle/composer.json b/packages/user-bundle/composer.json index 88a8c5a7..ddf2dfda 100644 --- a/packages/user-bundle/composer.json +++ b/packages/user-bundle/composer.json @@ -11,8 +11,8 @@ "doctrine/common": "^3.1", "doctrine/doctrine-bundle": "^2.5", "doctrine/orm": "^2.11", - "draw/contracts": "^0.10.25", - "draw/core": "^0.10.25", + "draw/contracts": "^0.11", + "draw/core": "^0.11", "ramsey/uuid": "^4.2", "symfony/framework-bundle": "^6.4.0", "symfony/security-core": "^6.4.0", @@ -20,11 +20,11 @@ "symfony/yaml": "^6.4.0" }, "require-dev": { - "draw/framework-extra-bundle": "^0.10.25", - "draw/mailer": "^0.10.25", - "draw/messenger": "^0.10.25", - "draw/security": "^0.10.25", - "draw/tester": "^0.10.25", + "draw/framework-extra-bundle": "^0.11", + "draw/mailer": "^0.11", + "draw/messenger": "^0.11", + "draw/security": "^0.11", + "draw/tester": "^0.11", "endroid/qr-code": "^5.0", "firebase/php-jwt": "^6.1", "phpunit/phpunit": "^9.0 || ^10.0", diff --git a/packages/workflow/composer.json b/packages/workflow/composer.json index 22336bff..39a53db2 100644 --- a/packages/workflow/composer.json +++ b/packages/workflow/composer.json @@ -15,7 +15,7 @@ "symfony/workflow": "^6.4.0" }, "require-dev": { - "draw/security": "^0.10.25", + "draw/security": "^0.11", "phpunit/phpunit": "^9.0 || ^10.0", "symfony/security-core": "^6.4.0" },