From d3ee82659aea6315b2f5093e8ec45291ee0bd379 Mon Sep 17 00:00:00 2001
From: Max Baldanza <massimiliano.baldanza@instapro.com>
Date: Tue, 14 May 2024 19:35:50 +0100
Subject: [PATCH] Formatting changes

* Remove docblocks that are no longer needed
As we have types already added to the code
then the docblocks don't add anything
and actually make it harder to maintain

* Add CS formatting rules
Make sure all classes are consistent
by having a new line after the opening tag.
At the minute there's a mixture of the two.
Removed unused imports

* Add phpunit cache to gitignore
---
 .gitignore                                    |   1 +
 .php-cs-fixer.dist.php                        |   2 +
 examples/common.php                           |   1 +
 examples/server/index.php                     |   1 +
 examples/server/redirect.php                  |   1 +
 examples/server/timeout.php                   |   1 +
 src/Ganesha.php                               |  48 ++------
 src/Ganesha/Builder.php                       |   9 +-
 src/Ganesha/Configuration.php                 |  10 +-
 src/Ganesha/Context.php                       |   6 +-
 src/Ganesha/Exception/RejectedException.php   |   1 +
 src/Ganesha/Exception/StorageException.php    |   1 +
 src/Ganesha/GaneshaHttpClient.php             |   1 +
 src/Ganesha/GuzzleMiddleware.php              |   5 +-
 .../GuzzleMiddleware/ServiceNameExtractor.php |   8 +-
 .../ServiceNameExtractorInterface.php         |   8 +-
 .../HttpClient/FailureDetectorInterface.php   |   1 +
 src/Ganesha/HttpClient/HostTrait.php          |   1 +
 .../HttpClient/RestFailureDetector.php        |   1 +
 .../HttpClient/ServiceNameExtractor.php       |   1 +
 .../ServiceNameExtractorInterface.php         |   1 +
 .../HttpClient/TransportFailureDetector.php   |   1 +
 src/Ganesha/Storage.php                       | 110 +++---------------
 src/Ganesha/Storage/Adapter/Apcu.php          |  51 ++------
 src/Ganesha/Storage/Adapter/ApcuStore.php     |   1 +
 src/Ganesha/Storage/Adapter/Memcached.php     |  31 +----
 src/Ganesha/Storage/Adapter/MongoDB.php       |  51 --------
 src/Ganesha/Storage/Adapter/Redis.php         |  33 +-----
 .../Adapter/SlidingTimeWindowInterface.php    |   1 +
 .../Adapter/TumblingTimeWindowInterface.php   |   1 +
 src/Ganesha/Storage/AdapterInterface.php      |  55 ++-------
 src/Ganesha/Storage/StorageKeys.php           |  19 +--
 src/Ganesha/Storage/StorageKeysInterface.php  |  19 +--
 src/Ganesha/Strategy/Count.php                |  29 +----
 src/Ganesha/Strategy/Count/Builder.php        |  14 +--
 src/Ganesha/Strategy/Rate.php                 |  40 +------
 src/Ganesha/Strategy/Rate/Builder.php         |  18 +--
 src/Ganesha/StrategyInterface.php             |  21 +---
 src/Ganesha/Traits/BuildGanesha.php           |   2 +-
 tests/Ackintosh/Ganesha/BuilderTest.php       |   1 +
 tests/Ackintosh/Ganesha/ConfigurationTest.php |   1 +
 .../ServiceNameExtractorTest.php              |   1 +
 .../Ganesha/GuzzleMiddlewareTest.php          |   1 +
 .../HttpClient/ServiceNameExtractorTest.php   |   1 +
 .../Ganesha/Storage/Adapter/ApcuStoreTest.php |   1 +
 .../Ganesha/Storage/Adapter/ApcuTest.php      |   1 +
 .../Ganesha/Storage/Adapter/MemcachedTest.php |   1 +
 .../Ganesha/Storage/Adapter/MongoDBTest.php   |   1 -
 .../PredisRedisClientInterfaceTestDouble.php  |   1 +
 tests/Ackintosh/Ganesha/StorageTest.php       |   1 +
 .../Ganesha/Strategy/Count/BuilderTest.php    |   1 +
 .../Ganesha/Strategy/Rate/BuilderTest.php     |   1 +
 tests/Ackintosh/Ganesha/Strategy/RateTest.php |   1 +
 .../Ganesha/Traits/BuildGaneshaTest.php       |   1 +
 tests/Ackintosh/GaneshaTest.php               |   1 +
 tests/bootstrap.php                           |   1 +
 56 files changed, 100 insertions(+), 523 deletions(-)

diff --git a/.gitignore b/.gitignore
index f68a531..862c3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ GTAGS
 .idea
 /tmp
 .php-cs-fixer.cache
+.phpunit.result.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1ef5f36..da70b44 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -10,6 +10,8 @@
 return $config->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
+        'blank_line_after_opening_tag' => true,
+        'no_unused_imports' => true,
     ])
     ->setFinder($finder)
 ;
diff --git a/examples/common.php b/examples/common.php
index 412e662..7f11243 100644
--- a/examples/common.php
+++ b/examples/common.php
@@ -1,4 +1,5 @@
 <?php
+
 use \Ackintosh\Ganesha;
 use \Ackintosh\Ganesha\Builder;
 
