From 9b752961d9cd0675a2314de1c42b793b1044fe29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 26 Mar 2024 22:28:02 +0100 Subject: [PATCH] Change overlooked paths in phpcs.xml.dist It seems that while modernizing the directory structure, I overlooked some of the paths present in that configuration file. --- phpcs.xml.dist | 9 +++++---- .../AbstractDoctrineExtensionTest.php | 2 +- tests/DependencyInjection/DoctrineExtensionTest.php | 8 +++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 39b94b43..1d419a4d 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -12,6 +12,7 @@ src + tests @@ -22,11 +23,11 @@ - Tests/* - Repository/RepositoryFactoryCompatibility.php - Repository/ServiceEntityRepository.php + tests/* + src/Repository/RepositoryFactoryCompatibility.php + src/Repository/ServiceEntityRepository.php - Tests/* + tests/* diff --git a/tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/tests/DependencyInjection/AbstractDoctrineExtensionTest.php index 58c0fcf3..95c8b756 100644 --- a/tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -240,7 +240,7 @@ public function testDbalLoadSinglePrimaryReplicaConnection(): void public function testDbalLoadSavepointsForNestedTransactions(): void { - if (!method_exists(Connection::class, 'getEventManager')) { + if (! method_exists(Connection::class, 'getEventManager')) { self::markTestSkipped('This test requires DBAL < 4'); } diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php index c7ad0c0a..b2a6e3c4 100644 --- a/tests/DependencyInjection/DoctrineExtensionTest.php +++ b/tests/DependencyInjection/DoctrineExtensionTest.php @@ -558,10 +558,12 @@ public function testUseSavePointsAddMethodCallToAddSavepointsToTheConnection(): $calls = $container->getDefinition('doctrine.dbal.default_connection')->getMethodCalls(); $this->assertCount((int) $isUsingDBAL3, $calls); - if ($isUsingDBAL3) { - $this->assertEquals('setNestTransactionsWithSavepoints', $calls[0][0]); - $this->assertTrue($calls[0][1][0]); + if (! $isUsingDBAL3) { + return; } + + $this->assertEquals('setNestTransactionsWithSavepoints', $calls[0][0]); + $this->assertTrue($calls[0][1][0]); } public function testAutoGenerateProxyClasses(): void