Merge pull request #778 from Geolim4/master

Geolim4 · web-flow · commit f1a22a821a30 · 2020-12-21T19:35:04.000Z
Released 8.0.4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,7 +38,6 @@ jobs:
           ini-values: apc.enabled=1, apc.shm_size=32M, apc.ttl=7200, apc.enable_cli=1, apc.serializer=php
       - name: Run tests on PHP 7.4
         run: php -f ./bin/ci/run_tests.php
-
       # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
       # Docs: https://getcomposer.org/doc/articles/scripts.md
       - name: Run tests on PHP 8.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 8.0.4
+#### _"Confined Xmas"_
+##### 21 december 2020
+- __Core__
+  - Added full PHP8 compatibility
+- __Tests__
+  - Added PHP8 test suite
+- __Drivers__
+  - Fixed #774 // Redis config cannot accept null values as the given example (@GeoSot)
+- __Misc__
+  - Small optimizations
+
 ## 8.0.3
 #### _"Reconfined"_
 ##### 23 november 2020
@@ -10,7 +22,7 @@
     - Fixed test title for "DisabledStaticItemCaching.test.php"
 - __Drivers__
     - Fixed #759 // Memcached Bytes Replaced with Version (@geolim4)
-    
+
 ## 8.0.2
 #### _"End of first wave"_
 ##### 28 august 2020
diff --git a/lib/Phpfastcache/Api.php b/lib/Phpfastcache/Api.php
@@ -74,10 +74,10 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,
             return $version;
         }
 