diff --git a/examples/server/index.php b/examples/server/index.php
index 4eedffa..c14a917 100644
--- a/examples/server/index.php
+++ b/examples/server/index.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once dirname(__DIR__) . '/common.php';
 
 if (trim(file_get_contents(SERVER_STATE_DATA)) === SERVER_STATE_ABNORMAL) {
diff --git a/examples/server/redirect.php b/examples/server/redirect.php
index aa5b6be..d09001b 100644
--- a/examples/server/redirect.php
+++ b/examples/server/redirect.php
@@ -1,4 +1,5 @@
 <?php
+
 const DEFAULT_REDIRECTS = 3;
 
 $current = $_GET['current'] ?? 0;
diff --git a/examples/server/timeout.php b/examples/server/timeout.php
index ad6ecc8..8450a49 100644
--- a/examples/server/timeout.php
+++ b/examples/server/timeout.php
@@ -1,2 +1,3 @@
 <?php
+
 sleep(10);
diff --git a/src/Ganesha.php b/src/Ganesha.php
index 3436ba2..c1760a0 100644
--- a/src/Ganesha.php
+++ b/src/Ganesha.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh;
 
 use Ackintosh\Ganesha\Exception\StorageException;
@@ -48,23 +49,15 @@ class Ganesha
      */
     private static $disabled = false;
 
-    /**
-     * Ganesha constructor.
-     *
-     * @param StrategyInterface $strategy
-     */
-    public function __construct($strategy)
+    public function __construct(StrategyInterface $strategy)
     {
         $this->strategy = $strategy;
     }
 
     /**
-     * records failure
-     *
-     * @param string $service
-     * @return void
+     * Records failure
      */
-    public function failure($service): void
+    public function failure(string $service): void
     {
         try {
             if ($this->strategy->recordFailure($service) === self::STATUS_TRIPPED) {
@@ -76,12 +69,9 @@ public function failure($service): void
     }
 
     /**
-     * records success
-     *
-     * @param string $service
-     * @return void
+     * Records success
      */
-    public function success($service): void
+    public function success(string $service): void
     {
         try {
             if ($this->strategy->recordSuccess($service) === self::STATUS_CALMED_DOWN) {
@@ -92,11 +82,7 @@ public function success($service): void
         }
     }
 
-    /**
-     * @param string $service
-     * @return bool
-     */
-    public function isAvailable($service): bool
+    public function isAvailable(string $service): bool
     {
         if (self::$disabled) {
             return true;
@@ -112,21 +98,13 @@ public function isAvailable($service): bool
     }
 
     /**
-     * @param callable $callable
      * @psalm-param callable(self::EVENT_*, string, string): void $callable
-     * @return void
      */
     public function subscribe(callable $callable): void
     {
         $this->subscribers[] = $callable;
     }
 
-    /**
-     * @param string $event
-     * @param string $service
-     * @param string $message
-     * @return void
-     */
     private function notify(string $event, string $service, string $message): void
     {
         foreach ($this->subscribers as $s) {
@@ -135,9 +113,7 @@ private function notify(string $event, string $service, string $message): void
     }
 
     /**
-     * disable
-     *
-     * @return void
+     * Disable
      */
     public static function disable(): void
     {
@@ -145,9 +121,7 @@ public static function disable(): void
     }
 
     /**
-     * enable
-     *
-     * @return void
+     * Enable
      */
     public static function enable(): void
     {
@@ -155,9 +129,7 @@ public static function enable(): void
     }
 
     /**
-     * resets all counts
-     *
-     * @return void
+     * Resets all counts
      */
     public function reset(): void
     {
diff --git a/src/Ganesha/Builder.php b/src/Ganesha/Builder.php
index 59e1909..16fa0e3 100644
--- a/src/Ganesha/Builder.php
+++ b/src/Ganesha/Builder.php
@@ -1,7 +1,6 @@
 <?php
-namespace Ackintosh\Ganesha;
 
-use Ackintosh\Ganesha\Strategy;
+namespace Ackintosh\Ganesha;
 
 /**
  * A front end of the strategy specific builders
@@ -10,17 +9,11 @@
  */
 class Builder
 {
-    /**
-     * @return Strategy\Rate\Builder
-     */
     public static function withRateStrategy(): Strategy\Rate\Builder
     {
         return new Strategy\Rate\Builder();
     }
 
-    /**
-     * @return Strategy\Count\Builder
-     */
     public static function withCountStrategy(): Strategy\Count\Builder
     {
         return new Strategy\Count\Builder();
diff --git a/src/Ganesha/Configuration.php b/src/Ganesha/Configuration.php
index 4db8868..b18c513 100644
--- a/src/Ganesha/Configuration.php
+++ b/src/Ganesha/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Storage\AdapterInterface;
@@ -16,13 +17,9 @@ class Configuration
     const INTERVAL_TO_HALF_OPEN = 'intervalToHalfOpen';
     const STORAGE_KEYS = 'storageKeys';
 
-    /**
-     * @var array
-     */
-    private $params;
+    private array $params;
 
-    /** @param array $params */
-    public function __construct($params)
+    public function __construct(array $params)
     {
         if (!isset($params[self::STORAGE_KEYS])) {
             $params[self::STORAGE_KEYS] = new StorageKeys();
@@ -61,7 +58,6 @@ public function storageKeys(): StorageKeysInterface
     }
 
     /**
-     * @param array $params
      * @throws \InvalidArgumentException
      */
     public static function validate(array $params): void
diff --git a/src/Ganesha/Context.php b/src/Ganesha/Context.php
index 573d3a8..dc8c433 100644
--- a/src/Ganesha/Context.php
+++ b/src/Ganesha/Context.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Storage\Adapter\SlidingTimeWindowInterface;
@@ -34,11 +35,6 @@ class Context
      */
     private $configuration;
 
-    /**
-     * @param string $strategyClass
-     * @param AdapterInterface $adapter
-     * @param Configuration $configuration
-     */
     public function __construct(string $strategyClass, AdapterInterface $adapter, Configuration $configuration)
     {
         $this->strategy = $this->determineStrategyContext($strategyClass, $adapter);
diff --git a/src/Ganesha/Exception/RejectedException.php b/src/Ganesha/Exception/RejectedException.php
index 807d5cd..0397aee 100644
--- a/src/Ganesha/Exception/RejectedException.php
+++ b/src/Ganesha/Exception/RejectedException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Exception;
 
 class RejectedException extends \RuntimeException
diff --git a/src/Ganesha/Exception/StorageException.php b/src/Ganesha/Exception/StorageException.php
index 457d234..7218eee 100644
--- a/src/Ganesha/Exception/StorageException.php
+++ b/src/Ganesha/Exception/StorageException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Exception;
 
 class StorageException extends \RuntimeException
diff --git a/src/Ganesha/GaneshaHttpClient.php b/src/Ganesha/GaneshaHttpClient.php
index 550dbde..6c6b75d 100644
--- a/src/Ganesha/GaneshaHttpClient.php
+++ b/src/Ganesha/GaneshaHttpClient.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha;
diff --git a/src/Ganesha/GuzzleMiddleware.php b/src/Ganesha/GuzzleMiddleware.php
index 1821c36..1673707 100644
--- a/src/Ganesha/GuzzleMiddleware.php
+++ b/src/Ganesha/GuzzleMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha;
@@ -60,10 +61,6 @@ public function __construct(
         }
     }
 
-    /**
-     * @param callable $handler
-     * @return \Closure
-     */
     public function __invoke(callable $handler): \Closure
     {
         return function (RequestInterface $request, array $options) use ($handler) {
diff --git a/src/Ganesha/GuzzleMiddleware/ServiceNameExtractor.php b/src/Ganesha/GuzzleMiddleware/ServiceNameExtractor.php
index ac26e3e..b9f4adb 100644
--- a/src/Ganesha/GuzzleMiddleware/ServiceNameExtractor.php
+++ b/src/Ganesha/GuzzleMiddleware/ServiceNameExtractor.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\GuzzleMiddleware;
 
 use Psr\Http\Message\RequestInterface;
@@ -15,12 +16,7 @@ class ServiceNameExtractor implements ServiceNameExtractorInterface
      */
     const HEADER_NAME = 'X-Ganesha-Service-Name';
 
-    /**
-     * @param RequestInterface $request
-     * @param array $requestOptions
-     * @return string
-     */
-    public function extract(RequestInterface $request, array $requestOptions)
+    public function extract(RequestInterface $request, array $requestOptions): string
     {
         if (array_key_exists(self::OPTION_KEY, $requestOptions)) {
             return $requestOptions[self::OPTION_KEY];
diff --git a/src/Ganesha/GuzzleMiddleware/ServiceNameExtractorInterface.php b/src/Ganesha/GuzzleMiddleware/ServiceNameExtractorInterface.php
index 4eb3d51..0772741 100644
--- a/src/Ganesha/GuzzleMiddleware/ServiceNameExtractorInterface.php
+++ b/src/Ganesha/GuzzleMiddleware/ServiceNameExtractorInterface.php
@@ -1,14 +1,10 @@
 <?php
+
 namespace Ackintosh\Ganesha\GuzzleMiddleware;
 
 use Psr\Http\Message\RequestInterface;
 
 interface ServiceNameExtractorInterface
 {
-    /**
-     * @param RequestInterface $request
-     * @param array $requestOptions
-     * @return string
-     */
-    public function extract(RequestInterface $request, array $requestOptions);
+    public function extract(RequestInterface $request, array $requestOptions): string;
 }
diff --git a/src/Ganesha/HttpClient/FailureDetectorInterface.php b/src/Ganesha/HttpClient/FailureDetectorInterface.php
index 9b5a705..de47ce1 100644
--- a/src/Ganesha/HttpClient/FailureDetectorInterface.php
+++ b/src/Ganesha/HttpClient/FailureDetectorInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 use Symfony\Contracts\HttpClient\ResponseInterface;
diff --git a/src/Ganesha/HttpClient/HostTrait.php b/src/Ganesha/HttpClient/HostTrait.php
index 3f5a9fb..2f992df 100644
--- a/src/Ganesha/HttpClient/HostTrait.php
+++ b/src/Ganesha/HttpClient/HostTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
diff --git a/src/Ganesha/HttpClient/RestFailureDetector.php b/src/Ganesha/HttpClient/RestFailureDetector.php
index cff4a67..665e230 100644
--- a/src/Ganesha/HttpClient/RestFailureDetector.php
+++ b/src/Ganesha/HttpClient/RestFailureDetector.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
diff --git a/src/Ganesha/HttpClient/ServiceNameExtractor.php b/src/Ganesha/HttpClient/ServiceNameExtractor.php
index 5d837c0..dee3ff3 100644
--- a/src/Ganesha/HttpClient/ServiceNameExtractor.php
+++ b/src/Ganesha/HttpClient/ServiceNameExtractor.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 final class ServiceNameExtractor implements ServiceNameExtractorInterface
diff --git a/src/Ganesha/HttpClient/ServiceNameExtractorInterface.php b/src/Ganesha/HttpClient/ServiceNameExtractorInterface.php
index 69e65e2..099741d 100644
--- a/src/Ganesha/HttpClient/ServiceNameExtractorInterface.php
+++ b/src/Ganesha/HttpClient/ServiceNameExtractorInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 interface ServiceNameExtractorInterface
diff --git a/src/Ganesha/HttpClient/TransportFailureDetector.php b/src/Ganesha/HttpClient/TransportFailureDetector.php
index d8e0645..aef22ed 100644
--- a/src/Ganesha/HttpClient/TransportFailureDetector.php
+++ b/src/Ganesha/HttpClient/TransportFailureDetector.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
diff --git a/src/Ganesha/Storage.php b/src/Ganesha/Storage.php
index 4bcb885..ff631e0 100644
--- a/src/Ganesha/Storage.php
+++ b/src/Ganesha/Storage.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Exception\StorageException;
@@ -24,13 +25,6 @@ class Storage
      */
     private $storageKeys;
 
-    /**
-     * Storage constructor.
-     *
-     * @param AdapterInterface $adapter
-     * @param StorageKeysInterface $storageKeys
-     * @param callable|null $serviceNameDecorator
-     */
     public function __construct(
         AdapterInterface $adapter,
         StorageKeysInterface $storageKeys,
@@ -42,10 +36,8 @@ public function __construct(
     }
 
     /**
-     * returns count
+     * Returns count
      *
-     * @param  string $key
-     * @return int
      * @throws StorageException
      */
     private function getCount(string $key): int
@@ -54,10 +46,8 @@ private function getCount(string $key): int
     }
 
     /**
-     * returns success count
+     * Returns success count
      *
-     * @param  string $key
-     * @return int
      * @throws StorageException
      */
     public function getSuccessCountByCustomKey(string $key): int
@@ -66,10 +56,8 @@ public function getSuccessCountByCustomKey(string $key): int
     }
 
     /**
-     * returns failure count
+     * Returns failure count
      *
-     * @param  string $key
-     * @return int
      * @throws StorageException
      */
     public function getFailureCountByCustomKey(string $key): int
@@ -78,10 +66,8 @@ public function getFailureCountByCustomKey(string $key): int
     }
 
     /**
-     * returns rejection count
+     * Returns rejection count
      *
-     * @param  string $key
-     * @return int
      * @throws StorageException
      */
     public function getRejectionCountByCustomKey(string $key): int
@@ -90,10 +76,8 @@ public function getRejectionCountByCustomKey(string $key): int
     }
 
     /**
-     * returns failure count
+     * Returns failure count
      *
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function getFailureCount(string $service): int
@@ -102,10 +86,8 @@ public function getFailureCount(string $service): int
     }
 
     /**
-     * returns success count
+     * Returns success count
      *
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function getSuccessCount(string $service): int
@@ -114,10 +96,8 @@ public function getSuccessCount(string $service): int
     }
 
     /**
-     * increments failure count
+     * Increments failure count
      *
-     * @param  string $service
-     * @return void
      * @throws StorageException
      */
     public function incrementFailureCount(string $service): void
@@ -126,10 +106,8 @@ public function incrementFailureCount(string $service): void
     }
 
     /**
-     * decrements failure count
+     * Decrements failure count
      *
-     * @param  string $service
-     * @return void
      * @throws StorageException
      */
     public function decrementFailureCount(string $service): void
@@ -138,10 +116,8 @@ public function decrementFailureCount(string $service): void
     }
 
     /**
-     * increments success count
+     * Increments success count
      *
-     * @param  string $service
-     * @return void
      * @throws StorageException
      */
     public function incrementSuccessCount(string $service): void
@@ -150,10 +126,8 @@ public function incrementSuccessCount(string $service): void
     }
 
     /**
-     * returns rejection count
+     * Returns rejection count
      *
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function getRejectionCount(string $service): int
@@ -162,10 +136,8 @@ public function getRejectionCount(string $service): int
     }
 
     /**
-     * increments rejection count
+     * Increments rejection count
      *
-     * @param  string $service
-     * @return void
      * @throws StorageException
      */
     public function incrementRejectionCount(string $service): void
@@ -174,10 +146,8 @@ public function incrementRejectionCount(string $service): void
     }
 
     /**
-     * sets failure count
+     * Sets failure count
      *
-     * @param $service
-     * @param $failureCount
      * @throws StorageException
      */
     public function setFailureCount(string $service, int $failureCount): void
@@ -186,11 +156,8 @@ public function setFailureCount(string $service, int $failureCount): void
     }
 
     /**
-     * sets last failure time
+     * Sets last failure time
      *
-     * @param  string $service
-     * @param  int    $lastFailureTime
-     * @return void
      * @throws StorageException
      */
     public function setLastFailureTime(string $service, int $lastFailureTime): void
@@ -199,9 +166,8 @@ public function setLastFailureTime(string $service, int $lastFailureTime): void
     }
 
     /**
-     * returns last failure time
+     * Returns last failure time
      *
-     * @param  string $service
      * @return int | null
      * @throws StorageException
      */
@@ -211,11 +177,8 @@ public function getLastFailureTime(string $service)
     }
 
     /**
-     * sets status
+     * Sets status
      *
-     * @param  string $service
-     * @param  int    $status
-     * @return void
      * @throws StorageException
      */
     public function setStatus(string $service, int $status): void
@@ -224,10 +187,8 @@ public function setStatus(string $service, int $status): void
     }
 
     /**
-     * returns status
+     * Returns status
      *
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function getStatus(string $service): int
@@ -235,34 +196,21 @@ public function getStatus(string $service): int
         return $this->adapter->loadStatus($this->statusKey($service));
     }
 
-    /**
-     * @return void
-     */
     public function reset(): void
     {
         $this->adapter->reset();
     }
 
-    /**
-     * @return bool
-     */
     public function supportTumblingTimeWindow(): bool
     {
         return $this->adapter instanceof TumblingTimeWindowInterface;
     }
 
-    /**
-     * @return bool
-     */
     public function supportSlidingTimeWindow(): bool
     {
         return $this->adapter instanceof SlidingTimeWindowInterface;
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function key(string $service): string
     {
         if ($this->serviceNameDecorator) {
@@ -272,46 +220,26 @@ private function key(string $service): string
         return $this->prefix($service);
     }
 
-    /**
-     * @param  string $key
-     * @return string
-     */
     private function prefix(string $key): string
     {
         return $this->storageKeys->prefix() . $key;
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function successKey(string $service): string
     {
         return $this->key($service) . $this->storageKeys->success();
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function failureKey(string $service): string
     {
         return $this->key($service) . $this->storageKeys->failure();
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function rejectionKey(string $service): string
     {
         return $this->key($service) . $this->storageKeys->rejection();
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function lastFailureKey(string $service): string
     {
         return $this->supportSlidingTimeWindow()
@@ -322,10 +250,6 @@ private function lastFailureKey(string $service): string
             : $this->prefix($service) . $this->storageKeys->lastFailureTime();
     }
 
-    /**
-     * @param  string $service
-     * @return string
-     */
     private function statusKey(string $service): string
     {
         return $this->prefix($service) . $this->storageKeys->status();
diff --git a/src/Ganesha/Storage/Adapter/Apcu.php b/src/Ganesha/Storage/Adapter/Apcu.php
index 494a44b..edffe8d 100644
--- a/src/Ganesha/Storage/Adapter/Apcu.php
+++ b/src/Ganesha/Storage/Adapter/Apcu.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use Ackintosh\Ganesha;
@@ -25,7 +26,6 @@ public function __construct(ApcuStore $apcuStore = null)
 
     /**
      * Returns returns whether the adapter supports counting strategy
-     * @return bool
      */
     public function supportCountStrategy(): bool
     {
@@ -34,17 +34,12 @@ public function supportCountStrategy(): bool
 
     /**
      * Returns returns whether the adapter supports rating strategy
-     * @return bool
      */
     public function supportRateStrategy(): bool
     {
         return true;
     }
 
-    /**
-     * @param Ganesha\Context $context
-     * @return void
-     */
     public function setContext(Ganesha\Context $context): void
     {
         $this->storageKeys = $context->configuration()->storageKeys();
@@ -58,20 +53,11 @@ public function setConfiguration(Configuration $configuration): void
         // nop
     }
 
-    /**
-     * @param  string $key
-     * @return int
-     */
     public function load(string $key): int
     {
         return (int) $this->apcuStore->fetch($key);
     }
 
-    /**
-     * @param  string $key
-     * @param  int    $count
-     * @return void
-     */
     public function save(string $key, int $count): void
     {
         $result = $this->apcuStore->store($key, $count);
@@ -81,10 +67,6 @@ public function save(string $key, int $count): void
         }
     }
 
-    /**
-     * @param  string $key
-     * @return void
-     */
     public function increment(string $key): void
     {
         $this->apcuStore->inc($key, 1, $success);
@@ -95,12 +77,9 @@ public function increment(string $key): void
     }
 
     /**
-     * decrement failure count
+     * Decrement failure count
      *
      * If the operation would decrease the value below 0, the new value must be 0.
-     *
-     * @param  string $key
-     * @return void
      */
     public function decrement(string $key): void
     {
@@ -124,11 +103,7 @@ public function decrement(string $key): void
     }
 
     /**
-     * sets last failure time
-     *
-     * @param  string $key
-     * @param  int    $lastFailureTime
-     * @return void
+     * Sets last failure time
      */
     public function saveLastFailureTime(string $key, int $lastFailureTime): void
     {
@@ -140,10 +115,7 @@ public function saveLastFailureTime(string $key, int $lastFailureTime): void
     }
 
     /**
-     * returns last failure time
-     *
-     * @param  string $key
-     * @return int | null
+     * Returns last failure time
      */
     public function loadLastFailureTime(string $key): ?int
     {
@@ -151,11 +123,7 @@ public function loadLastFailureTime(string $key): ?int
     }
 
     /**
-     * sets status
-     *
-     * @param  string $key
-     * @param  int    $status
-     * @return void
+     * Sets status
      */
     public function saveStatus(string $key, int $status): void
     {
@@ -167,10 +135,7 @@ public function saveStatus(string $key, int $status): void
     }
 
     /**
-     * returns status
-     *
-     * @param  string $key
-     * @return int
+     * Returns status
      */
     public function loadStatus(string $key): int
     {
@@ -188,9 +153,7 @@ public function loadStatus(string $key): int
     }
 
     /**
-     * resets all counts
-     *
-     * @return void
+     * Resets all counts
      */
     public function reset(): void
     {
diff --git a/src/Ganesha/Storage/Adapter/ApcuStore.php b/src/Ganesha/Storage/Adapter/ApcuStore.php
index c4f565e..8d6a684 100644
--- a/src/Ganesha/Storage/Adapter/ApcuStore.php
+++ b/src/Ganesha/Storage/Adapter/ApcuStore.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use APCuIterator;
diff --git a/src/Ganesha/Storage/Adapter/Memcached.php b/src/Ganesha/Storage/Adapter/Memcached.php
index d638be1..e9ba170 100644
--- a/src/Ganesha/Storage/Adapter/Memcached.php
+++ b/src/Ganesha/Storage/Adapter/Memcached.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use Ackintosh\Ganesha;
@@ -20,10 +21,6 @@ class Memcached implements AdapterInterface, TumblingTimeWindowInterface
      */
     private $context;
 
-    /**
-     * Memcached constructor.
-     * @param \Memcached $memcached
-     */
     public function __construct(\Memcached $memcached)
     {
         // initial_value in (increment|decrement) requires \Memcached::OPT_BINARY_PROTOCOL
@@ -31,25 +28,17 @@ public function __construct(\Memcached $memcached)
         $this->memcached = $memcached;
     }
 
-    /**
-     * @return bool
-     */
     public function supportCountStrategy(): bool
     {
         return true;
     }
 
-    /**
-     * @return bool
-     */
     public function supportRateStrategy(): bool
     {
         return true;
     }
 
     /**
-     * @param Ganesha\Context $context
-     * @return void
      * @codeCoverageIgnore
      */
     public function setContext(Ganesha\Context $context): void
@@ -66,8 +55,6 @@ public function setConfiguration(Configuration $configuration): void
     }
 
     /**
-     * @param string $service
-     * @return int
      * @throws StorageException
      */
     public function load(string $service): int
@@ -78,9 +65,6 @@ public function load(string $service): int
     }
 
     /**
-     * @param string $service
-     * @param int $count
-     * @return void
      * @throws StorageException
      */
     public function save(string $service, int $count): void
@@ -91,8 +75,6 @@ public function save(string $service, int $count): void
     }
 
     /**
-     * @param string $service
-     * @return void
      * @throws StorageException
      */
     public function increment(string $service): void
@@ -110,8 +92,6 @@ public function increment(string $service): void
     }
 
     /**
-     * @param string $service
-     * @return void
      * @throws StorageException
      */
     public function decrement(string $service): void
@@ -123,8 +103,6 @@ public function decrement(string $service): void
     }
 
     /**
-     * @param string $service
-     * @param int    $lastFailureTime
      * @throws StorageException
      */
     public function saveLastFailureTime(string $service, int $lastFailureTime): void
@@ -135,8 +113,6 @@ public function saveLastFailureTime(string $service, int $lastFailureTime): void
     }
 
     /**
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function loadLastFailureTime(string $service): int
@@ -147,8 +123,6 @@ public function loadLastFailureTime(string $service): int
     }
 
     /**
-     * @param string $service
-     * @param int    $status
      * @throws StorageException
      */
     public function saveStatus(string $service, int $status): void
@@ -159,8 +133,6 @@ public function saveStatus(string $service, int $status): void
     }
 
     /**
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function loadStatus(string $service): int
@@ -225,7 +197,6 @@ public function isGaneshaData(string $key): bool
     /**
      * Throws an exception if some error occurs in memcached.
      *
-     * @return void
      * @throws StorageException
      */
     private function throwExceptionIfErrorOccurred(): void
diff --git a/src/Ganesha/Storage/Adapter/MongoDB.php b/src/Ganesha/Storage/Adapter/MongoDB.php
index 1d1217c..8c8564a 100644
--- a/src/Ganesha/Storage/Adapter/MongoDB.php
+++ b/src/Ganesha/Storage/Adapter/MongoDB.php
@@ -25,12 +25,6 @@ class MongoDB implements AdapterInterface, TumblingTimeWindowInterface, SlidingT
      */
     private $collectionName;
 
-    /**
-     * MongoDB constructor.
-     * @param \MongoDB\Driver\Manager $manager
-     * @param string $dbName
-     * @param string $collectionName
-     */
     public function __construct(\MongoDB\Driver\Manager $manager, string $dbName, string $collectionName)
     {
         $this->manager = $manager;
@@ -38,25 +32,17 @@ public function __construct(\MongoDB\Driver\Manager $manager, string $dbName, st
         $this->collectionName = $collectionName;
     }
 
-    /**
-     * @return bool
-     */
     public function supportCountStrategy(): bool
     {
         return true;
     }
 
-    /**
-     * @return bool
-     */
     public function supportRateStrategy(): bool
     {
         return true;
     }
 
     /**
-     * @param Ganesha\Context $context
-     * @return void
      * @codeCoverageIgnore
      */
     public function setContext(Ganesha\Context $context): void
@@ -73,8 +59,6 @@ public function setConfiguration(Configuration $configuration): void
     }
 
     /**
-     * @param string $service
-     * @return int
      * @throws StorageException
      */
     public function load(string $service): int
@@ -93,9 +77,6 @@ public function load(string $service): int
     }
 
     /**
-     * @param string $service
-     * @param int $count
-     * @return void
      * @throws StorageException
      */
     public function save(string $service, int $count): void
@@ -104,8 +85,6 @@ public function save(string $service, int $count): void
     }
 
     /**
-     * @param string $service
-     * @return void
      * @throws StorageException
      */
     public function increment(string $service): void
@@ -114,8 +93,6 @@ public function increment(string $service): void
     }
 
     /**
-     * @param string $service
-     * @return void
      * @throws StorageException
      */
     public function decrement(string $service): void
@@ -124,8 +101,6 @@ public function decrement(string $service): void
     }
 
     /**
-     * @param string $service
-     * @param int $lastFailureTime
      * @throws StorageException
      */
     public function saveLastFailureTime(string $service, int $lastFailureTime): void
