Rename NAME to constant

diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php
index 02cdb1a79ed65c7086d81685166dec38ecffb905..000233df7fcb3ebbb52035fa465d0861956f60d3 100644 (file)
--- a/src/Core/Cache/Factory/Cache.php
+++ b/src/Core/Cache/Factory/Cache.php
@@ -69,7 +69,7 @@ class Cache
         */
        public function createDistributed(string $type = null): ICanCache
        {
-               if ($type === Type\APCuCache::$NAME) {
+               if ($type === Type\APCuCache::NAME) {
                        throw new InvalidCacheDriverException('apcu doesn\'t support distributed caching.');
                }
 

diff --git a/src/Core/Cache/Type/APCuCache.php b/src/Core/Cache/Type/APCuCache.php
index 02b2d0fbdbffe34f7eb5b7d4c66b2771cf7ed170..f35815c15a92abf5e9297f5d6f943f29b6fc12df 100644 (file)
--- a/src/Core/Cache/Type/APCuCache.php
+++ b/src/Core/Cache/Type/APCuCache.php
@@ -30,7 +30,7 @@ use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
  */
 class APCuCache extends AbstractCache implements ICanCacheInMemory
 {
-       public static $NAME = 'apcu';
+       const NAME = 'apcu';
 
        use CompareSetTrait;
        use CompareDeleteTrait;

diff --git a/src/Core/Cache/Type/AbstractCache.php b/src/Core/Cache/Type/AbstractCache.php
index 36e301ad209d01d6b1494c5225e9331ec3e7bed2..211f28b9a6cf22736efce8371a4b4fcefcb7a745 100644 (file)
--- a/src/Core/Cache/Type/AbstractCache.php
+++ b/src/Core/Cache/Type/AbstractCache.php
@@ -28,7 +28,7 @@ use Friendica\Core\Cache\Capability\ICanCache;
  */
 abstract class AbstractCache implements ICanCache
 {
-       public static $NAME = '';
+       const NAME = '';
 
        /**
         * @var string The hostname
@@ -111,6 +111,6 @@ abstract class AbstractCache implements ICanCache
        /** {@inheritDoc} */
        public function getName(): string
        {
-               return static::$NAME;
+               return static::NAME;
        }
 }

diff --git a/src/Core/Cache/Type/ArrayCache.php b/src/Core/Cache/Type/ArrayCache.php
index ad87eaf23a0354e33619791dda48a105cd938f1c..34246afffad6ba8cb75bf7dbd146956ea02e0f45 100644 (file)
--- a/src/Core/Cache/Type/ArrayCache.php
+++ b/src/Core/Cache/Type/ArrayCache.php
@@ -29,7 +29,7 @@ use Friendica\Core\Cache\Enum;
  */
 class ArrayCache extends AbstractCache implements ICanCacheInMemory
 {
-       public static $NAME = 'array';
+       const NAME = 'array';
 
        use CompareDeleteTrait;
 

diff --git a/src/Core/Cache/Type/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php
index 18541e0d2bdcb6a839aeee804cbdd1f1dcb1fa05..4959d6a751d4f3140443ba13412ab3b90f85d18e 100644 (file)
--- a/src/Core/Cache/Type/DatabaseCache.php
+++ b/src/Core/Cache/Type/DatabaseCache.php
@@ -32,7 +32,7 @@ use Friendica\Util\DateTimeFormat;
  */
 class DatabaseCache extends AbstractCache implements ICanCache
 {
-       public static $NAME = 'database';
+       const NAME = 'database';
 
        /**
         * @var Database

diff --git a/src/Core/Cache/Type/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php
index 09394a1dd33e22cb09d8b917171ef56b3904269f..fccaff6c004a94331d28d596a404ea1cb781f524 100644 (file)
--- a/src/Core/Cache/Type/MemcacheCache.php
+++ b/src/Core/Cache/Type/MemcacheCache.php
@@ -33,7 +33,7 @@ use Memcache;
  */
 class MemcacheCache extends AbstractCache implements ICanCacheInMemory
 {
-       static $NAME = 'memcached';
+       const NAME = 'memcached';
 
        use CompareSetTrait;
        use CompareDeleteTrait;

diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php
index 45a7a0f1c13305e07485428178b1181a8a449475..160c5a16f436cb3120b87026ee1fe26e3883bee1 100644 (file)
--- a/src/Core/Cache/Type/MemcachedCache.php
+++ b/src/Core/Cache/Type/MemcachedCache.php
@@ -34,7 +34,7 @@ use Psr\Log\LoggerInterface;
  */
 class MemcachedCache extends AbstractCache implements ICanCacheInMemory
 {
-       static $NAME = 'memcached';
+       const NAME = 'memcached';
 
        use CompareSetTrait;
        use CompareDeleteTrait;

diff --git a/src/Core/Cache/Type/RedisCache.php b/src/Core/Cache/Type/RedisCache.php
index 36c60a12c18eade8a29198bd630cbff877755bcb..be2a7ff08068538b31ee920ccb9ad6319ab9a8c2 100644 (file)
--- a/src/Core/Cache/Type/RedisCache.php
+++ b/src/Core/Cache/Type/RedisCache.php
@@ -33,7 +33,7 @@ use Redis;
  */
 class RedisCache extends AbstractCache implements ICanCacheInMemory
 {
-       public static $NAME = 'redis';
+       const NAME = 'redis';
 
        /**
         * @var Redis

diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index dbcc56e228781dfeb84dee4328490af85224aeb6..775a29374c24018bf4abee3153999543bbd7f27b 100644 (file)
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -250,8 +250,8 @@ abstract class CacheTest extends MockedTest
 
        public function testGetName()
        {
-               if (property_exists($this->instance, '$NAME')) {
-                       self::assertEquals($this->instance::$NAME, $this->instance->getName());
+               if (defined(get_class($this->instance) . '::NAME')) {
+                       self::assertEquals($this->instance::NAME, $this->instance->getName());
                } else {
                        self::expectNotToPerformAssertions();
                }