minor fixes

Author: spiritix

CHANGELOG.md

@@ -14,6 +14,7 @@
 - exists() uses cached select path when not locked
 - Added invalidation for insertUsing/insertOrIgnoreUsing/updateFrom
 - Tag sets self-heal on cache hits (idempotent SADD)
+- Cache::flush() prefers non-blocking UNLINK (falls back to DEL)
 
 ### Fixed
 - No Redis initialization when disabled; flush command is a no-op when inactive

src/Cache.php

@@ -83,9 +83,14 @@ public function flush(): void
             do {
                 [$cursor, $keys] = $this->redis->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000);
                 if (! empty($keys)) {
-                    $this->redis->del(...$keys);
+                    // Prefer non-blocking UNLINK when available; fall back to DEL.
+                    try {
+                        $this->redis->unlink(...$keys);
+                    } catch (Throwable) {
+                        $this->redis->del(...$keys);
+                    }
                 }
-            } while ($cursor !== '0' && $cursor !== 0);
+            } while ($cursor !== '0');
         } catch (Throwable $e) {
             Log::warning('[LadaCache] Redis flush failed: '.$e->getMessage());
         }

src/Encoder.php

@@ -13,15 +13,16 @@
  * Encodes and decodes cache payloads for storage.
  *
  * Strategy:
- * - Scalars, arrays, and null are encoded as JSON (with exceptions on error) to keep
- *   values portable and human-inspectable across services.
- * - Other values (e.g., objects) fall back to PHP's native serialization to retain
- *   fidelity for framework- or application-specific types.
+ * - Arrays are encoded via PHP's native serialization to preserve complex nested
+ *   structures and prevent ambiguity with JSON objects vs arrays when decoding.
+ * - Scalars and null are encoded as JSON (throwing on errors) to remain compact,
+ *   portable, and human-inspectable.
+ * - Objects attempt JSON encoding first to support simple DTO-like objects; if
+ *   that fails, fall back to native serialization for full fidelity.
  *
  * Architectural notes:
  * - The class is immutable and stateless; marked as readonly for clarity.
- * - Decoding first attempts JSON, then falls back to unserialize; if both fail,
- *   null is returned to indicate an un-decodable payload.
+ * - Decoding tries JSON first, then unserialize(); if both fail, returns null.
  */
 final readonly class Encoder
 {
@@ -35,7 +36,6 @@ public function encode(mixed $data): string
         }
 
         // For objects, prefer JSON to enable safe round-tripping of simple public data structures
-        // (e.g., anonymous classes with public properties). If JSON encoding fails, fall back to
         // native serialization for complex framework types.
         try {
             return json_encode($data, JSON_THROW_ON_ERROR);

src/LadaCacheServiceProvider.php

@@ -66,7 +66,7 @@ public function boot(): void
     /**
      * {@inheritDoc}
      */
-    public function register()
+    public function register(): void
     {
         $this->mergeConfigFrom(
             __DIR__.'/../config/'.self::CONFIG_FILE,
@@ -84,7 +84,7 @@ public function register()
     /**
      * {@inheritDoc}
      */
-    public function provides()
+    public function provides(): array
     {
         return [
             'lada.redis',

src/Manager.php

@@ -50,24 +50,12 @@ private function tablesCacheable(): bool
             return true;
         }
 
-        // Inclusive mode → all must be explicitly listed
+        // Inclusive mode: every referenced table must be present in includeTables
         if ($this->includeTables !== []) {
-            foreach ($tables as $table) {
-                if (! in_array($table, $this->includeTables, true)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        // Exclusive mode → none may appear in the blacklist
-        foreach ($tables as $table) {
-            if (in_array($table, $this->excludeTables, true)) {
-                return false;
-            }
+            return array_diff($tables, $this->includeTables) === [];
         }
 
-        return true;
+        // Exclusive mode: no referenced table may appear in excludeTables
+        return array_intersect($tables, $this->excludeTables) === [];
     }
 }

src/QueryHandler.php

@@ -70,8 +70,8 @@ public function collectSubQueryTags(): void
     }
 
     /**
-     * @param string $statementType One of Reflector::QUERY_TYPE_*
-     * @param array<string, mixed> $values Values used by the grammar to compile the SQL (e.g., update sets)
+     * @param  string  $statementType  One of Reflector::QUERY_TYPE_*
+     * @param  array<string, mixed>  $values  Values used by the grammar to compile the SQL (e.g., update sets)
      */
     public function invalidateQuery(string $statementType, array $values = []): void
     {
@@ -105,6 +105,7 @@ public function invalidateQuery(string $statementType, array $values = []): void
 
                 // We can't know hashes before flushing; record action only.
                 $this->stopCollector($reflector, $tags, [], "Invalidation queued ({$statementType})");
+
                 return;
             }
 

src/Tagger.php

@@ -117,23 +117,22 @@ private function prefix(string|array $value, string $prefix): string|array
         if (is_array($value)) {
             $out = [];
             foreach ($value as $item) {
-                if (is_scalar($item) || is_string($item)) {
-                    $out[] = (string) $this->prefix((string) $item, $prefix);
+                if (is_scalar($item)) {
+                    $out[] = $prefix.(string) $item;
 
                     continue;
                 }
                 if (is_object($item) && method_exists($item, '__toString')) {
-                    $out[] = (string) $this->prefix((string) $item, $prefix);
+                    $out[] = $prefix.(string) $item;
+
+                    continue;
                 }
-                // Otherwise skip unstringable items (e.g., Query Expressions). Reflector should already
-                // have provided normalized string table names for tagging purposes.
+                // Skip unstringable items (e.g., Query Expressions). TableExtractor already normalizes names.
             }
 
             return $out;
         }
 
-        $normalized = preg_replace('/\s+as\s+\w+$/i', '', (string) $value);
-
-        return $prefix.(string) $normalized;
+        return $prefix.$value;
     }
 }