Use TypeError & fix DBAL platform detection

Author: GromNaN

src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php

@@ -19,7 +19,7 @@
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
-use Symfony\Component\Lock\PersistingStoreInterface;
+use Symfony\Component\Lock\SharedLockStoreInterface;
 
 /**
  * DoctrineDbalPostgreSqlStore is a PersistingStoreInterface implementation using
@@ -53,7 +53,7 @@ public function __construct($connOrDsn)
             }
             $this->conn = DriverManager::getConnection(['url' => $this->filterDsn($connOrDsn)]);
         } else {
-            throw new InvalidArgumentException(sprintf('"%s" requires Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, get_debug_type($connOrDsn)));
+            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be %s or string, "%s" given.', Connection::class, __METHOD__, get_debug_type($connOrDsn)));
         }
     }
 
@@ -207,8 +207,9 @@ private function unlockShared(Key $key): void
 
     /**
      * Check driver and remove scheme extension from DSN.
-     * Input: pgsql+advisory://server/
-     * Output: pgsql://server/
+     *   Input: pgsql+advisory://server/
+     *   Output: pgsql://server/
+     *
      * @throws InvalidArgumentException when driver is not supported.
      */
     private function filterDsn(string $dsn): string
@@ -218,20 +219,15 @@ private function filterDsn(string $dsn): string
         }
 
         [$scheme, $rest] = explode(':', $dsn,2);
-
-        $driver = $scheme;
-        if (str_contains($scheme, '+')) {
-            [$driver] = explode('+', $scheme, 2);
-        }
-
-        if (!in_array($driver, ['pgsql', 'postgres', 'postgresql'])) {
+        $driver = strtok($scheme, '+');
+        if (!\in_array($driver, ['pgsql', 'postgres', 'postgresql'])) {
             throw new InvalidArgumentException(sprintf('The adapter "%s" does not support the "%s" driver.', __CLASS__, $driver));
         }
 
         return sprintf('%s:%s', $driver, $rest);
     }
 
-    private function getInternalStore(): PersistingStoreInterface
+    private function getInternalStore(): SharedLockStoreInterface
     {
         $namespace = spl_object_hash($this->conn);
 

src/Symfony/Component/Lock/Store/DoctrineDbalStore.php

@@ -70,7 +70,7 @@ public function __construct($connOrDsn, array $options = [], float $gcProbabilit
             }
             $this->conn = DriverManager::getConnection(['url' => $connOrDsn]);
         } else {
-            throw new InvalidArgumentException(sprintf('"%s" requires "Doctrine\DBAL\Connection" instance or DSN string as first argument, "%s" given.', __CLASS__, get_debug_type($connOrDsn)));
+            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be %s or string, "%s" given.', Connection::class, __METHOD__, get_debug_type($connOrDsn)));
         }
     }
 
@@ -211,18 +211,21 @@ private function getCurrentTimestampStatement(): string
         $platform = $this->conn->getDatabasePlatform();
         switch (true) {
             case $platform instanceof \Doctrine\DBAL\Platforms\MySQLPlatform:
+            case $platform instanceof \Doctrine\DBAL\Platforms\MySQL57Platform:
                 return 'UNIX_TIMESTAMP()';
 
             case $platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform:
                 return 'strftime(\'%s\',\'now\')';
 
             case $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQLPlatform:
+            case $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQL94Platform:
                 return 'CAST(EXTRACT(epoch FROM NOW()) AS INT)';
 
             case $platform instanceof \Doctrine\DBAL\Platforms\OraclePlatform:
                 return '(SYSDATE - TO_DATE(\'19700101\',\'yyyymmdd\'))*86400 - TO_NUMBER(SUBSTR(TZ_OFFSET(sessiontimezone), 1, 3))*3600';
 
             case $platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform:
+            case $platform instanceof \Doctrine\DBAL\Platforms\SQLServer2012Platform:
                 return 'DATEDIFF(s, \'1970-01-01\', GETUTCDATE())';
 
             default:

src/Symfony/Component/Lock/Store/PostgreSqlStore.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Lock\Store;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DriverManager;
 use Symfony\Component\Lock\BlockingSharedLockStoreInterface;
 use Symfony\Component\Lock\BlockingStoreInterface;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;

src/Symfony/Component/Lock/Tests/Store/PostgreSqlDbalStoreTest.php

@@ -20,7 +20,7 @@
  *
  * @requires extension pdo_pgsql
  * @group integration
- * @legacy
+ * @group legacy
  */
 class PostgreSqlDbalStoreTest extends AbstractStoreTest
 {