Merge pull request #214 from laminas/2.30.x-merge-up-into-3.0.x_Ako44Mwc

Merge release 2.30.0 into 3.0.x
laminas · Aug 17, 2023 · 6f4a849 · 6f4a849
2 parents 320f867 + 877d77b
commit 6f4a849
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 55 deletions.
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.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.14.0@b2942cefed8443002bd3f245c4cd0a54193716d8">
   <file src="bin/templatemap_generator.php">
     <MissingParamType>
       <code>$templatePath</code>
@@ -158,9 +158,6 @@
       <code>$email</code>
       <code>$emailIsHashed</code>
     </MissingConstructor>
-    <MixedArgumentTypeCoercion>
-      <code>$key</code>
-    </MixedArgumentTypeCoercion>
     <MixedAssignment>
       <code>$value</code>
     </MixedAssignment>

diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php
@@ -52,7 +52,7 @@ class Gravatar extends AbstractHtmlElement
     /**
      * Attributes for HTML image tag
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $attributes;
 
@@ -73,7 +73,7 @@ class Gravatar extends AbstractHtmlElement
     /**
      * Options
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $options = [
         'img_size'    => 80,
@@ -94,9 +94,9 @@ class Gravatar extends AbstractHtmlElement
      * @see    http://pl.gravatar.com/site/implement/url
      * @see    http://pl.gravatar.com/site/implement/url More information about gravatar's service.
      *
-     * @param  string|null $email      Email address.
-     * @param  null|array  $options    Options
-     * @param  array       $attributes Attributes for image tag (title, alt etc.)
+     * @param  string|null $email Email address.
+     * @param  array<string, mixed> $options Options
+     * @param  array<string, mixed> $attributes Attributes for image tag (title, alt etc.)
      * @return Gravatar
      */
     public function __invoke($email = "", $options = [], $attributes = [])
@@ -127,7 +127,7 @@ public function __toString()
     /**
      * Configure state
      *
-     * @param  array $options
+     * @param  array<string, mixed> $options
      * @return Gravatar
      */
     public function setOptions(array $options)
@@ -186,7 +186,7 @@ public function getImgTag()
      * This attribute is overwritten in protected method setSrcAttribForImg().
      * This method(_setSrcAttribForImg) is called in public method getImgTag().
      *
-     * @param  array $attributes
+     * @param  array<string, mixed> $attributes
      * @return Gravatar
      */
     public function setAttributes(array $attributes)
@@ -203,7 +203,7 @@ public function setAttributes(array $attributes)
      * protected method setSrcAttribForImg(). And finally your get other src
      * value!
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getAttributes()
     {