Merge pull request #114 from laminas/renovate/lock-file-maintenance

Lock file maintenance, minor type inference improvements
laminas · Jan 4, 2024 · 0173841 · 0173841
2 parents 4b6df85 + 9c7c2a2
commit 0173841
Show file tree

Hide file tree

Showing 8 changed files with 214 additions and 219 deletions.
diff --git a/composer.json b/composer.json
@@ -38,18 +38,18 @@
         "laminas/laminas-stdlib": "^3.0"
     },
     "require-dev": {
-        "laminas/laminas-cache": "^3.11.0",
+        "laminas/laminas-cache": "^3.12.0",
         "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
-        "laminas/laminas-cache-storage-deprecated-factory": "^1.1",
+        "laminas/laminas-cache-storage-deprecated-factory": "^1.2",
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-config": "^3.9.0",
-        "laminas/laminas-eventmanager": "^3.12",
-        "laminas/laminas-filter": "^2.33",
-        "laminas/laminas-validator": "^2.41",
-        "laminas/laminas-view": "^2.32",
-        "phpunit/phpunit": "^10.4.2",
+        "laminas/laminas-eventmanager": "^3.13",
+        "laminas/laminas-filter": "^2.34",
+        "laminas/laminas-validator": "^2.46",
+        "laminas/laminas-view": "^2.33",
+        "phpunit/phpunit": "^10.5.5",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.15.0"
+        "vimeo/psalm": "^5.18.0"
     },
     "conflict": {
         "laminas/laminas-view": "<2.20.0",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
   <file src="src/Exception/ExtensionNotLoadedException.php">
     <UnusedClass>
       <code>ExtensionNotLoadedException</code>
@@ -19,40 +19,21 @@
     </MixedReturnStatement>
   </file>
   <file src="src/Filter/Alnum.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[! is_scalar($value) && ! is_array($value)]]></code>
-    </DocblockTypeContradiction>
     <MixedArgumentTypeCoercion>
       <code>$value</code>
     </MixedArgumentTypeCoercion>
-    <MixedReturnStatement>
-      <code>$value</code>
-    </MixedReturnStatement>
-    <MoreSpecificImplementedParamType>
-      <code>$value</code>
-    </MoreSpecificImplementedParamType>
     <PossiblyInvalidArgument>
       <code>$allowWhiteSpaceOrOptions</code>
       <code>$allowWhiteSpaceOrOptions</code>
     </PossiblyInvalidArgument>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
-      <code>(string) $value</code>
     </RedundantCastGivenDocblockType>
   </file>
   <file src="src/Filter/Alpha.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[! is_scalar($value) && ! is_array($value)]]></code>
-    </DocblockTypeContradiction>
-    <MixedArgumentTypeCoercion>
-      <code>$value</code>
-    </MixedArgumentTypeCoercion>
-    <MixedReturnStatement>
-      <code>$value</code>
-    </MixedReturnStatement>
-    <MoreSpecificImplementedParamType>
+    <ArgumentTypeCoercion>
       <code>$value</code>
-    </MoreSpecificImplementedParamType>
+    </ArgumentTypeCoercion>
   </file>
   <file src="src/Filter/NumberParse.php">
     <RedundantCastGivenDocblockType>
@@ -333,10 +314,6 @@
     </UnnecessaryVarAnnotation>
   </file>
   <file src="src/Translator/TextDomain.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$textDomain->getArrayCopy()]]></code>
-      <code><![CDATA[$this->getArrayCopy()]]></code>
-    </MixedArgumentTypeCoercion>
     <PossiblyNullArgument>
       <code><![CDATA[$textDomain->getPluralRule()]]></code>
     </PossiblyNullArgument>
@@ -491,9 +468,6 @@
     </MixedAssignment>
   </file>
   <file src="src/Validator/Alnum.php">
-    <PossiblyInvalidArgument>
-      <code>$value</code>
-    </PossiblyInvalidArgument>
     <RedundantCastGivenDocblockType>
       <code>(bool) $allowWhiteSpace</code>
       <code>(bool) $allowWhiteSpace</code>
@@ -717,17 +691,11 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Filter/AlnumTest.php">
-    <MixedArgument>
-      <code>$input</code>
-    </MixedArgument>
     <PossiblyUnusedMethod>
       <code>returnUnfilteredDataProvider</code>
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Filter/AlphaTest.php">
-    <MixedArgument>
-      <code>$input</code>
-    </MixedArgument>
     <PossiblyUnusedMethod>
       <code>returnUnfilteredDataProvider</code>
     </PossiblyUnusedMethod>
@@ -741,8 +709,8 @@
   </file>
   <file src="test/Filter/NumberParseTest.php">
     <PossiblyUnusedMethod>
-      <code>formattedToNumberProvider</code>
       <code>formatNonNumberProvider</code>
+      <code>formattedToNumberProvider</code>
     </PossiblyUnusedMethod>
   </file>
   <file src="test/TestAsset/ModuleEventInterface.php">

diff --git a/src/Filter/Alnum.php b/src/Filter/Alnum.php
@@ -73,8 +73,8 @@ public function getAllowWhiteSpace()
      *
      * Returns $value as string with all non-alphanumeric characters removed
      *
-     * @param  string|array $value
-     * @return string|array
+     * @param mixed $value
+     * @return ($value is scalar|list<scalar> ? string|list<scalar> : mixed)
      */
     public function filter($value)
     {

diff --git a/src/Filter/Alpha.php b/src/Filter/Alpha.php
@@ -17,8 +17,8 @@ class Alpha extends Alnum
      *
      * Returns the string $value, removing all but alphabetic characters
      *
-     * @param  string|array $value
-     * @return string|array
+     * @param mixed $value
+     * @return ($value is scalar|list<scalar> ? string|list<scalar> : mixed)
      */
     public function filter($value)
     {

diff --git a/src/Translator/TextDomain.php b/src/Translator/TextDomain.php
@@ -11,7 +11,7 @@
 /**
  * Text domain.
  *
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @extends ArrayObject<TKey, TValue>
  */
@@ -90,7 +90,7 @@ public static function getDefaultPluralRule()
      *
      * @return $this
      * @throws Exception\RuntimeException
-     * @template TNewKey
+     * @template TNewKey of array-key
      * @template TNewValue
      * @param self<TNewKey, TNewValue> $textDomain
      * @psalm-self-out self<TKey|TNewKey, TValue|TNewValue>

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -16,10 +16,9 @@
 use Traversable;
 
 use function array_shift;
-use function gettype;
+use function get_debug_type;
 use function is_array;
 use function is_file;
-use function is_object;
 use function is_string;
 use function md5;
 use function rtrim;
@@ -125,7 +124,7 @@ public static function factory($options)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects an array or Traversable object; received "%s"',
                 __METHOD__,
-                is_object($options) ? $options::class : gettype($options)
+                get_debug_type($options),
             ));
         }
 

diff --git a/test/Validator/DateTimeTest.php b/test/Validator/DateTimeTest.php
@@ -18,6 +18,7 @@
 class DateTimeTest extends TestCase
 {
     private DateTimeValidator $validator;
+    /** @var non-empty-string */
     private string $timezone;
 
     protected function setUp(): void