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

Lock file maintenance
laminas · Jan 9, 2024 · c394b92 · c394b92
2 parents cc75e66 + 14f31fd
commit c394b92
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 200 deletions.
diff --git a/composer.json b/composer.json
@@ -36,17 +36,17 @@
  "laminas/laminas-stdlib": "^3.6"
  },
  "require-dev": {
- "laminas/laminas-cache": "^2.13.2 || ^3.11",
- "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.2",
+ "laminas/laminas-cache": "^2.13.2 || ^3.12",
+ "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.3",
  "laminas/laminas-coding-standard": "~2.5.0",
  "laminas/laminas-db": "^2.18",
- "laminas/laminas-http": "^2.18",
- "laminas/laminas-servicemanager": "^3.21.0",
- "laminas/laminas-validator": "^2.38",
- "phpunit/phpunit": "^10.3.1",
+ "laminas/laminas-http": "^2.19",
+ "laminas/laminas-servicemanager": "^3.22.1",
+ "laminas/laminas-validator": "^2.46",
+ "phpunit/phpunit": "^10.5.5",
  "psalm/plugin-phpunit": "^0.18.4",
  "psr/http-message": "^2.0",
- "vimeo/psalm": "^5.14.1"
+ "vimeo/psalm": "^5.18.0"
  },
  "conflict": {
  "laminas/laminas-servicemanager": "<3.3",

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.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
  <file src="src/PubSubHubbub/AbstractCallback.php">
  <DocblockTypeContradiction>
  <code><![CDATA[$this->httpResponse === null]]></code>
@@ -71,7 +71,6 @@
  <code>string|null</code>
  </MixedInferredReturnType>
  <MixedOperand>
- <code>$code</code>
  <code><![CDATA[$header['name']]]></code>
  <code><![CDATA[$header['name']]]></code>
  <code><![CDATA[$header['value']]]></code>
@@ -121,8 +120,6 @@
  </MixedMethodCall>
  <MixedOperand>
  <code><![CDATA[$data['lease_seconds']]]></code>
- <code>$key</code>
- <code>$key</code>
  </MixedOperand>
  <MixedReturnStatement>
  <code><![CDATA[$result->current()->getArrayCopy()]]></code>
@@ -185,8 +182,6 @@
  <code>$value</code>
  </MixedAssignment>
  <MixedOperand>
- <code>$name</code>
- <code>$name</code>
  <code><![CDATA[$response->getContent()]]></code>
  </MixedOperand>
  <PossiblyUnusedMethod>
@@ -268,8 +263,6 @@
  </MixedAssignment>
  <MixedOperand>
  <code>$keyduplicate</code>
- <code>$name</code>
- <code>$name</code>
  <code><![CDATA[$params['hub.lease_seconds']]]></code>
  <code><![CDATA[$params['hub.topic']]]></code>
  <code>$value</code>
@@ -2252,9 +2245,6 @@
  <code>! is_numeric($statusCode)</code>
  <code>is_string($statusCode)</code>
  </DocblockTypeContradiction>
- <MixedArgument>
- <code>$statusCode</code>
- </MixedArgument>
  <MixedArgumentTypeCoercion>
  <code>$name</code>
  </MixedArgumentTypeCoercion>
@@ -2269,6 +2259,9 @@
  <code><![CDATA[$this->headers[$normalizedName] ?? $default]]></code>
  <code><![CDATA[$this->headers[$normalizedName] ?? $default]]></code>
  </MixedReturnStatement>
+ <NoValue>
+ <code>$statusCode</code>
+ </NoValue>
  <NullableReturnStatement>
  <code><![CDATA[$this->headers[$normalizedName] ?? $default]]></code>
  </NullableReturnStatement>
@@ -2278,6 +2271,9 @@
  <RedundantCastGivenDocblockType>
  <code>(int) $statusCode</code>
  </RedundantCastGivenDocblockType>
+ <RedundantCondition>
+ <code><![CDATA[is_string($statusCode) && trim($statusCode) !== $statusCode]]></code>
+ </RedundantCondition>
  </file>
  <file src="src/Reader/Reader.php">
  <DeprecatedInterface>
@@ -2354,9 +2350,6 @@
  <LessSpecificReturnStatement>
  <code>new $class()</code>
  </LessSpecificReturnStatement>
- <MixedArgument>
- <code>$class</code>
- </MixedArgument>
  <MixedMethodCall>
  <code>new $class()</code>
  </MixedMethodCall>
@@ -2886,7 +2879,6 @@
  <code>is_bool($status)</code>
  <code>is_float($number)</code>
  <code>is_float($number)</code>
- <code>is_object($type)</code>
  </DocblockTypeContradiction>
  <MixedArgument>
  <code>$value</code>
@@ -2923,9 +2915,6 @@
  <code>(int) $number</code>
  <code>(int) $number</code>
  </RedundantCastGivenDocblockType>
- <RedundantConditionGivenDocblockType>
- <code>var_export($type, true)</code>
- </RedundantConditionGivenDocblockType>
  <TypeDoesNotContainType>
  <code><![CDATA['no']]></code>
  </TypeDoesNotContainType>
@@ -2935,7 +2924,6 @@
  <code>! is_bool($value)</code>
  <code>! is_string($value)</code>
  <code>is_bool($status)</code>
- <code>is_object($type)</code>
  </DocblockTypeContradiction>
  <MixedArgument>
  <code>$val</code>
@@ -2986,9 +2974,6 @@
  <RedundantCastGivenDocblockType>
  <code>(string) $value</code>
  </RedundantCastGivenDocblockType>
- <RedundantConditionGivenDocblockType>
- <code>var_export($type, true)</code>
- </RedundantConditionGivenDocblockType>
  <TypeDoesNotContainType>
  <code><![CDATA['no']]></code>
  </TypeDoesNotContainType>
@@ -3884,9 +3869,6 @@
  <DeprecatedInterface>
  <code>StandaloneExtensionManager</code>
  </DeprecatedInterface>
- <MixedArgument>
- <code>$class</code>
- </MixedArgument>
  <MixedMethodCall>
  <code>new $class()</code>
  </MixedMethodCall>

diff --git a/src/Reader/Collection.php b/src/Reader/Collection.php
@@ -11,7 +11,7 @@
  * \Laminas\Feed\Reader\Collection\Author and \Laminas\Feed\Reader\Collection\Category
  * or the generic class \Laminas\Feed\Reader\Collection\Collection instead.
  *
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @template-extends ArrayObject<TKey, TValue>
  */

diff --git a/src/Reader/Collection/AbstractCollection.php b/src/Reader/Collection/AbstractCollection.php
@@ -7,7 +7,7 @@
 use ArrayObject;
 
 /**
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @template-extends ArrayObject<TKey, TValue>
  */

diff --git a/src/Reader/Collection/Collection.php b/src/Reader/Collection/Collection.php
@@ -7,7 +7,7 @@
 use ArrayObject;
 
 /**
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @template-extends ArrayObject<TKey, TValue>
  */

diff --git a/src/Reader/Http/Response.php b/src/Reader/Http/Response.php
@@ -6,7 +6,7 @@
 
 use Laminas\Feed\Reader\Exception;
 
-use function gettype;
+use function get_debug_type;
 use function intval;
 use function is_numeric;
 use function is_object;
@@ -79,7 +79,7 @@ private function validateStatusCode($statusCode)
  throw new Exception\InvalidArgumentException(sprintf(
  '%s expects a numeric status code; received %s',
  self::class,
- is_object($statusCode) ? $statusCode::class : gettype($statusCode)
+ get_debug_type($statusCode),
  ));
  }
 