@@ -134,8 +109,6 @@ public function saveLastFailureTime(string $service, int $lastFailureTime): void
     }
 
     /**
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function loadLastFailureTime(string $service): int
@@ -153,8 +126,6 @@ public function loadLastFailureTime(string $service): int
     }
 
     /**
-     * @param string $service
-     * @param int $status
      * @throws StorageException
      */
     public function saveStatus(string $service, int $status): void
@@ -163,8 +134,6 @@ public function saveStatus(string $service, int $status): void
     }
 
     /**
-     * @param  string $service
-     * @return int
      * @throws StorageException
      */
     public function loadStatus(string $service): int
@@ -193,11 +162,6 @@ private function getNamespace(): string
         return $this->dbName . '.' . $this->collectionName;
     }
 
-    /**
-     * @param $filter
-     * @param array $queryOptions
-     * @return \MongoDB\Driver\Cursor
-     */
     private function read(array $filter, array $queryOptions = []): Cursor
     {
         try {
@@ -210,31 +174,16 @@ private function read(array $filter, array $queryOptions = []): Cursor
         }
     }
 
-    /**
-     * @param $filter
-     * @param array $deleteOptions
-     * @return void
-     */
     private function delete(array $filter, array $deleteOptions = []): void
     {
         $this->bulkWrite($filter, $options = ['deleteOptions' => $deleteOptions], 'delete');
     }
 
