Cleanup

symfony · Toflar · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024
commit b67a05ade69191c2379e94b2da8a096ae016686e
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -35,7 +35,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
     use AbstractAdapterTrait;
     use ContractsTrait;
 
-    private const TAGS_PREFIX = "\1tags\1";
+    protected const TAGS_PREFIX = "\1tags\1";
 
     protected function __construct(string $namespace = '', int $defaultLifetime = 0)
     {
@@ -168,7 +168,7 @@ protected function doDeleteYieldTags(array $ids): iterable
     public function commit(): bool
     {
         $ok = true;
-        $byLifetime = (self::$mergeByLifetime)($this->deferred, $expiredIds, $this->getId(...), self::TAGS_PREFIX, $this->defaultLifetime);
+        $byLifetime = (self::$mergeByLifetime)($this->deferred, $expiredIds, $this->getId(...), static::TAGS_PREFIX, $this->defaultLifetime);
         $retry = $this->deferred = [];
 
         if ($expiredIds) {
@@ -244,7 +244,7 @@ public function deleteItems(array $keys): bool
         try {
             foreach ($this->doDeleteYieldTags(array_values($ids)) as $id => $tags) {
                 foreach ($tags as $tag) {
-                    $tagData[$this->getId(self::TAGS_PREFIX.$tag)][] = $id;
+                    $tagData[$this->getId(static::TAGS_PREFIX.$tag)][] = $id;
                 }
             }
         } catch (\Exception) {
@@ -283,7 +283,7 @@ public function invalidateTags(array $tags): bool
 
         $tagIds = [];
         foreach (array_unique($tags) as $tag) {
-            $tagIds[] = $this->getId(self::TAGS_PREFIX.$tag);
+            $tagIds[] = $this->getId(static::TAGS_PREFIX.$tag);
         }
 
         try {

diff --git a/src/Symfony/Component/Cache/Adapter/PdoTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoTagAwareAdapter.php
@@ -16,13 +16,21 @@
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
+/**
+ * @author Yanick Witschi <yanick.witschi@terminal42.ch>
+ */
 class PdoTagAwareAdapter extends AbstractTagAwareAdapter implements PruneableInterface
 {
     use PdoTrait {
         doSave as public doSaveItem;
         prune as public pruneItems;
     }
 
+    /**
+     * No need for a prefix here, should improve lookup time.
+     */
+    protected const TAGS_PREFIX = '';
+
     /**
      * You can either pass an existing database connection as PDO instance or
      * a DSN string that will be used to lazy-connect to the database when the

diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -217,7 +217,7 @@ protected function doSave(array $values, int $lifetime): array|bool
         $lifetime = $lifetime ?: null;
 
         $stmt = $this->prepareStatementWithFallback($sql, function () {
-            $this->createTable();
+            $this->createItemsTable();
         });
 
         // $id and $data are defined later in the loop. Binding is done by reference, values are read on execution.
@@ -247,7 +247,7 @@ protected function doSave(array $values, int $lifetime): array|bool
 
         foreach ($values as $id => $data) {
             $this->executeStatementWithFallback($stmt, function () {
-                $this->createTable();
+                $this->createItemsTable();
             });
 
             if (null === $driver && !$stmt->rowCount()) {