@@ -121,7 +121,7 @@ private function validateBody($body)
  throw new Exception\InvalidArgumentException(sprintf(
  '%s expects a string body, or an object that can cast to string; received %s',
  self::class,
- is_object($body) ? $body::class : gettype($body)
+ get_debug_type($body),
  ));
  }
 
@@ -146,7 +146,7 @@ private function validateHeaders(array $headers)
  throw new Exception\InvalidArgumentException(sprintf(
  'Individual header values provided to %s must be a string or numeric; received %s for header %s',
  self::class,
- is_object($value) ? $value::class : gettype($value),
+ get_debug_type($value),
  $name
  ));
  }

diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
@@ -13,13 +13,12 @@
 use function count;
 use function ctype_alpha;
 use function ctype_digit;
-use function gettype;
+use function get_debug_type;
 use function implode;
 use function in_array;
 use function is_bool;
 use function is_float;
 use function is_numeric;
-use function is_object;
 use function is_string;
 use function lcfirst;
 use function method_exists;
@@ -29,7 +28,6 @@
 use function substr;
 use function trigger_error;
 use function ucfirst;
-use function var_export;
 
 use const E_USER_DEPRECATED;
 
@@ -325,7 +323,7 @@ public function setItunesEpisode($number)
  if (! is_numeric($number) || is_float($number)) {
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "number" may only be an integer; received %s',
- is_object($number) ? $number::class : gettype($number)
+ get_debug_type($number),
  ));
  }
 