-    /**
-     * @param $filter
-     * @param $newObj
-     * @param array $updateOptions
-     */
     private function update(array $filter, array $newObj, array $updateOptions = ['multi' => false, 'upsert' => true]): void
     {
         $this->bulkWrite($filter, $options = ['newObj' => $newObj, 'updateOptions' => $updateOptions], 'update');
     }
 
-    /**
-     * @param $filter
-     * @param array $options
-     * @param string $command
-     */
     private function bulkWrite(array $filter, array $options, string $command): void
     {
         try {
diff --git a/src/Ganesha/Storage/Adapter/Redis.php b/src/Ganesha/Storage/Adapter/Redis.php
index b91bde1..0bba62e 100644
--- a/src/Ganesha/Storage/Adapter/Redis.php
+++ b/src/Ganesha/Storage/Adapter/Redis.php
@@ -31,26 +31,16 @@ public function __construct($redis)
         $this->redis = $redis;
     }
 
-    /**
-     * @return bool
-     */
     public function supportCountStrategy(): bool
     {
         return false;
     }
 
-    /**
-     * @return bool
-     */
     public function supportRateStrategy(): bool
     {
         return true;
     }
 
-    /**
-     * @param Ganesha\Context $context
-     * @return void
-     */
     public function setContext(Ganesha\Context $context): void
     {
         $this->configuration = $context->configuration();
@@ -65,9 +55,6 @@ public function setConfiguration(Configuration $configuration): void
     }
 
     /**
-     * @param string $service
-     *
-     * @return int
      * @throws StorageException
      */
     public function load(string $service): int
@@ -83,19 +70,12 @@ public function load(string $service): int
         return $r;
     }
 
