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

Lock file maintenance
laminas · Nov 28, 2023 · 5eadce0 · 5eadce0
2 parents bc4828e + 5026cc0
commit 5eadce0
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 57 deletions.
diff --git a/composer.json b/composer.json
@@ -30,17 +30,17 @@
         "laminas/laminas-escaper": "^2.13",
         "laminas/laminas-eventmanager": "^3.12",
         "laminas/laminas-filter": "^2.33",
-        "laminas/laminas-i18n": "^2.24",
+        "laminas/laminas-i18n": "^2.24.1",
         "laminas/laminas-modulemanager": "^2.15.0",
-        "laminas/laminas-recaptcha": "^3.6",
+        "laminas/laminas-recaptcha": "^3.7",
         "laminas/laminas-servicemanager": "^3.22.1",
-        "laminas/laminas-session": "^2.16",
-        "laminas/laminas-text": "^2.10.0",
-        "laminas/laminas-validator": "^2.42",
+        "laminas/laminas-session": "^2.17",
+        "laminas/laminas-text": "^2.11.0",
+        "laminas/laminas-validator": "^2.43",
         "laminas/laminas-view": "^2.32",
         "phpunit/phpunit": "^10.4.2",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.15"
+        "vimeo/psalm": "^5.16"
     },
     "conflict": {
         "doctrine/annotations": "<1.14.0",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/Annotation/AbstractBuilder.php">
     <InvalidArrayOffset>
       <code><![CDATA[$params['elementSpec']['spec']['type']]]></code>
     </InvalidArrayOffset>
-    <RedundantConditionGivenDocblockType>
-      <code>is_string($entity)</code>
-    </RedundantConditionGivenDocblockType>
+    <NullArgument>
+      <code>$filterSpec</code>
+    </NullArgument>
   </file>
   <file src="src/Annotation/AttributeBuilder.php">
     <NullArgument>
@@ -93,9 +93,7 @@
   </file>
   <file src="src/Element/Collection.php">
     <DocblockTypeContradiction>
-      <code><![CDATA[$this->object instanceof Traversable]]></code>
       <code>is_array($object)</code>
-      <code><![CDATA[is_array($this->object)]]></code>
     </DocblockTypeContradiction>
     <ImplementedParamTypeMismatch>
       <code>$object</code>
@@ -119,13 +117,21 @@
       <code>bindValues</code>
     </TooManyArguments>
   </file>
+  <file src="src/Element/MultiCheckbox.php">
+    <NoValue>
+      <code>$value</code>
+    </NoValue>
+  </file>
   <file src="src/Element/Select.php">
     <MissingClosureParamType>
       <code>$value</code>
     </MissingClosureParamType>
     <MissingClosureReturnType>
       <code>static function ($value) use ($unselectedValue) {</code>
     </MissingClosureReturnType>
+    <NoValue>
+      <code>$value</code>
+    </NoValue>
   </file>
   <file src="src/ElementFactory.php">
     <InvalidStringClass>
@@ -187,9 +193,6 @@
       <code>$spec</code>
       <code>$validationGroup</code>
     </ArgumentTypeCoercion>
-    <InvalidArrayOffset>
-      <code>$values[$cKey]</code>
-    </InvalidArrayOffset>
     <LessSpecificReturnStatement>
       <code>$this</code>
       <code>$this</code>
@@ -365,9 +368,6 @@
     </PossiblyNullArgument>
   </file>
   <file src="test/Annotation/AbstractBuilderTestCase.php">
-    <DocblockTypeContradiction>
-      <code>assertNotNull</code>
-    </DocblockTypeContradiction>
     <PossiblyUndefinedMethod>
       <code>allowEmpty</code>
       <code>getFilterChain</code>

diff --git a/src/Annotation/AbstractBuilder.php b/src/Annotation/AbstractBuilder.php
@@ -106,17 +106,12 @@ public function getEventManager(): EventManagerInterface
      */
     public function getFormSpecification($entity): ArrayObject
     {
-        if (! is_object($entity)) {
-            if (
-                (is_string($entity) && (! class_exists($entity))) // non-existent class
-                || (! is_string($entity)) // not an object or string
-            ) {
-                throw new Exception\InvalidArgumentException(sprintf(
-                    '%s expects an object or valid class name; received %s',
-                    __METHOD__,
-                    var_export($entity, true)
-                ));
-            }
+        if (! is_object($entity) && ! is_string($entity) || (is_string($entity) && ! class_exists($entity))) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects an object or valid class name; received %s',
+                __METHOD__,
+                var_export($entity, true)
+            ));
         }
 
         $this->entity            = $entity;
@@ -138,7 +133,7 @@ public function getFormSpecification($entity): ArrayObject
      * second element is the input filter specification.
      *
      * @param class-string|object $entity
-     * @return array
+     * @return array{0: ArrayObject, 1: ArrayObject}
      */
     abstract protected function getFormSpecificationInternal($entity): array;
 

diff --git a/src/Annotation/AnnotationBuilder.php b/src/Annotation/AnnotationBuilder.php
@@ -20,7 +20,7 @@ final class AnnotationBuilder extends AbstractBuilder
      *
      * @param  object|class-string $entity
      * @throws ReflectionException
-     * @return array
+     * @return array{0: ArrayObject, 1: ArrayObject}
      */
     protected function getFormSpecificationInternal($entity): array
     {

diff --git a/src/Annotation/AttributeBuilder.php b/src/Annotation/AttributeBuilder.php
@@ -38,7 +38,7 @@ public function __construct()
      *
      * @param  object|class-string $entity
      * @throws ReflectionException
-     * @return array
+     * @return array{0: ArrayObject, 1: ArrayObject}
      */
     protected function getFormSpecificationInternal($entity): array
     {

diff --git a/src/Element/Collection.php b/src/Element/Collection.php
@@ -4,6 +4,7 @@
 
 namespace Laminas\Form\Element;
 
+use ArrayAccess;
 use Laminas\Form\ElementInterface;
 use Laminas\Form\Exception;
 use Laminas\Form\Fieldset;
@@ -32,7 +33,7 @@ class Collection extends Fieldset
      */
     public const DEFAULT_TEMPLATE_PLACEHOLDER = '__index__';
 
-    /** @var array */
+    /** @var array|ArrayAccess */
     protected $object;
 
     /**
@@ -603,8 +604,8 @@ protected function replaceTemplateObjects(): void
         }
 
         foreach ($fieldsets as $fieldset) {
-            $i = $fieldset->getName();
-            if (isset($this->object[$i])) {
+            $i = (string) $fieldset->getName();
+            if ($i !== '' && isset($this->object[$i])) {
                 $fieldset->setObject($this->object[$i]);
             }
         }

diff --git a/src/Fieldset.php b/src/Fieldset.php
@@ -415,7 +415,7 @@ public function setObject($object)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects an object argument; received "%s"',
                 __METHOD__,
-                $object
+                get_debug_type($object),
             ));
         }
 

diff --git a/test/Annotation/AbstractBuilderTestCase.php b/test/Annotation/AbstractBuilderTestCase.php
@@ -33,7 +33,6 @@
 use PHPUnit\Framework\TestCase;
 use Throwable;
 
-use function count;
 use function getenv;
 
 abstract class AbstractBuilderTestCase extends TestCase
@@ -282,7 +281,6 @@ public function testAllowsComposingMultipleChildEntitiesWithEntityBind(): void
         self::assertInstanceOf(InputFilterProviderFieldset::class, $target);
         $this->validateEntityFilterSpec($target->getInputFilterSpecification());
 
-        self::assertNull($entity->child);
         $form->bind($entity);
         $form->setData([
             'child' => [
@@ -291,8 +289,8 @@ public function testAllowsComposingMultipleChildEntitiesWithEntityBind(): void
             ],
         ]);
         self::assertTrue($form->isValid());
-        self::assertNotNull($entity->child);
-        self::assertEquals(2, count($entity->child));
+        self::assertIsArray($entity->child);
+        self::assertCount(2, $entity->child);
         self::assertInstanceOf(EntityObjectPropertyHydrator::class, $entity->child[0]);
         self::assertEquals('[email protected]', $entity->child[0]->password);
         self::assertEquals('user', $entity->child[0]->username);

diff --git a/test/Element/DateTest.php b/test/Element/DateTest.php
@@ -25,6 +25,8 @@ final class DateTest extends TestCase
 {
     /**
      * Stores the original set timezone
+     *
+     * @var non-empty-string
      */
     private string $originaltimezone;