Fix tests

GromNaN · GromNaN · commit 6a587b87da19 · 2021-10-08T21:29:48.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -122,7 +122,7 @@ public function configureSchema(Schema $schema, Connection $forConnection): void
     /**
      * {@inheritdoc}
      */
-    public function prune()
+    public function prune(): bool
     {
         $deleteSql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= ?";
         $params = [time()];
@@ -145,7 +145,7 @@ public function prune()
     /**
      * {@inheritdoc}
      */
-    protected function doFetch(array $ids)
+    protected function doFetch(array $ids): iterable
     {
         $now = time();
         $expired = [];
@@ -182,7 +182,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave(string $id)
+    protected function doHave(string $id): bool
     {
         $sql = "SELECT 1 FROM $this->table WHERE $this->idCol = ? AND ($this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > ?)";
         $result = $this->conn->executeQuery($sql, [
@@ -199,7 +199,7 @@ protected function doHave(string $id)
     /**
      * {@inheritdoc}
      */
-    protected function doClear(string $namespace)
+    protected function doClear(string $namespace): bool
     {
         if ('' === $namespace) {
             if ('sqlite' === $this->getPlatformName()) {
@@ -222,7 +222,7 @@ protected function doClear(string $namespace)
     /**
      * {@inheritdoc}
      */
-    protected function doDelete(array $ids)
+    protected function doDelete(array $ids): bool
     {
         $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "DELETE FROM $this->table WHERE $this->idCol IN ($sql)";
@@ -335,6 +335,11 @@ protected function doSave(array $values, int $lifetime)
         return $failed;
     }
 
+    /**
+     * Compatible with in doctrine/dbal ^2.13 and ^3.0.
+     *
+     * @psalm-suppress UndefinedClass
+     */
     private function getPlatformName(): string
     {
         if (isset($this->platformName)) {
@@ -348,8 +353,6 @@ private function getPlatformName(): string
             case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
                 return $this->platformName = 'mysql';
 
-            // Class exists in doctrine/dbal v2.13
-            // @psalm-suppress UndefinedClass
             case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
             case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
                 return $this->platformName = 'sqlite';
diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php
@@ -43,6 +43,7 @@ final class LockRegistry
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'CouchbaseCollectionAdapter.php',
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'DoctrineAdapter.php',
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'DoctrineDbalAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'DoctrineSchemaConfiguratorInterface.php',
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemAdapter.php',
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemTagAwareAdapter.php',
         __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'MemcachedAdapter.php',