-    /**
-     * @param  string $service
-     * @param  int    $count
-     * @return void
-     */
     public function save(string $service, int $count): void
     {
         // Redis adapter does not support Count strategy
     }
 
     /**
-     * @param string $service
-     *
      * @throws StorageException
      */
     public function increment(string $service): void
@@ -118,12 +98,9 @@ public function saveLastFailureTime(string $service, int $lastFailureTime): void
     }
 
     /**
-     * @param $service
-     *
-     * @return int|null
      * @throws StorageException
      */
-    public function loadLastFailureTime(string $service)
+    public function loadLastFailureTime(string $service): ?int
     {
         $lastFailure = $this->redis->zRange($service, -1, -1);
 
@@ -135,9 +112,6 @@ public function loadLastFailureTime(string $service)
     }
 
     /**
-     * @param string $service
-     * @param int    $status
-     *
      * @throws StorageException
      */
     public function saveStatus(string $service, int $status): void
@@ -154,9 +128,6 @@ public function saveStatus(string $service, int $status): void
     }
 
     /**
-     * @param string $service
-     *
-     * @return int
      * @throws StorageException
      */
     public function loadStatus(string $service): int
@@ -179,8 +150,6 @@ public function reset(): void
     }
 
     /**
-     * @param string $service
-     *
      * @throws StorageException
      */
     private function removeExpiredElements(string $service): void
diff --git a/src/Ganesha/Storage/Adapter/SlidingTimeWindowInterface.php b/src/Ganesha/Storage/Adapter/SlidingTimeWindowInterface.php
index 7ad5b8f..d15abad 100644
--- a/src/Ganesha/Storage/Adapter/SlidingTimeWindowInterface.php
+++ b/src/Ganesha/Storage/Adapter/SlidingTimeWindowInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 interface SlidingTimeWindowInterface
diff --git a/src/Ganesha/Storage/Adapter/TumblingTimeWindowInterface.php b/src/Ganesha/Storage/Adapter/TumblingTimeWindowInterface.php
index 367477a..7127fa1 100644
--- a/src/Ganesha/Storage/Adapter/TumblingTimeWindowInterface.php
+++ b/src/Ganesha/Storage/Adapter/TumblingTimeWindowInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 interface TumblingTimeWindowInterface
diff --git a/src/Ganesha/Storage/AdapterInterface.php b/src/Ganesha/Storage/AdapterInterface.php
index ec54042..d6f503b 100644
--- a/src/Ganesha/Storage/AdapterInterface.php
+++ b/src/Ganesha/Storage/AdapterInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage;
 
 use Ackintosh\Ganesha\Configuration;