-        if (function_exists('shell_exec')) {
+        if (\function_exists('shell_exec')) {
             $command = 'git -C "' . __DIR__ . '" describe --abbrev=0 --tags';
-            $stdout = shell_exec($command);
-            if (is_string($stdout)) {
+            $stdout = \shell_exec($command);
+            if (\is_string($stdout)) {
                 $version = trim($stdout);
                 return $version;
             }
@@ -91,12 +91,12 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,
         }
 
         $changelogFilename = __DIR__ . '/../../CHANGELOG.md';
-        if (file_exists($changelogFilename)) {
+        if (\file_exists($changelogFilename)) {
             $versionPrefix = '## ';
-            $changelog = explode("\n", self::getPhpFastCacheChangelog());
+            $changelog = \explode("\n", self::getPhpFastCacheChangelog());
             foreach ($changelog as $line) {
-                if (strpos($line, $versionPrefix) === 0) {
-                    $version = trim(str_replace($versionPrefix, '', $line));
+                if (\strpos($line, $versionPrefix) === 0) {
+                    $version = \trim(\str_replace($versionPrefix, '', $line));
                     return $version;
                 }
             }
@@ -116,8 +116,8 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,
     public static function getPhpFastCacheChangelog(): string
     {
         $changelogFilename = __DIR__ . '/../../CHANGELOG.md';
-        if (file_exists($changelogFilename)) {
-            $string = str_replace(["\r\n", "\r"], "\n", trim(file_get_contents($changelogFilename)));
+        if (\file_exists($changelogFilename)) {
+            $string = \str_replace(["\r\n", "\r"], "\n", \trim(\file_get_contents($changelogFilename)));
             if ($string) {
                 return $string;
             }
@@ -138,10 +138,10 @@ public static function getPhpFastCacheGitHeadHash(bool $cacheable = true): strin
             return $hash;
         }
 
-        if (function_exists('shell_exec')) {
-            $stdout = shell_exec('git rev-parse --short HEAD');
-            if (is_string($stdout)) {
-                $hash = trim($stdout);
+        if (\function_exists('shell_exec')) {
+            $stdout = \shell_exec('git rev-parse --short HEAD');
+            if (\is_string($stdout)) {
+                $hash = \trim($stdout);
                 return "#{$hash}";
             }
         }
@@ -157,8 +157,8 @@ public static function getPhpFastCacheGitHeadHash(bool $cacheable = true): strin
     public static function getChangelog(): string
     {
         $changelogFilename = __DIR__ . '/../../CHANGELOG_API.md';
-        if (file_exists($changelogFilename)) {
-            $string = str_replace(["\r\n", "\r"], "\n", trim(file_get_contents($changelogFilename)));
+        if (\file_exists($changelogFilename)) {
+            $string = \str_replace(["\r\n", "\r"], "\n", \trim(\file_get_contents($changelogFilename)));
             if ($string) {
                 return $string;
             }
diff --git a/lib/Phpfastcache/CacheManager.php b/lib/Phpfastcache/CacheManager.php
@@ -177,15 +177,15 @@ public static function getInstance(string $driver, ?ConfigurationOptionInterface
         $config = self::validateConfig($config);
         $driver = self::standardizeDriverName($driver);
 
-        $instanceId = $instanceId ?: md5($driver . serialize(\array_filter($config->toArray(), static function ($val){
+        $instanceId = $instanceId ?: md5($driver . \serialize(\array_filter($config->toArray(), static function ($val){
             return !\is_callable($val);
         })));
 
         if (!isset(self::$instances[$instanceId])) {
             self::$badPracticeOmeter[$driver] = 1;
             $driverClass = self::validateDriverClass(self::getDriverClass($driver));
 
-            if (class_exists($driverClass)) {
+            if (\class_exists($driverClass)) {
                 $configClass = $driverClass::getConfigClass();
                 self::$instances[$instanceId] = new $driverClass(new $configClass($config->toArray()), $instanceId);
                 self::$instances[$instanceId]->setEventManager(EventManager::getInstance());
@@ -194,7 +194,7 @@ public static function getInstance(string $driver, ?ConfigurationOptionInterface
             }
         } else {
             if (self::$badPracticeOmeter[$driver] >= 2) {
-                trigger_error(
+                \trigger_error(
                     '[' . $driver . '] Calling many times CacheManager::getInstance() for already instanced drivers is a bad practice and have a significant impact on performances.
            See https://github.com/PHPSocialNetwork/phpfastcache/wiki/[V5]-Why-calling-getInstance%28%29-each-time-is-a-bad-practice-%3F'
                 );
@@ -219,7 +219,7 @@ protected static function validateConfig(?ConfigurationOptionInterface $config):
             $config = self::getDefaultConfig();
         } else {
             if (!($config instanceof ConfigurationOption)) {
-                throw new PhpfastcacheInvalidArgumentException(sprintf('Unsupported config type: %s', gettype($config)));
+                throw new PhpfastcacheInvalidArgumentException(\sprintf('Unsupported config type: %s', \gettype($config)));
             }
         }
 
@@ -242,7 +242,7 @@ public static function getDefaultConfig(): ConfigurationOptionInterface
      */
     public static function standardizeDriverName(string $driverName): string
     {
-        return ucfirst(strtolower(trim($driverName)));
+        return \ucfirst(\strtolower(\trim($driverName)));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,`
`74`	`74`	`return $version;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (function_exists('shell_exec')) {`
	`77`	`+ if (\function_exists('shell_exec')) {`
`78`	`78`	`$command = 'git -C "' . __DIR__ . '" describe --abbrev=0 --tags';`
`79`		`- $stdout = shell_exec($command);`
`80`		`- if (is_string($stdout)) {`
	`79`	`+ $stdout = \shell_exec($command);`
	`80`	`+ if (\is_string($stdout)) {`
`81`	`81`	`$version = trim($stdout);`
`82`	`82`	`return $version;`
`83`	`83`	`}`
`@@ -91,12 +91,12 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$changelogFilename = __DIR__ . '/../../CHANGELOG.md';`
`94`		`- if (file_exists($changelogFilename)) {`
	`94`	`+ if (\file_exists($changelogFilename)) {`
`95`	`95`	`$versionPrefix = '## ';`
`96`		`- $changelog = explode("\n", self::getPhpFastCacheChangelog());`
	`96`	`+ $changelog = \explode("\n", self::getPhpFastCacheChangelog());`
`97`	`97`	`foreach ($changelog as $line) {`
`98`		`- if (strpos($line, $versionPrefix) === 0) {`
`99`		`- $version = trim(str_replace($versionPrefix, '', $line));`
	`98`	`+ if (\strpos($line, $versionPrefix) === 0) {`
	`99`	`+ $version = \trim(\str_replace($versionPrefix, '', $line));`
`100`	`100`	`return $version;`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -116,8 +116,8 @@ public static function getPhpFastCacheVersion(bool $fallbackOnChangelog = true,`
`116`	`116`	`public static function getPhpFastCacheChangelog(): string`
`117`	`117`	`{`
`118`	`118`	`$changelogFilename = __DIR__ . '/../../CHANGELOG.md';`
`119`		`- if (file_exists($changelogFilename)) {`
`120`		`- $string = str_replace(["\r\n", "\r"], "\n", trim(file_get_contents($changelogFilename)));`
	`119`	`+ if (\file_exists($changelogFilename)) {`
	`120`	`+ $string = \str_replace(["\r\n", "\r"], "\n", \trim(\file_get_contents($changelogFilename)));`
`121`	`121`	`if ($string) {`
`122`	`122`	`return $string;`
`123`	`123`	`}`
`@@ -138,10 +138,10 @@ public static function getPhpFastCacheGitHeadHash(bool $cacheable = true): strin`
`138`	`138`	`return $hash;`
`139`	`139`	`}`
`140`	`140`
`141`		`- if (function_exists('shell_exec')) {`
`142`		`- $stdout = shell_exec('git rev-parse --short HEAD');`
`143`		`- if (is_string($stdout)) {`
`144`		`- $hash = trim($stdout);`
	`141`	`+ if (\function_exists('shell_exec')) {`
	`142`	`+ $stdout = \shell_exec('git rev-parse --short HEAD');`
	`143`	`+ if (\is_string($stdout)) {`
	`144`	`+ $hash = \trim($stdout);`
`145`	`145`	`return "#{$hash}";`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -157,8 +157,8 @@ public static function getPhpFastCacheGitHeadHash(bool $cacheable = true): strin`
`157`	`157`	`public static function getChangelog(): string`
`158`	`158`	`{`
`159`	`159`	`$changelogFilename = __DIR__ . '/../../CHANGELOG_API.md';`
`160`		`- if (file_exists($changelogFilename)) {`
`161`		`- $string = str_replace(["\r\n", "\r"], "\n", trim(file_get_contents($changelogFilename)));`
	`160`	`+ if (\file_exists($changelogFilename)) {`
	`161`	`+ $string = \str_replace(["\r\n", "\r"], "\n", \trim(\file_get_contents($changelogFilename)));`
`162`	`162`	`if ($string) {`
`163`	`163`	`return $string;`
`164`	`164`	`}`