From 88153487e4751c1f518afd41d5fefcfe879ef2fc Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 2 Dec 2021 16:17:50 -0500 Subject: [PATCH 1/3] removing branch-alias --- src/Chartjs/composer.json | 3 --- src/Cropperjs/composer.json | 3 --- src/Dropzone/composer.json | 3 --- src/LazyImage/composer.json | 3 --- src/Swup/composer.json | 3 --- src/Turbo/Bridge/Mercure/composer.json | 3 --- src/Turbo/composer.json | 3 --- 7 files changed, 21 deletions(-) diff --git a/src/Chartjs/composer.json b/src/Chartjs/composer.json index 63dc099701a..d3436256603 100644 --- a/src/Chartjs/composer.json +++ b/src/Chartjs/composer.json @@ -41,9 +41,6 @@ "symfony/flex": "<1.13" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" diff --git a/src/Cropperjs/composer.json b/src/Cropperjs/composer.json index 237bfdbb305..99d64a47a25 100644 --- a/src/Cropperjs/composer.json +++ b/src/Cropperjs/composer.json @@ -44,9 +44,6 @@ "symfony/flex": "<1.13" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" diff --git a/src/Dropzone/composer.json b/src/Dropzone/composer.json index 5b6dba600a2..369b1907c0b 100644 --- a/src/Dropzone/composer.json +++ b/src/Dropzone/composer.json @@ -39,9 +39,6 @@ "symfony/var-dumper": "^4.4.17|^5.0" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" diff --git a/src/LazyImage/composer.json b/src/LazyImage/composer.json index 806a0e7cbb8..c3060e2a5af 100644 --- a/src/LazyImage/composer.json +++ b/src/LazyImage/composer.json @@ -40,9 +40,6 @@ "symfony/var-dumper": "^4.4.17|^5.0" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" diff --git a/src/Swup/composer.json b/src/Swup/composer.json index 90ead901fea..3c5b9fb3aa3 100644 --- a/src/Swup/composer.json +++ b/src/Swup/composer.json @@ -21,9 +21,6 @@ "symfony/flex": "<1.13" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" diff --git a/src/Turbo/Bridge/Mercure/composer.json b/src/Turbo/Bridge/Mercure/composer.json index 96c62e8ef87..2549c6073bd 100644 --- a/src/Turbo/Bridge/Mercure/composer.json +++ b/src/Turbo/Bridge/Mercure/composer.json @@ -32,9 +32,6 @@ "symfony/ux-turbo": "^1.3" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux-turbo", "url": "https://github.com/symfony/ux" diff --git a/src/Turbo/composer.json b/src/Turbo/composer.json index c80540a4036..adee2ef57b0 100644 --- a/src/Turbo/composer.json +++ b/src/Turbo/composer.json @@ -61,9 +61,6 @@ "symfony/flex": "<1.13" }, "extra": { - "branch-alias": { - "dev-main": "1.3-dev" - }, "thanks": { "name": "symfony/ux", "url": "https://github.com/symfony/ux" From c4d3419d91562a9d07f7414d3bb85b94f4981da6 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 2 Dec 2021 16:26:34 -0500 Subject: [PATCH 2/3] fixing tests --- src/Turbo/Doctrine/BroadcastListener.php | 1 - src/Turbo/composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Turbo/Doctrine/BroadcastListener.php b/src/Turbo/Doctrine/BroadcastListener.php index 28a16fcc383..a6da10ddc0e 100644 --- a/src/Turbo/Doctrine/BroadcastListener.php +++ b/src/Turbo/Doctrine/BroadcastListener.php @@ -129,7 +129,6 @@ private function storeEntitiesToPublish(EntityManagerInterface $em, object $enti if (\PHP_VERSION_ID >= 80000 && $options = ($r = new \ReflectionClass($class))->getAttributes(Broadcast::class)) { $options = $options[0]->newInstance(); - // @phpstan-ignore-next-line $this->broadcastedClasses[$class] = $options->options; } elseif ($this->annotationReader && $options = $this->annotationReader->getClassAnnotation($r ?? new \ReflectionClass($class), Broadcast::class)) { $this->broadcastedClasses[$class] = $options->options; diff --git a/src/Turbo/composer.json b/src/Turbo/composer.json index adee2ef57b0..ba11d0ba575 100644 --- a/src/Turbo/composer.json +++ b/src/Turbo/composer.json @@ -42,7 +42,7 @@ "require-dev": { "doctrine/annotations": "^1.12", "doctrine/doctrine-bundle": "^2.2", - "doctrine/orm": "~2.8.0", + "doctrine/orm": "^2.8.0", "phpstan/phpstan": "^0.12", "symfony/debug-bundle": "^5.2", "symfony/form": "^5.2", From 66bf8d45daf548366c4d408d937702b13405543c Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 2 Dec 2021 16:36:27 -0500 Subject: [PATCH 3/3] Fixing deprecation and making test failure more obvious --- src/Turbo/Tests/BroadcastTest.php | 4 ++++ src/Turbo/Tests/app/Kernel.php | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Turbo/Tests/BroadcastTest.php b/src/Turbo/Tests/BroadcastTest.php index e76deed7f38..1044023320a 100644 --- a/src/Turbo/Tests/BroadcastTest.php +++ b/src/Turbo/Tests/BroadcastTest.php @@ -22,6 +22,10 @@ class BroadcastTest extends PantherTestCase public function testBroadcast(): void { + if (!file_exists(__DIR__.'/app/public/build')) { + throw new \Exception(sprintf('Move into %s and execute Encore before running this test.', realpath(__DIR__.'/app'))); + } + ($client = self::createPantherClient())->request('GET', '/books'); $crawler = $client->submitForm('Submit', ['title' => self::BOOK_TITLE]); diff --git a/src/Turbo/Tests/app/Kernel.php b/src/Turbo/Tests/app/Kernel.php index 427135fd791..4af4b28662b 100644 --- a/src/Turbo/Tests/app/Kernel.php +++ b/src/Turbo/Tests/app/Kernel.php @@ -13,7 +13,6 @@ use App\Entity\Book; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; -use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\DebugBundle\DebugBundle; use Symfony\Bundle\FrameworkBundle\Controller\TemplateController; @@ -91,10 +90,6 @@ protected function configureContainer(ContainerConfigurator $container): void ], ]; - if (class_exists(MappingDriver::class)) { - $doctrineConfig['dbal']['override_url'] = true; - } - $container ->extension('doctrine', $doctrineConfig);