Merge branch 'release/v0.5.8'

decodelabs · Aug 22, 2024 · 3eaf8bf · 3eaf8bf
2 parents 81ddcb9 + d096120
commit 3eaf8bf
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v0.5.8 (2024-08-21)
+* Converted consts to protected PascalCase
+* Updated Veneer dependency and Stub
+
 ## v0.5.7 (2024-07-17)
 * Updated Veneer dependency
 

diff --git a/composer.json b/composer.json
@@ -12,20 +12,20 @@
         "php": "^8.1",
 
         "decodelabs/archetype": "^0.3",
-        "decodelabs/atlas": "^0.11.1",
+        "decodelabs/atlas": "^0.12",
         "decodelabs/coercion": "^0.2.6",
         "decodelabs/dictum": "^0.6.0",
         "decodelabs/exceptional": "^0.4.3",
         "decodelabs/glitch-support": "^0.4",
-        "decodelabs/veneer": "^0.11.1",
+        "decodelabs/veneer": "^0.11.6",
 
         "psr/cache": "^3.0",
         "psr/simple-cache": "^3.0",
         "nesbot/carbon": "^2|^3"
     },
     "require-dev": {
         "decodelabs/dovetail": "^0.2",
-        "decodelabs/genesis": "^0.8",
+        "decodelabs/genesis": "^0.9",
         "decodelabs/phpstan-decodelabs": "^0.6",
 
         "ext-memcached": "^3.2",

diff --git a/src/Stash/Context.php b/src/Stash/Context.php
@@ -31,7 +31,7 @@
 
 class Context
 {
-    public const DRIVERS = [
+    protected const Drivers = [
         'Memcache', 'Redis', 'Apcu', 'Predis', 'PhpFile', 'PhpArray'
     ];
 
@@ -150,7 +150,7 @@ public function load(
     public function loadDriverFor(
         string $namespace
     ): Driver {
-        $drivers = self::DRIVERS;
+        $drivers = self::Drivers;
 
         if (null !== ($driverName = $this->getConfig()?->getDriverFor($namespace))) {
             array_unshift($drivers, $driverName);

diff --git a/src/Stash/Driver/File.php b/src/Stash/Driver/File.php
@@ -21,8 +21,8 @@ class File implements Driver
 {
     use KeyGenTrait;
 
-    public const KEY_SEPARATOR = '/';
-    public const EXTENSION = '.cache';
+    protected const KeySeparator = '/';
+    protected const Extension = '.cache';
 
     protected Dir $dir;
     protected int $dirPerms = 0770;
@@ -233,7 +233,7 @@ public function delete(
         }
 
         if ($key['self']) {
-            $this->dir->deleteFile($root . static::EXTENSION);
+            $this->dir->deleteFile($root . static::Extension);
         }
 
         return true;
@@ -316,7 +316,7 @@ protected function getFile(
         string $key
     ): FileInterface {
         $key = $this->createKey($namespace, $key);
-        $key = $this->hashKey($key) . static::EXTENSION;
+        $key = $this->hashKey($key) . static::Extension;
         return $this->dir->getFile($key);
     }
 
@@ -339,15 +339,15 @@ protected function hashKey(
         string $key
     ): string {
         $key = trim($key, '/');
-        $parts = explode(static::KEY_SEPARATOR, $key);
+        $parts = explode(static::KeySeparator, $key);
 
         foreach ((array)$parts as &$part) {
             if ($part !== '') {
                 $part = md5((string)$part);
             }
         }
 
-        return implode(static::KEY_SEPARATOR, $parts);
+        return implode(static::KeySeparator, $parts);
     }
 
 
@@ -388,6 +388,6 @@ public function purge(): void
      */
     protected function getKeySeparator(): string
     {
-        return static::KEY_SEPARATOR;
+        return static::KeySeparator;
     }
 }
diff --git a/src/Stash/Driver/PhpFile.php b/src/Stash/Driver/PhpFile.php
@@ -14,7 +14,7 @@
 
 class PhpFile extends File
 {
-    public const EXTENSION = '.php';
+    protected const Extension = '.php';
 
     /**
      * Store item data in file

diff --git a/src/Stash/FileStore/Generic.php b/src/Stash/FileStore/Generic.php
@@ -24,7 +24,7 @@
 
 class Generic implements FileStore
 {
-    public const EXTENSION = '.cache';
+    protected const Extension = '.cache';
 
     protected string $prefix = 'c-';
     protected string $namespace;
@@ -197,7 +197,7 @@ public function scanOlderThan(
 
         foreach ($this->dir->scanFiles() as $name => $file) {
             if (!$file->hasChangedIn($ttl)) {
-                $name = substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+                $name = substr($name, strlen($this->prefix), -strlen(self::Extension));
                 $output[$name] = $file;
             }
         }
@@ -213,7 +213,7 @@ public function scanBeginningWith(
         $output = [];
 
         foreach ($this->dir->scanFiles() as $name => $file) {
-            $name = substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+            $name = substr($name, strlen($this->prefix), -strlen(self::Extension));
 
             if (substr($name, 0, $length) === $prefix) {
                 $output[$name] = $file;
@@ -229,7 +229,7 @@ public function scanMatches(
         $output = [];
 
         foreach ($this->dir->scanFiles() as $name => $file) {
-            $name = substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+            $name = substr($name, strlen($this->prefix), -strlen(self::Extension));
 
             if (preg_match($pattern, $name)) {
                 $output[$name] = $file;
@@ -242,15 +242,15 @@ public function scanMatches(
     public function scanAll(): iterable
     {
         foreach ($this->dir->scanFiles() as $name => $file) {
-            $name = substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+            $name = substr($name, strlen($this->prefix), -strlen(self::Extension));
             yield $name => $file;
         }
     }
 
     public function scanKeys(): iterable
     {
         foreach ($this->dir->scanFiles() as $name => $file) {
-            yield substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+            yield substr($name, strlen($this->prefix), -strlen(self::Extension));
         }
     }
 
@@ -375,7 +375,7 @@ public function deleteMatches(
         $output = 0;
 
         foreach ($this->dir->scanFiles() as $name => $file) {
-            $name = substr($name, strlen($this->prefix), -strlen(self::EXTENSION));
+            $name = substr($name, strlen($this->prefix), -strlen(self::Extension));
 
             if (preg_match($pattern, $name)) {
                 $output++;
@@ -464,7 +464,7 @@ protected function normalizeKey(
     protected function createKey(
         string $key
     ): string {
-        return $this->prefix . $this->normalizeKey($key) . self::EXTENSION;
+        return $this->prefix . $this->normalizeKey($key) . self::Extension;
     }
 
     /**

diff --git a/src/Stash/Item.php b/src/Stash/Item.php
@@ -22,7 +22,7 @@
  */
 class Item implements CacheItem
 {
-    public const LOCK_TTL = 30;
+    public const LockTTL = 30;
 
     protected string $key;
 
@@ -441,7 +441,7 @@ public function lock(
             $date->add(Coercion::toDateInterval($ttl));
             $expires = $date->getTimestamp();
         } else {
-            $expires = time() + static::LOCK_TTL;
+            $expires = time() + static::LockTTL;
         }
 
         return $this->store->getDriver()->storeLock(

diff --git a/stubs/DecodeLabs/Stash.php b/stubs/DecodeLabs/Stash.php
@@ -19,9 +19,8 @@ class Stash implements Proxy
 {
     use ProxyTrait;
 
-    const VENEER = 'DecodeLabs\\Stash';
-    const VENEER_TARGET = Inst::class;
-    const DRIVERS = Inst::DRIVERS;
+    const Veneer = 'DecodeLabs\\Stash';
+    const VeneerTarget = Inst::class;
 
     public static Inst $instance;