@@ -348,7 +346,7 @@ public function setItunesEpisodeType($type)
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "episodeType" MUST be one of the strings [%s]; received %s',
  implode(', ', $validTypes),
- is_object($type) ? $type::class : var_export($type, true)
+ get_debug_type($type),
  ));
  }
 
@@ -369,7 +367,7 @@ public function setItunesIsClosedCaptioned($status)
  if (! is_bool($status)) {
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "isClosedCaptioned" MUST be a boolean; received %s',
- is_object($status) ? $status::class : var_export($status, true)
+ get_debug_type($status),
  ));
  }
 
@@ -394,7 +392,7 @@ public function setItunesSeason($number)
  if (! is_numeric($number) || is_float($number)) {
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "season" may only be an integer; received %s',
- is_object($number) ? $number::class : gettype($number)
+ get_debug_type($number),
  ));
  }
 

diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php
@@ -13,11 +13,11 @@
 use function count;
 use function ctype_alpha;
 use function ctype_digit;
+use function get_debug_type;
 use function implode;
 use function in_array;
 use function is_array;
 use function is_bool;
-use function is_object;
 use function is_string;
 use function lcfirst;
 use function method_exists;
@@ -27,7 +27,6 @@
 use function substr;
 use function trigger_error;
 use function ucfirst;
-use function var_export;
 
 use const E_USER_DEPRECATED;
 
@@ -404,7 +403,7 @@ public function setItunesType($type)
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "type" MUST be one of [%s]; received %s',
  implode(', ', $validTypes),
- is_object($type) ? $type::class : var_export($type, true)
+ get_debug_type($type),
  ));
  }
  $this->data['type'] = $type;
@@ -423,7 +422,7 @@ public function setItunesComplete($status)
  if (! is_bool($status)) {
  throw new Writer\Exception\InvalidArgumentException(sprintf(
  'invalid parameter: "complete" MUST be boolean; received %s',
- is_object($status) ? $status::class : var_export($status, true)
+ get_debug_type($status),
  ));
  }
 

diff --git a/src/Writer/FeedFactory.php b/src/Writer/FeedFactory.php
@@ -7,9 +7,8 @@
 use Traversable;
 
 use function array_key_exists;
-use function gettype;
+use function get_debug_type;
 use function is_array;
-use function is_object;
 use function method_exists;
 use function sprintf;
 use function str_replace;
@@ -31,7 +30,7 @@ public static function factory($data)
  throw new Exception\InvalidArgumentException(sprintf(
  '%s expects an array or Traversable argument; received "%s"',
  __METHOD__,
- is_object($data) ? $data::class : gettype($data)
+ get_debug_type($data),
  ));
  }
 
@@ -96,7 +95,7 @@ protected static function createEntries($entries, Feed $feed)
  throw new Exception\InvalidArgumentException(sprintf(
  '%s::factory expects the "entries" value to be an array or Traversable; received "%s"',
  static::class,
- is_object($entries) ? $entries::class : gettype($entries)
+ get_debug_type($entries),
  ));
  }
 
@@ -105,7 +104,7 @@ protected static function createEntries($entries, Feed $feed)
  throw new Exception\InvalidArgumentException(sprintf(
  '%s expects an array, Traversable, or Laminas\Feed\Writer\Entry argument; received "%s"',
  __METHOD__,
- is_object($data) ? $data::class : gettype($data)
+ get_debug_type($data),
  ));
  }