@@ -8,96 +9,58 @@ interface AdapterInterface
 {
     /**
      * Returns returns whether the adapter supports counting strategy
-     * @return bool
      */
-    public function supportCountStrategy(): bool ;
+    public function supportCountStrategy(): bool;
 
     /**
      * Returns returns whether the adapter supports rating strategy
-     * @return bool
      */
-    public function supportRateStrategy(): bool ;
+    public function supportRateStrategy(): bool;
 
-    /**
-     * @param Context $context
-     * @return void
-     */
     public function setContext(Context $context): void;
 
     /**
      * @deprecated This method will be removed in the next major release. Please use `setContext` instead.
-     * @param Configuration $configuration
-     * @return void
      */
     public function setConfiguration(Configuration $configuration): void;
 
-    /**
-     * @param  string $service
-     * @return int
-     */
     public function load(string $service): int;
 
-    /**
-     * @param  string $service
-     * @param  int    $count
-     * @return void
-     */
     public function save(string $service, int $count): void;
 
-    /**
-     * @param  string $service
-     * @return void
-     */
     public function increment(string $service): void;
 
     /**
-     * decrement failure count
+     * Decrement failure count
      *
      * If the operation would decrease the value below 0, the new value must be 0.
-     *
-     * @param  string $service
-     * @return void
      */
     public function decrement(string $service): void;
 
     /**
-     * sets last failure time
-     *
-     * @param  string $service
-     * @param  int    $lastFailureTime
-     * @return void
+     * Sets last failure time
      */
     public function saveLastFailureTime(string $service, int $lastFailureTime): void;
 
     /**
-     * returns last failure time
+     * Returns last failure time
      *
-     * @param  string $service
      * @return int | null
      */
     public function loadLastFailureTime(string $service);
 
     /**
-     * sets status
-     *
-     * @param  string $service
-     * @param  int    $status
-     * @return void
+     * Sets status
      */
     public function saveStatus(string $service, int $status): void;
 
     /**
-     * returns status
-     *
-     * @param  string $service
-     * @return int
+     * Returns status
      */
     public function loadStatus(string $service): int;
 
     /**
-     * resets all counts
-     *
-     * @return void
+     * Resets all counts
      */
     public function reset(): void;
 }
diff --git a/src/Ganesha/Storage/StorageKeys.php b/src/Ganesha/Storage/StorageKeys.php
index 4cc3056..23dc9ac 100644
--- a/src/Ganesha/Storage/StorageKeys.php
+++ b/src/Ganesha/Storage/StorageKeys.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage;
 
 class StorageKeys implements StorageKeysInterface
@@ -33,49 +34,31 @@ class StorageKeys implements StorageKeysInterface
      */
     const KEY_SUFFIX_STATUS = '_status';
 
-    /**
-     * @return string
-     */
     public function prefix(): string
     {
         return self::KEY_PREFIX;
     }
 
-    /**
-     * @return string
-     */
     public function success(): string
     {
         return self::KEY_SUFFIX_SUCCESS;
     }
 
-    /**
-     * @return string
-     */
     public function failure(): string
     {
         return self::KEY_SUFFIX_FAILURE;
     }
 
-    /**
-     * @return string
-     */
     public function rejection(): string
     {
         return self::KEY_SUFFIX_REJECTION;
     }
 
-    /**
-     * @return string
-     */
     public function lastFailureTime(): string
     {
         return self::KEY_SUFFIX_LAST_FAILURE_TIME;
     }
 
-    /**
-     * @return string
-     */
     public function status(): string
     {
         return self::KEY_SUFFIX_STATUS;
diff --git a/src/Ganesha/Storage/StorageKeysInterface.php b/src/Ganesha/Storage/StorageKeysInterface.php
index d2aee6e..ea83804 100644
--- a/src/Ganesha/Storage/StorageKeysInterface.php
+++ b/src/Ganesha/Storage/StorageKeysInterface.php
@@ -1,35 +1,18 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage;
 
 interface StorageKeysInterface
 {
-    /**
-     * @return string
-     */
     public function prefix(): string;
 
-    /**
-     * @return string
-     */
     public function success(): string;
 
-    /**
-     * @return string
-     */
     public function failure(): string;
 
-    /**
-     * @return string
-     */
     public function rejection(): string;
 
-    /**
-     * @return string
-     */
     public function lastFailureTime(): string;
 
-    /**
-     * @return string
-     */
     public function status(): string;
 }
diff --git a/src/Ganesha/Strategy/Count.php b/src/Ganesha/Strategy/Count.php
index f69d73d..1f24ff1 100644
--- a/src/Ganesha/Strategy/Count.php
+++ b/src/Ganesha/Strategy/Count.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy;
 
 use Ackintosh\Ganesha;
@@ -19,21 +20,12 @@ class Count implements StrategyInterface
      */
     private $storage;
 
-    /**
-     * @param Configuration $configuration
-     * @param Storage $storage
-     */
     private function __construct(Configuration $configuration, Storage $storage)
     {
         $this->configuration = $configuration;
         $this->storage = $storage;
     }
 
-    /**
-     * @param Storage\AdapterInterface $adapter
-     * @param Configuration $configuration
-     * @return Count
-     */
     public static function create(Storage\AdapterInterface $adapter, Configuration $configuration): StrategyInterface
     {
         return new self(
@@ -46,10 +38,6 @@ public static function create(Storage\AdapterInterface $adapter, Configuration $
         );
     }
 
-    /**
-     * @param string $service
-     * @return int
-     */
     public function recordFailure(string $service): int
     {
         $this->storage->setLastFailureTime($service, time());
@@ -65,10 +53,6 @@ public function recordFailure(string $service): int
         return Ganesha::STATUS_CALMED_DOWN;
     }
 
-    /**
-     * @param string $service
-     * @return int
-     */
     public function recordSuccess(string $service): ?int
     {
         $this->storage->decrementFailureCount($service);
@@ -84,26 +68,17 @@ public function recordSuccess(string $service): ?int
         return null;
     }
 
-    /**
-     * @return void
-     */
     public function reset(): void
     {
         $this->storage->reset();
     }
 
-    /**
-     * @param string $service
-     * @return bool
-     */
     public function isAvailable(string $service): bool
     {
         return $this->isClosed($service) || $this->isHalfOpen($service);
     }
 
     /**
-     * @param string $service
-     * @return bool
      * @throws StorageException
      */
     private function isClosed(string $service): bool
@@ -112,8 +87,6 @@ private function isClosed(string $service): bool
     }
 
     /**
-     * @param string $service
-     * @return bool
      * @throws StorageException
      */
     private function isHalfOpen(string $service): bool
diff --git a/src/Ganesha/Strategy/Count/Builder.php b/src/Ganesha/Strategy/Count/Builder.php
index 7c62cfb..b26d869 100644
--- a/src/Ganesha/Strategy/Count/Builder.php
+++ b/src/Ganesha/Strategy/Count/Builder.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy\Count;
 
 use Ackintosh\Ganesha;
@@ -11,8 +12,7 @@ class Builder
 {
     use Ganesha\Traits\BuildGanesha;
 
-    /** @var array */
-    private $params;
+    private array $params = [];
 
     /** @var array */
     private static $requirements = [
@@ -28,9 +28,7 @@ class Builder
     private static $adapterRequirement = 'supportCountStrategy';
 
     /**
-     * @param AdapterInterface $adapter
      * @psalm-param (AdapterInterface&SlidingTimeWindowInterface)|(AdapterInterface&TumblingTimeWindowInterface) $adapter
-     * @return $this
      */
     public function adapter(AdapterInterface $adapter): self
     {
@@ -39,9 +37,7 @@ public function adapter(AdapterInterface $adapter): self
     }
 
     /**
-     * @param int $failureCountThreshold
      * @psalm-param int<1, max> $failureCountThreshold
-     * @return $this
      */
     public function failureCountThreshold(int $failureCountThreshold): self
     {
@@ -50,9 +46,7 @@ public function failureCountThreshold(int $failureCountThreshold): self
     }
 
     /**
-     * @param int $intervalToHalfOpen
      * @psalm-param int<1, max> $intervalToHalfOpen
-     * @return $this
      */
     public function intervalToHalfOpen(int $intervalToHalfOpen): self
     {
@@ -60,10 +54,6 @@ public function intervalToHalfOpen(int $intervalToHalfOpen): self
         return $this;
     }
 
-    /**
-     * @param Ganesha\Storage\StorageKeysInterface $storageKeys
-     * @return $this
-     */
     public function storageKeys(Ganesha\Storage\StorageKeysInterface $storageKeys): self
     {
         $this->params[Configuration::STORAGE_KEYS] = $storageKeys;
diff --git a/src/Ganesha/Strategy/Rate.php b/src/Ganesha/Strategy/Rate.php
index b66f96d..4093063 100644
--- a/src/Ganesha/Strategy/Rate.php
+++ b/src/Ganesha/Strategy/Rate.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy;
 
 use Ackintosh\Ganesha;
@@ -42,7 +43,6 @@ private function __construct(Configuration $configuration, Storage $storage)
     }
 
     /**
-     * @param array $params
      * @throws LogicException
      */
     public static function validate(array $params): void
@@ -58,11 +58,6 @@ public static function validate(array $params): void
         }
     }
 
-    /**
-     * @param Storage\AdapterInterface $adapter
-     * @param Configuration $configuration
-     * @return Rate
-     */
     public static function create(Storage\AdapterInterface $adapter, Configuration $configuration): StrategyInterface
     {
         $serviceNameDecorator = $adapter instanceof Storage\Adapter\TumblingTimeWindowInterface ? self::serviceNameDecorator($configuration->timeWindow()) : null;
@@ -77,10 +72,6 @@ public static function create(Storage\AdapterInterface $adapter, Configuration $
         );
     }
 
-    /**
-     * @param  string $service
-     * @return int
-     */
     public function recordFailure(string $service): int
     {
         $this->storage->setLastFailureTime($service, time());
@@ -96,10 +87,6 @@ public function recordFailure(string $service): int
         return Ganesha::STATUS_CALMED_DOWN;
     }
 
-    /**
-     * @param  string $service
-     * @return int
-     */
     public function recordSuccess(string $service): ?int
     {
         $this->storage->incrementSuccessCount($service);
@@ -115,18 +102,11 @@ public function recordSuccess(string $service): ?int
         return null;
     }
 
-    /**
-     * @return void
-     */
     public function reset(): void
     {
         $this->storage->reset();
     }
 
-    /**
-     * @param  string $service
-     * @return bool
-     */
     public function isAvailable(string $service): bool
     {
         if ($this->isClosed($service) || $this->isHalfOpen($service)) {
@@ -138,8 +118,6 @@ public function isAvailable(string $service): bool
     }
 
     /**
-     * @param  string $service
-     * @return bool
      * @throws StorageException
      * @throws \LogicException
      */
@@ -162,10 +140,6 @@ private function isClosed(string $service): bool
         }
     }
 
