Merge pull request #340 from laminas/renovate/major-laminas

Update dependency laminas/laminas-coding-standard to v3
laminas · Nov 25, 2024 · f25e67a · f25e67a
2 parents a76b725 + da9a243
commit f25e67a
Show file tree

Hide file tree

Showing 7 changed files with 168 additions and 191 deletions.
diff --git a/composer.json b/composer.json
@@ -44,13 +44,13 @@
         "webmozart/assert": "^1.9"
     },
     "require-dev": {
-        "laminas/laminas-cli": "^1.7",
-        "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-config-aggregator": "^1.13",
-        "laminas/laminas-serializer": "^3.0",
-        "phpunit/phpunit": "^9.5.27",
+        "laminas/laminas-cli": "^1.11",
+        "laminas/laminas-coding-standard": "~3.0.1",
+        "laminas/laminas-config-aggregator": "^1.17",
+        "laminas/laminas-serializer": "^3.1",
+        "phpunit/phpunit": "^9.6.21",
         "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^5.24"
+        "vimeo/psalm": "^5.26.1"
     },
     "conflict": {
         "laminas/laminas-serializer": "<3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
@@ -397,8 +397,6 @@ public function setObjectCacheMethods(array $objectCacheMethods): self
 
     /**
      * Get list of object methods for which to cache return values
-     *
-     * @return array
      */
     public function getObjectCacheMethods(): array
     {
@@ -455,8 +453,6 @@ public function setObjectNonCacheMethods(array $objectNonCacheMethods): self
 
     /**
      * Get list of object methods for which NOT to cache return values
-     *
-     * @return array
      */
     public function getObjectNonCacheMethods(): array
     {
@@ -505,8 +501,6 @@ public function getPublicDir(): null|string
     /**
      * Recursively apply strtolower on all values of an array, and return as a
      * list of unique values
-     *
-     * @return array
      */
     protected function recursiveStrtolower(array $array): array
     {
@@ -519,8 +513,6 @@ protected function recursiveStrtolower(array $array): array
      * Recursively casts values to lowercase, then determines if any are in a
      * list of methods not handled, raising an exception if so.
      *
-     * @param  array $methods
-     * @return array
      * @throws Exception\InvalidArgumentException
      */
     protected function normalizeObjectMethods(array $methods): array

diff --git a/src/Service/StorageAdapterFactoryInterface.php b/src/Service/StorageAdapterFactoryInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * @psalm-type InternalOptionalPriorityConfigurationType = array{priority?:int}
- * NOTE: have to re-declare this here until https://github.com/vimeo/psalm/issues/5148 is fixed.
  * @psalm-type InternalPluginArrayConfigurationType = array{name:non-empty-string,options?:array<string,mixed>}
  * @psalm-type PluginArrayConfigurationWithPriorityType =
  *              InternalPluginArrayConfigurationType&InternalOptionalPriorityConfigurationType

diff --git a/test/Pattern/AbstractCommonStoragePatternTest.php b/test/Pattern/AbstractCommonStoragePatternTest.php
@@ -17,7 +17,6 @@
  */
 abstract class AbstractCommonStoragePatternTest extends AbstractCommonPatternTest
 {
-    /** @var StorageInterface&MockObject */
     protected StorageInterface&MockObject $storage;
 
     /** @var TPattern */

diff --git a/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php b/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php
@@ -39,6 +39,7 @@
  * try/catch blocks and assert identity against the result of getPrevious().
  *
  * phpcs:disable Generic.Files.LineLength.TooLong
+ *
  * @psalm-import-type SupportedDataTypesArrayShape from Capabilities
  */
 final class SimpleCacheDecoratorTest extends TestCase

diff --git a/test/Psr/SimpleCache/TestAsset/TtlStorage.php b/test/Psr/SimpleCache/TestAsset/TtlStorage.php
@@ -16,7 +16,6 @@ class TtlStorage extends Adapter\AbstractAdapter
 {
     private array $data = [];
 
-    /** @var array */
     public array $ttl = [];
 
     protected function internalGetItem(string $normalizedKey, ?bool &$success = null, mixed &$casToken = null): mixed