Full PSR-12 compliance is now enforced by PHPCS

PHPSocialNetwork · Mar 31, 2022 · d63bb12 · d63bb12
1 parent 0e9aab0
commit d63bb12
Show file tree

Hide file tree

Showing 147 changed files with 245 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
 ## 9.1.0
 ##### xx april 2022
+- __Core__
+  - Deprecated `\Phpfastcache\Config\Config::class` 
 - __Drivers__
   - **Added `Solr` driver support**
 - __Cluster__
   - Fixed #855 // ClusterReplication drivers are saving erroneous expiration date in low-level backends
 - __Misc__
+  - Full PSR-12 compliance is now enforced by PHPCS
   - Multiple typo fixes (@mbiebl)
   - Updated composer suggestions and CI builder dependencies
 

diff --git a/lib/Phpfastcache/Api.php b/lib/Phpfastcache/Api.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache;

diff --git a/lib/Phpfastcache/CacheContract.php b/lib/Phpfastcache/CacheContract.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache;

diff --git a/lib/Phpfastcache/CacheManager.php b/lib/Phpfastcache/CacheManager.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache;
@@ -32,10 +33,10 @@
  */
 class CacheManager
 {
-    public const CORE_DRIVER_NAMESPACE = 'Phpfastcache\Drivers\\';
-
     use ClassNamespaceResolverTrait;
 
+    public const CORE_DRIVER_NAMESPACE = 'Phpfastcache\Drivers\\';
+
     protected static ConfigurationOptionInterface $config;
 
     protected static string $namespacePath;

diff --git a/lib/Phpfastcache/Cluster/AggregatablePoolInterface.php b/lib/Phpfastcache/Cluster/AggregatablePoolInterface.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;
@@ -19,5 +20,4 @@
 
 interface AggregatablePoolInterface extends CacheItemPoolInterface
 {
-
 }
diff --git a/lib/Phpfastcache/Cluster/AggregatorInterface.php b/lib/Phpfastcache/Cluster/AggregatorInterface.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;
@@ -19,7 +20,6 @@
 
 interface AggregatorInterface
 {
-
     /**
      * Full replication mechanism
      *

diff --git a/lib/Phpfastcache/Cluster/ClusterAggregator.php b/lib/Phpfastcache/Cluster/ClusterAggregator.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;

diff --git a/lib/Phpfastcache/Cluster/ClusterPoolAbstract.php b/lib/Phpfastcache/Cluster/ClusterPoolAbstract.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;
@@ -106,7 +107,7 @@ public function getClusterPools(): array
     /**
      * @inheritDoc
      */
-    public function getConfigs() : array
+    public function getConfigs(): array
     {
         $configs = [];
 
@@ -242,7 +243,7 @@ public function getStats(): DriverStatistic
         return $stats;
     }
 
-    public function getConfig() : ConfigurationOption
+    public function getConfig(): ConfigurationOption
     {
         return $this->config;
     }

diff --git a/lib/Phpfastcache/Cluster/ClusterPoolInterface.php b/lib/Phpfastcache/Cluster/ClusterPoolInterface.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;

diff --git a/lib/Phpfastcache/Cluster/ClusterPoolTrait.php b/lib/Phpfastcache/Cluster/ClusterPoolTrait.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;
@@ -20,7 +21,6 @@
 
 trait ClusterPoolTrait
 {
-
     protected function driverCheck(): bool
     {
         return true;

diff --git a/lib/Phpfastcache/Cluster/Drivers/FullReplication/Driver.php b/lib/Phpfastcache/Cluster/Drivers/FullReplication/Driver.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\FullReplication;
@@ -44,7 +45,8 @@ public function getItem(string $key): ExtendedCacheItemInterface
                 $itemData = $item->get();
                 $poolItemData = $poolItem->get();
 
-                if (\is_object($itemData)
+                if (
+                    \is_object($itemData)
                 ) {
                     if ($item->get() != $poolItemData) {
                         $poolsToResync[] = $driverPool;

diff --git a/lib/Phpfastcache/Cluster/Drivers/FullReplication/Item.php b/lib/Phpfastcache/Cluster/Drivers/FullReplication/Item.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\FullReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/MasterSlaveReplication/Driver.php b/lib/Phpfastcache/Cluster/Drivers/MasterSlaveReplication/Driver.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\MasterSlaveReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/MasterSlaveReplication/Item.php b/lib/Phpfastcache/Cluster/Drivers/MasterSlaveReplication/Item.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\MasterSlaveReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/RandomReplication/Driver.php b/lib/Phpfastcache/Cluster/Drivers/RandomReplication/Driver.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\RandomReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/RandomReplication/Item.php b/lib/Phpfastcache/Cluster/Drivers/RandomReplication/Item.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\RandomReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/SemiReplication/Driver.php b/lib/Phpfastcache/Cluster/Drivers/SemiReplication/Driver.php
@@ -11,6 +11,7 @@
  * @author  Georges.L (Geolim4)  <contact@geolim4.com>
  *
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\SemiReplication;

diff --git a/lib/Phpfastcache/Cluster/Drivers/SemiReplication/Item.php b/lib/Phpfastcache/Cluster/Drivers/SemiReplication/Item.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster\Drivers\SemiReplication;

diff --git a/lib/Phpfastcache/Cluster/ItemAbstract.php b/lib/Phpfastcache/Cluster/ItemAbstract.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Cluster;

diff --git a/lib/Phpfastcache/Config/AbstractConfigurationOption.php b/lib/Phpfastcache/Config/AbstractConfigurationOption.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *
  * This file is part of Phpfastcache.
@@ -10,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;
@@ -20,14 +22,11 @@
 abstract class AbstractConfigurationOption implements LockableConfigurationInterface
 {
     private bool $lockedObject = false;
-
     private ExtendedCacheItemPoolInterface $locker;
-
     public function lock(ExtendedCacheItemPoolInterface $poolInstance): static
     {
         $this->lockedObject = true;
         $this->locker = $poolInstance;
-
         return $this;
     }
 
@@ -52,13 +51,12 @@ protected function enforceLockedProperty(string $method): void
             if ($cause) {
                 $moreInfo = \sprintf('Caused line %d in %s', $cause['line'], $cause['file']);
             }
-            throw new PhpfastcacheLogicException(
-                \sprintf(
-                    'You can no longer change the configuration "%s" as the cache pool instance is now running. %s',
-                    \lcfirst(\substr($method, 3)),
-                    $moreInfo ?? ''
-                )
-            );
+
+            throw new PhpfastcacheLogicException(\sprintf(
+                'You can no longer change the configuration "%s" as the cache pool instance is now running. %s',
+                \lcfirst(\substr($method, 3)),
+                $moreInfo ?? ''
+            ));
         }
     }
 }
diff --git a/lib/Phpfastcache/Config/Config.php b/lib/Phpfastcache/Config/Config.php
@@ -11,8 +11,17 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;
 
 \class_alias(ConfigurationOption::class, \Phpfastcache\Config\Config::class);
+\trigger_error(
+    \sprintf(
+        '%s class is deprecated and will be removed in v10, use %s instead.',
+        \Phpfastcache\Config\Config::class,
+        ConfigurationOption::class
+    ),
+    \E_USER_DEPRECATED
+);
diff --git a/lib/Phpfastcache/Config/ConfigurationOption.php b/lib/Phpfastcache/Config/ConfigurationOption.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *
  * This file is part of Phpfastcache.

diff --git a/lib/Phpfastcache/Config/ConfigurationOptionInterface.php b/lib/Phpfastcache/Config/ConfigurationOptionInterface.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;
@@ -40,7 +41,7 @@ public function isValueSerializable(mixed $val): bool;
      * @return bool
      */
     public function isValidOption(string $optionName): bool;
-    
+
     /**
      * @param bool $itemDetailedDate
      * @return ConfigurationOption

diff --git a/lib/Phpfastcache/Config/IOConfigurationOptionInterface.php b/lib/Phpfastcache/Config/IOConfigurationOptionInterface.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;

diff --git a/lib/Phpfastcache/Config/IOConfigurationOptionTrait.php b/lib/Phpfastcache/Config/IOConfigurationOptionTrait.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;

diff --git a/lib/Phpfastcache/Config/LockableConfigurationInterface.php b/lib/Phpfastcache/Config/LockableConfigurationInterface.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Config;

diff --git a/lib/Phpfastcache/Core/Item/CacheItemTrait.php b/lib/Phpfastcache/Core/Item/CacheItemTrait.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Item;

diff --git a/lib/Phpfastcache/Core/Item/ExtendedCacheItemInterface.php b/lib/Phpfastcache/Core/Item/ExtendedCacheItemInterface.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Item;
@@ -32,7 +33,6 @@ interface ExtendedCacheItemInterface extends
     JsonSerializable,
     TaggableCacheItemInterface
 {
-
     /**
      * Returns the encoded key for the current cache item.
      * Is a MD5 (default),SHA1,SHA256 hash if "defaultKeyHashFunction" config option is configured

diff --git a/lib/Phpfastcache/Core/Item/ExtendedCacheItemTrait.php b/lib/Phpfastcache/Core/Item/ExtendedCacheItemTrait.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Item;

diff --git a/lib/Phpfastcache/Core/Item/TaggableCacheItemInterface.php b/lib/Phpfastcache/Core/Item/TaggableCacheItemInterface.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Item;

diff --git a/lib/Phpfastcache/Core/Item/TaggableCacheItemTrait.php b/lib/Phpfastcache/Core/Item/TaggableCacheItemTrait.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Item;
@@ -20,6 +21,7 @@
 trait TaggableCacheItemTrait
 {
     use ExtendedCacheItemTrait;
+
     /**
      * @var string[]
      */

diff --git a/lib/Phpfastcache/Core/Pool/CacheItemPoolTrait.php b/lib/Phpfastcache/Core/Pool/CacheItemPoolTrait.php
@@ -11,6 +11,7 @@
  * @author Georges.L (Geolim4)  <contact@geolim4.com>
  * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
  */
+
 declare(strict_types=1);
 
 namespace Phpfastcache\Core\Pool;