Increased Phpstan level to 3 for more strict validation

Author: Geolim4

.github/workflows/tests.yml

@@ -41,7 +41,7 @@ jobs:
         run: ./vendor/bin/phpmd lib/ ansi phpmd.xml
 
       - name: Run PHPSTAN (lite)
-        run: ./vendor/bin/phpstan analyse lib/ -l 2 -c phpstan_lite.neon 2>&1
+        run: ./vendor/bin/phpstan analyse lib/ -l 3 -c phpstan_lite.neon 2>&1
 
       - name: Run TESTS
         env:

.travis.yml

@@ -59,5 +59,5 @@ install:
 script:
   - ./vendor/bin/phpcs lib/ --report=summary
   - ./vendor/bin/phpmd lib/ ansi phpmd.xml
-  - "[[ $TRAVIS_PHP_VERSION != \"nightly\" ]] && ./vendor/bin/phpstan analyse lib/ -l 2 -c phpstan.neon 2>&1 || ./vendor/bin/phpstan analyse lib/ -l 2 -c phpstan_lite.neon 2>&1"
+  - "[[ $TRAVIS_PHP_VERSION != \"nightly\" ]] && ./vendor/bin/phpstan analyse lib/ -l 3 -c phpstan.neon 2>&1 || ./vendor/bin/phpstan analyse lib/ -l 3 -c phpstan_lite.neon 2>&1"
   - php -f ./bin/ci/run_tests.php

composer.json

@@ -37,6 +37,7 @@
         "ext-apcu": "*",
         "ext-intl": "*",
         "ext-memcached": "*",
+        "ext-cassandra": "*",
         "ext-memcache": "*",
         "ext-mongodb": "*",
         "ext-redis": "*",

lib/Phpfastcache/Cluster/ClusterPoolAbstract.php

@@ -38,9 +38,6 @@
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\InvalidArgumentException;
 
-/**
- * @property ConfigurationOption $config
- */
 abstract class ClusterPoolAbstract implements ClusterPoolInterface
 {
     use TaggableCacheItemPoolTrait;
@@ -242,9 +239,4 @@ public function getStats(): DriverStatistic
 
         return $stats;
     }
-
-    public function getConfig(): ConfigurationOption
-    {
-        return $this->config;
-    }
 }

lib/Phpfastcache/Config/ConfigurationOptionInterface.php

@@ -42,6 +42,11 @@ public function isValueSerializable(mixed $val): bool;
      */
     public function isValidOption(string $optionName): bool;
 
+    /**
+     * @return bool
+     */
+    public function isItemDetailedDate(): bool;
+
     /**
      * @param bool $itemDetailedDate
      * @return ConfigurationOption

lib/Phpfastcache/Core/Item/ExtendedCacheItemTrait.php

@@ -177,7 +177,7 @@ public function getTtl(): int
 
     public function isExpired(): bool
     {
-        return $this->expirationDate->getTimestamp() < (new DateTime())->getTimestamp();
+        return $this->getTtl() <= 0;
     }
 
     public function isNull(): bool
@@ -319,12 +319,12 @@ public function cloneInto(ExtendedCacheItemInterface $itemTarget, ?ExtendedCache
             ->set($this->getRawValue())
             ->setHit($this->isHit())
             ->setTags($this->getTags())
-            ->expiresAt($this->getExpirationDate())
+            ->expiresAt(clone $this->getExpirationDate())
             ->setDriver($itemPoolTarget ?? $this->driver);
 
         if ($this->driver->getConfig()->isItemDetailedDate()) {
-            $itemTarget->setCreationDate($this->getCreationDate())
-                ->setModificationDate($this->getModificationDate());
+            $itemTarget->setCreationDate(clone $this->getCreationDate())
+                ->setModificationDate(clone $this->getModificationDate());
         }
     }
 

lib/Phpfastcache/Core/Pool/CacheItemPoolTrait.php

@@ -40,12 +40,12 @@ trait CacheItemPoolTrait
     protected static string $unsupportedKeyChars = '{}()/\@:';
 
     /**
-     * @var ExtendedCacheItemInterface[]
+     * @var ExtendedCacheItemInterface[]|CacheItemInterface[]
      */
     protected array $deferredList = [];
 
     /**
-     * @var ExtendedCacheItemInterface[]
+     * @var ExtendedCacheItemInterface[]|CacheItemInterface[]
      */
     protected array $itemInstances = [];
 

lib/Phpfastcache/Core/Pool/DriverBaseTrait.php

@@ -103,9 +103,9 @@ public function getDriverName(): string
     }
 
     /**
-     * @return ConfigurationOption
+     * @return ConfigurationOptionInterface
      */
-    public function getDefaultConfig(): ConfigurationOption
+    public function getDefaultConfig(): ConfigurationOptionInterface
     {
         $className = $this::getConfigClass();
 
@@ -174,9 +174,12 @@ public function driverPreWrap(ExtendedCacheItemInterface $item, bool $stringifyD
     }
 
     /**
-     * @return ConfigurationOption
+     * @return ConfigurationOptionInterface
      */
-    abstract public function getConfig(): ConfigurationOption;
+    public function getConfig(): ConfigurationOptionInterface
+    {
+        return $this->config;
+    }
 
     /**
      * @param ConfigurationOptionInterface $config

lib/Phpfastcache/Core/Pool/ExtendedCacheItemPoolInterface.php

@@ -18,6 +18,7 @@
 
 use InvalidArgumentException;
 use Phpfastcache\Config\ConfigurationOption;
+use Phpfastcache\Config\ConfigurationOptionInterface;
 use Phpfastcache\Core\Item\ExtendedCacheItemInterface;
 use Phpfastcache\Entities\DriverIO;
 use Phpfastcache\Entities\DriverStatistic;
@@ -76,14 +77,14 @@ public static function getConfigClass(): string;
     public static function getItemClass(): string;
 
     /**
-     * @return ConfigurationOption
+     * @return ConfigurationOptionInterface
      */
-    public function getConfig(): ConfigurationOption;
+    public function getConfig(): ConfigurationOptionInterface;
 
     /**
-     * @return ConfigurationOption
+     * @return ConfigurationOptionInterface
      */
-    public function getDefaultConfig(): ConfigurationOption;
+    public function getDefaultConfig(): ConfigurationOptionInterface;
 
     /**
      * @return string

lib/Phpfastcache/Drivers/Apcu/Driver.php

@@ -29,7 +29,7 @@
 
 /**
  * Class Driver
- * @property Config $config
+ * @method Config getConfig()
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
@@ -118,9 +118,4 @@ protected function driverClear(): bool
     {
         return @apcu_clear_cache();
     }
-
-    public function getConfig(): Config
-    {
-        return $this->config;
-    }
 }