From 2ec5a0ec30d69778bf65c5e83b4077b879ce19d7 Mon Sep 17 00:00:00 2001 From: Vladi Date: Tue, 19 Nov 2024 23:38:23 +0100 Subject: [PATCH 1/3] get rid of deprecated method `Platform::getName`; include MariaDB as a part of MySQLPlatform --- src/Doctrine/MySql/UseIndexHintHandler.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Doctrine/MySql/UseIndexHintHandler.php b/src/Doctrine/MySql/UseIndexHintHandler.php index 5ee3b96..d8ffc03 100644 --- a/src/Doctrine/MySql/UseIndexHintHandler.php +++ b/src/Doctrine/MySql/UseIndexHintHandler.php @@ -16,6 +16,7 @@ use function preg_match_all; use function preg_quote; use function preg_replace; +use function sprintf; class UseIndexHintHandler extends HintHandler { @@ -35,8 +36,8 @@ public function processNode(SqlNode $sqlNode, string $sql): string $query = $sqlWalker->getQuery(); $platform = $query->getEntityManager()->getConnection()->getDatabasePlatform(); - if (!is_a($platform, 'Doctrine\DBAL\Platforms\MySqlPlatform')) { // bypass platform MySqlPlatform => MySQLPlatform rename in dbal - throw new LogicException("Only MySQL platform is supported, {$platform->getName()} given"); + if (!is_a($platform, 'Doctrine\DBAL\Platforms\AbstractMySQLPlatform')) { + throw new LogicException(sprintf('Only MySQL platform is supported, %s given', $platform::class)); } if (!$query->getAST() instanceof SelectStatement) { From dc1e3ea1ee68bb22db7864cab929d9e3b47b21e8 Mon Sep 17 00:00:00 2001 From: Vladi Date: Tue, 19 Nov 2024 23:38:23 +0100 Subject: [PATCH 2/3] string to ::class --- src/Doctrine/MySql/UseIndexHintHandler.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Doctrine/MySql/UseIndexHintHandler.php b/src/Doctrine/MySql/UseIndexHintHandler.php index 5ee3b96..d6d308f 100644 --- a/src/Doctrine/MySql/UseIndexHintHandler.php +++ b/src/Doctrine/MySql/UseIndexHintHandler.php @@ -2,6 +2,7 @@ namespace ShipMonk\Doctrine\MySql; +use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\ORM\Query\AST\SelectStatement; use LogicException; use ShipMonk\Doctrine\Walker\HintHandler; @@ -16,6 +17,7 @@ use function preg_match_all; use function preg_quote; use function preg_replace; +use function sprintf; class UseIndexHintHandler extends HintHandler { @@ -35,8 +37,8 @@ public function processNode(SqlNode $sqlNode, string $sql): string $query = $sqlWalker->getQuery(); $platform = $query->getEntityManager()->getConnection()->getDatabasePlatform(); - if (!is_a($platform, 'Doctrine\DBAL\Platforms\MySqlPlatform')) { // bypass platform MySqlPlatform => MySQLPlatform rename in dbal - throw new LogicException("Only MySQL platform is supported, {$platform->getName()} given"); + if (!is_a($platform, AbstractMySQLPlatform::class)) { + throw new LogicException(sprintf('Only MySQL platform is supported, %s given', $platform::class)); } if (!$query->getAST() instanceof SelectStatement) { From 7baca9d4adf6aa09f750ed8e40f0c2b1f9abe1eb Mon Sep 17 00:00:00 2001 From: Vladi Date: Wed, 20 Nov 2024 11:43:31 +0100 Subject: [PATCH 3/3] reverting the dev dependency side effect --- src/Doctrine/MySql/UseIndexHintHandler.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Doctrine/MySql/UseIndexHintHandler.php b/src/Doctrine/MySql/UseIndexHintHandler.php index d6d308f..d8ffc03 100644 --- a/src/Doctrine/MySql/UseIndexHintHandler.php +++ b/src/Doctrine/MySql/UseIndexHintHandler.php @@ -2,7 +2,6 @@ namespace ShipMonk\Doctrine\MySql; -use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\ORM\Query\AST\SelectStatement; use LogicException; use ShipMonk\Doctrine\Walker\HintHandler; @@ -37,7 +36,7 @@ public function processNode(SqlNode $sqlNode, string $sql): string $query = $sqlWalker->getQuery(); $platform = $query->getEntityManager()->getConnection()->getDatabasePlatform(); - if (!is_a($platform, AbstractMySQLPlatform::class)) { + if (!is_a($platform, 'Doctrine\DBAL\Platforms\AbstractMySQLPlatform')) { throw new LogicException(sprintf('Only MySQL platform is supported, %s given', $platform::class)); }