-    /**
-     * @param  string $service
-     * @return bool
-     */
     private function isClosedInCurrentTimeWindow(string $service): bool
     {
         $failure = $this->storage->getFailureCount($service);
@@ -182,10 +156,6 @@ private function isClosedInCurrentTimeWindow(string $service): bool
         return $this->isClosedInTimeWindow($failure, $success, $rejection);
     }
 
-    /**
-     * @param  string $service
-     * @return bool
-     */
     private function isClosedInPreviousTimeWindow(string $service): bool
     {
         $failure = $this->storage->getFailureCountByCustomKey(self::keyForPreviousTimeWindow($service, $this->configuration->timeWindow()));
@@ -202,12 +172,6 @@ private function isClosedInPreviousTimeWindow(string $service): bool
         return $this->isClosedInTimeWindow($failure, $success, $rejection);
     }
 
-    /**
-     * @param  int $failure
-     * @param  int $success
-     * @param  int $rejection
-     * @return bool
-     */
     private function isClosedInTimeWindow(int $failure, int $success, int $rejection): bool
     {
         if (($failure + $success + $rejection) < $this->configuration->minimumRequests()) {
@@ -222,8 +186,6 @@ private function isClosedInTimeWindow(int $failure, int $success, int $rejection
     }
 
     /**
-     * @param  string $service
-     * @return bool
      * @throws StorageException
      */
     private function isHalfOpen(string $service): bool
diff --git a/src/Ganesha/Strategy/Rate/Builder.php b/src/Ganesha/Strategy/Rate/Builder.php
index 754b5bc..0344223 100644
--- a/src/Ganesha/Strategy/Rate/Builder.php
+++ b/src/Ganesha/Strategy/Rate/Builder.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy\Rate;
 
 use Ackintosh\Ganesha\Configuration;
@@ -12,8 +13,7 @@ class Builder
 {
     use BuildGanesha;
 
-    /** @var array */
-    private $params;
+    private array $params = [];
 
     /**
      * @var array
@@ -33,9 +33,7 @@ class Builder
     private static $adapterRequirement = 'supportRateStrategy';
 
     /**
-     * @param AdapterInterface $adapter
      * @psalm-param (AdapterInterface&SlidingTimeWindowInterface)|(AdapterInterface&TumblingTimeWindowInterface) $adapter
-     * @return $this
      */
     public function adapter(AdapterInterface $adapter): self
     {
@@ -44,9 +42,7 @@ public function adapter(AdapterInterface $adapter): self
     }
 
     /**
-     * @param int $failureRateThreshold
      * @psalm-param int<1, 100> $failureRateThreshold
-     * @return $this
      */
     public function failureRateThreshold(int $failureRateThreshold): self
     {
@@ -55,9 +51,7 @@ public function failureRateThreshold(int $failureRateThreshold): self
     }
 
     /**
-     * @param int $intervalToHalfOpen
      * @psalm-param int<1, max> $intervalToHalfOpen
-     * @return $this
      */
     public function intervalToHalfOpen(int $intervalToHalfOpen): self
     {
@@ -65,10 +59,6 @@ public function intervalToHalfOpen(int $intervalToHalfOpen): self
         return $this;
     }
 
-    /**
-     * @param StorageKeysInterface $storageKeys
-     * @return $this
-     */
     public function storageKeys(StorageKeysInterface $storageKeys): self
     {
         $this->params[Configuration::STORAGE_KEYS] = $storageKeys;
@@ -76,9 +66,7 @@ public function storageKeys(StorageKeysInterface $storageKeys): self
     }
 
     /**
-     * @param int $minimumRequests
      * @psalm-param int<1, max> $minimumRequests
-     * @return $this
      */
     public function minimumRequests(int $minimumRequests): self
     {
@@ -87,9 +75,7 @@ public function minimumRequests(int $minimumRequests): self
     }
 
     /**
-     * @param int $timeWindow
      * @psalm-param int<1, max> $timeWindow
-     * @return $this
      */
     public function timeWindow(int $timeWindow): self
     {
diff --git a/src/Ganesha/StrategyInterface.php b/src/Ganesha/StrategyInterface.php
index 69b087f..3a555d1 100644
--- a/src/Ganesha/StrategyInterface.php
+++ b/src/Ganesha/StrategyInterface.php
@@ -1,37 +1,18 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Storage\AdapterInterface;
 
 interface StrategyInterface
 {
-    /**
-     * @param AdapterInterface $adapter
-     * @param Configuration $configuration
-     * @return mixed
-     */
     public static function create(AdapterInterface $adapter, Configuration $configuration): StrategyInterface;
 
-    /**
-     * @param string $service
-     * @return int
-     */
     public function recordSuccess(string $service): ?int;
 
-    /**
-     * @param string $service
-     * @return int
-     */
     public function recordFailure(string $service): int;
 
-    /**
-     * @param string $service
-     * @return bool
-     */
     public function isAvailable(string $service): bool;
 
-    /**
-     * @return void
-     */
     public function reset(): void;
 }
diff --git a/src/Ganesha/Traits/BuildGanesha.php b/src/Ganesha/Traits/BuildGanesha.php
index f95a317..e8e21fd 100644
--- a/src/Ganesha/Traits/BuildGanesha.php
+++ b/src/Ganesha/Traits/BuildGanesha.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Traits;
 
 use Ackintosh\Ganesha;
@@ -23,7 +24,6 @@ private function validate(): void
     }
 
     /**
-     * @return Ganesha
      * @throws \InvalidArgumentException
      */
     public function build(): Ganesha
diff --git a/tests/Ackintosh/Ganesha/BuilderTest.php b/tests/Ackintosh/Ganesha/BuilderTest.php
index 5b8e690..f17ada2 100644
--- a/tests/Ackintosh/Ganesha/BuilderTest.php
+++ b/tests/Ackintosh/Ganesha/BuilderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Ackintosh/Ganesha/ConfigurationTest.php b/tests/Ackintosh/Ganesha/ConfigurationTest.php
index 81d6b5f..32d27b2 100644
--- a/tests/Ackintosh/Ganesha/ConfigurationTest.php
+++ b/tests/Ackintosh/Ganesha/ConfigurationTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Storage\StorageKeys;
diff --git a/tests/Ackintosh/Ganesha/GuzzleMiddleware/ServiceNameExtractorTest.php b/tests/Ackintosh/Ganesha/GuzzleMiddleware/ServiceNameExtractorTest.php
index 2c0659f..76d34b0 100644
--- a/tests/Ackintosh/Ganesha/GuzzleMiddleware/ServiceNameExtractorTest.php
+++ b/tests/Ackintosh/Ganesha/GuzzleMiddleware/ServiceNameExtractorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\GuzzleMiddleware;
 
 use GuzzleHttp\Psr7\Request;
diff --git a/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php b/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php
index 5c372d5..d1b9993 100644
--- a/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php
+++ b/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha\Exception\RejectedException;
diff --git a/tests/Ackintosh/Ganesha/HttpClient/ServiceNameExtractorTest.php b/tests/Ackintosh/Ganesha/HttpClient/ServiceNameExtractorTest.php
index 64e0826..47d8578 100644
--- a/tests/Ackintosh/Ganesha/HttpClient/ServiceNameExtractorTest.php
+++ b/tests/Ackintosh/Ganesha/HttpClient/ServiceNameExtractorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\HttpClient;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuStoreTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuStoreTest.php
index 1a1bb06..996fafa 100644
--- a/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuStoreTest.php
+++ b/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuStoreTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use APCuIterator;
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php
index fe2b285..90aa695 100644
--- a/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php
+++ b/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use Ackintosh\Ganesha;
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php
index 987545b..232b9b1 100644
--- a/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php
+++ b/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use Ackintosh\Ganesha;
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/MongoDBTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/MongoDBTest.php
index 90f44f0..8ed9ee8 100644
--- a/tests/Ackintosh/Ganesha/Storage/Adapter/MongoDBTest.php
+++ b/tests/Ackintosh/Ganesha/Storage/Adapter/MongoDBTest.php
@@ -3,7 +3,6 @@
 namespace Ackintosh\Ganesha\Storage\Adapter;
 
 use Ackintosh\Ganesha;
-use Ackintosh\Ganesha\Configuration;
 use PHPUnit\Framework\TestCase;
 
 class MongoDBTest extends TestCase
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/PredisRedisClientInterfaceTestDouble.php b/tests/Ackintosh/Ganesha/Storage/Adapter/PredisRedisClientInterfaceTestDouble.php
index 97b4f21..0c0fc1c 100644
--- a/tests/Ackintosh/Ganesha/Storage/Adapter/PredisRedisClientInterfaceTestDouble.php
+++ b/tests/Ackintosh/Ganesha/Storage/Adapter/PredisRedisClientInterfaceTestDouble.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ackintosh\Ganesha\Storage\Adapter;
diff --git a/tests/Ackintosh/Ganesha/StorageTest.php b/tests/Ackintosh/Ganesha/StorageTest.php
index ba7207d..dc8b3de 100644
--- a/tests/Ackintosh/Ganesha/StorageTest.php
+++ b/tests/Ackintosh/Ganesha/StorageTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha;
 
 use Ackintosh\Ganesha;
diff --git a/tests/Ackintosh/Ganesha/Strategy/Count/BuilderTest.php b/tests/Ackintosh/Ganesha/Strategy/Count/BuilderTest.php
index 8506149..a6c4e2a 100644
--- a/tests/Ackintosh/Ganesha/Strategy/Count/BuilderTest.php
+++ b/tests/Ackintosh/Ganesha/Strategy/Count/BuilderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy\Count;
 
 use Ackintosh\Ganesha\Storage\StorageKeysInterface;
diff --git a/tests/Ackintosh/Ganesha/Strategy/Rate/BuilderTest.php b/tests/Ackintosh/Ganesha/Strategy/Rate/BuilderTest.php
index 44eda2d..e9e5810 100644
--- a/tests/Ackintosh/Ganesha/Strategy/Rate/BuilderTest.php
+++ b/tests/Ackintosh/Ganesha/Strategy/Rate/BuilderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy\Rate;
 
 use Ackintosh\Ganesha\Storage\StorageKeysInterface;
diff --git a/tests/Ackintosh/Ganesha/Strategy/RateTest.php b/tests/Ackintosh/Ganesha/Strategy/RateTest.php
index 6a7d7e3..15f0b68 100644
--- a/tests/Ackintosh/Ganesha/Strategy/RateTest.php
+++ b/tests/Ackintosh/Ganesha/Strategy/RateTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Strategy;
 
 use Ackintosh\Ganesha\Storage\AdapterInterface;
diff --git a/tests/Ackintosh/Ganesha/Traits/BuildGaneshaTest.php b/tests/Ackintosh/Ganesha/Traits/BuildGaneshaTest.php
index 1422f06..f5d65fe 100644
--- a/tests/Ackintosh/Ganesha/Traits/BuildGaneshaTest.php
+++ b/tests/Ackintosh/Ganesha/Traits/BuildGaneshaTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh\Ganesha\Traits;
 
 use Ackintosh\Ganesha\Builder;
diff --git a/tests/Ackintosh/GaneshaTest.php b/tests/Ackintosh/GaneshaTest.php
index 6eb5282..6ae5662 100644
--- a/tests/Ackintosh/GaneshaTest.php
+++ b/tests/Ackintosh/GaneshaTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Ackintosh;
 
 use Ackintosh\Ganesha\Builder;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 28dd999..e207b71 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once(dirname(__DIR__) . '/vendor/autoload.php');
 
 error_reporting(E_ALL);