Merge branch 'master' into fork/marmichalski/rejected-ex-srv

ackintosh · Feb 8, 2025 · 918ff78 · 918ff78
2 parents e297a35 + 86ceb61
commit 918ff78
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -40,10 +40,6 @@ jobs:
         composer-opts:
           - ""
           - --prefer-lowest --prefer-stable
-    # We have a dependency issue under the specific condition involving PHP 8.4 and  `--prefer-lowest --prefer-stable`,
-    # so we will allow failure for the condition temporarily.
-    # Dropping the support for EOLed PHP version might resolve this.
-    continue-on-error: ${{ matrix.php-version == '8.4' && matrix.composer-opts == '--prefer-lowest --prefer-stable' }}
     steps:
       - uses: actions/checkout@v4
 

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5.10",
-    "symfony/http-client": "^5.3|^6.0",
+    "symfony/http-client": "^5.3.12|^6.0",
     "symfony/yaml": "^3.0|^4.0|^5.0|^6.0",
     "php-vcr/php-vcr": "^1.4.5",
     "php-vcr/phpunit-testlistener-vcr": "dev-php8 as 3.2.2",

diff --git a/src/Ganesha/GaneshaHttpClient.php b/src/Ganesha/GaneshaHttpClient.php
@@ -75,7 +75,7 @@ public function request(string $method, string $url, array $options = []): Respo
     /**
      * {@inheritdoc}
      */
-    public function stream($responses, float $timeout = null): ResponseStreamInterface
+    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
     {
         return $this->client->stream($responses, $timeout);
     }

diff --git a/src/Ganesha/GuzzleMiddleware.php b/src/Ganesha/GuzzleMiddleware.php
@@ -43,8 +43,8 @@ class GuzzleMiddleware
 
     public function __construct(
         Ganesha $ganesha,
-        ServiceNameExtractorInterface $serviceNameExtractor = null,
-        FailureDetectorInterface $failureDetector = null
+        ?ServiceNameExtractorInterface $serviceNameExtractor = null,
+        ?FailureDetectorInterface $failureDetector = null
     ) {
         $this->ganesha = $ganesha;
         $this->serviceNameExtractor = $serviceNameExtractor ?: new ServiceNameExtractor();

diff --git a/src/Ganesha/Storage.php b/src/Ganesha/Storage.php
@@ -28,7 +28,7 @@ class Storage
     public function __construct(
         AdapterInterface $adapter,
         StorageKeysInterface $storageKeys,
-        callable $serviceNameDecorator = null
+        ?callable $serviceNameDecorator = null
     ) {
         $this->adapter = $adapter;
         $this->serviceNameDecorator = $serviceNameDecorator;

diff --git a/src/Ganesha/Storage/Adapter/Apcu.php b/src/Ganesha/Storage/Adapter/Apcu.php
@@ -19,21 +19,21 @@ class Apcu implements AdapterInterface, TumblingTimeWindowInterface
     /**
      * @param ApcuStore|null $apcuStore Backing store for testing (optional)
      */
-    public function __construct(ApcuStore $apcuStore = null)
+    public function __construct(?ApcuStore $apcuStore = null)
     {
         $this->apcuStore = $apcuStore ?? new ApcuStore();
     }
 
     /**
-     * Returns returns whether the adapter supports counting strategy
+     * Returns whether the adapter supports counting strategy
      */
     public function supportCountStrategy(): bool
     {
         return true;
     }
 
     /**
-     * Returns returns whether the adapter supports rating strategy
+     * Returns whether the adapter supports rating strategy
      */
     public function supportRateStrategy(): bool
     {

diff --git a/src/Ganesha/Storage/AdapterInterface.php b/src/Ganesha/Storage/AdapterInterface.php
@@ -8,12 +8,12 @@
 interface AdapterInterface
 {
     /**
-     * Returns returns whether the adapter supports counting strategy
+     * Returns whether the adapter supports counting strategy
      */
     public function supportCountStrategy(): bool;
 
     /**
-     * Returns returns whether the adapter supports rating strategy
+     * Returns whether the adapter supports rating strategy
      */
     public function supportRateStrategy(): bool;
 

diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/ApcuTest.php
@@ -667,8 +667,8 @@ public function test_keyRegex(string $key, int $expectMatchResult)
     }
 
     private function getApcu(
-        ApcuStore $apcStore = null,
-        StorageKeysInterface $storageKeys = null
+        ?ApcuStore $apcStore = null,
+        ?StorageKeysInterface $storageKeys = null
     ): Apcu {
         $apc = new Apcu($apcStore);
         $context = new Ganesha\Context(
@@ -680,7 +680,7 @@ private function getApcu(
         return $apc;
     }
 
-    private function getConfiguration(StorageKeysInterface $storageKeys = null)
+    private function getConfiguration(?StorageKeysInterface $storageKeys = null)
     {
         $configuration = $this->createMock(Configuration::class);
         $configuration->method('storageKeys')