[Cache] Make sure PdoAdapter::prune() always returns a bool

derrabus · derrabus · commit abad7cfa19ec · 2021-09-07T08:53:54.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -217,7 +217,7 @@ public function testPrune()
         $doSet('qux', 'qux-val', new \DateInterval('PT20S'));
 
         sleep(30);
-        $cache->prune();
+        $this->assertTrue($cache->prune());
         $this->assertTrue($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'bar'));
         $this->assertTrue($this->isPruned($cache, 'baz'));
@@ -228,27 +228,27 @@ public function testPrune()
         $doSet('baz', 'baz-val', new \DateInterval('PT40S'));
         $doSet('qux', 'qux-val', new \DateInterval('PT80S'));
 
-        $cache->prune();
+        $this->assertTrue($cache->prune());
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertFalse($this->isPruned($cache, 'bar'));
         $this->assertFalse($this->isPruned($cache, 'baz'));
         $this->assertFalse($this->isPruned($cache, 'qux'));
 
         sleep(30);
-        $cache->prune();
+        $this->assertTrue($cache->prune());
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'bar'));
         $this->assertFalse($this->isPruned($cache, 'baz'));
         $this->assertFalse($this->isPruned($cache, 'qux'));
 
         sleep(30);
-        $cache->prune();
+        $this->assertTrue($cache->prune());
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'baz'));
         $this->assertFalse($this->isPruned($cache, 'qux'));
 
         sleep(30);
-        $cache->prune();
+        $this->assertTrue($cache->prune());
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'qux'));
     }
diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -19,6 +19,7 @@
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Statement;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\Marshaller\MarshallerInterface;
@@ -183,6 +184,13 @@ public function prune()
             $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), $useDbalConstants ? ParameterType::STRING : \PDO::PARAM_STR);
         }
         try {
+            // Doctrine DBAL ^2.13 || >= 3.1
+            if ($delete instanceof Statement && \method_exists($delete, 'executeStatement')) {
+                $delete->executeStatement();
+
+                return true;
+            }
+
             return $delete->execute();
         } catch (TableNotFoundException $e) {
             return true;
