Add templates to existing form test assets

Signed-off-by: George Steel <[email protected]>
laminas · Nov 23, 2023 · 4fb5884 · 4fb5884
1 parent 8a57ade
commit 4fb5884
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 8 deletions.
diff --git a/test/Integration/TestAsset/Form.php b/test/Integration/TestAsset/Form.php
@@ -7,6 +7,7 @@
 use Laminas\Form\Form as BaseForm;
 use Laminas\Form\FormElementManager;
 
+/** @extends BaseForm<array<string, mixed>> */
 final class Form extends BaseForm
 {
     /** @var null|FormElementManager */

diff --git a/test/TestAsset/Annotation/Form.php b/test/TestAsset/Annotation/Form.php
@@ -6,6 +6,7 @@
 
 use Laminas\Form\Form as BaseForm;
 
+/** @extends BaseForm<array<string, mixed>> */
 class Form extends BaseForm
 {
 }
diff --git a/test/TestAsset/CreateAddressForm.php b/test/TestAsset/CreateAddressForm.php
@@ -7,6 +7,21 @@
 use Laminas\Form\Form;
 use Laminas\Hydrator\ClassMethodsHydrator;
 
+/**
+ * @psalm-type Payload = array{
+ *     street: non-empty-string,
+ *     phones: list<array{id: mixed, number: non-empty-string}>,
+ *     city: array{
+ *         name: non-empty-string,
+ *         zipCode: non-empty-string,
+ *         country: array{
+ *             name: non-empty-string,
+ *             continent: non-empty-string,
+ *         },
+ *     },
+ * }
+ * @extends Form<Payload>
+ */
 class CreateAddressForm extends Form
 {
     public function __construct()
@@ -15,8 +30,7 @@ public function __construct()
 
         $this
             ->setAttribute('method', 'post')
-            ->setHydrator(new ClassMethodsHydrator(false))
-            ->setInputFilter(new InputFilter());
+            ->setHydrator(new ClassMethodsHydrator(false));
 
         $address = new AddressFieldset();
         $address->setUseAsBaseFieldset(true);

diff --git a/test/TestAsset/CustomCreatedForm.php b/test/TestAsset/CustomCreatedForm.php
@@ -7,6 +7,7 @@
 use DateTime;
 use Laminas\Form\Form;
 
+/** @extends Form<array<string, mixed>> */
 class CustomCreatedForm extends Form
 {
     public function __construct(private DateTime $created, ?string $name = null, array $options = [])

diff --git a/test/TestAsset/FileInputFilterProviderForm.php b/test/TestAsset/FileInputFilterProviderForm.php
@@ -6,6 +6,7 @@
 
 use Laminas\Form\Form;
 
+/** @extends Form<array<string, mixed>> */
 class FileInputFilterProviderForm extends Form
 {
     /**

diff --git a/test/TestAsset/FormCollection.php b/test/TestAsset/FormCollection.php
@@ -8,12 +8,12 @@
 use Laminas\Form\Element\Color as ColorElement;
 use Laminas\Form\Form;
 
+/** @extends Form<array<string, mixed>> */
 class FormCollection extends Form
 {
     public function __construct()
     {
         parent::__construct('collection');
-        $this->setInputFilter(new InputFilter());
 
         $element = new ColorElement('color');
         $this->add([

diff --git a/test/TestAsset/InputFilterProvider.php b/test/TestAsset/InputFilterProvider.php
@@ -7,6 +7,7 @@
 use Laminas\Form\Form;
 use Laminas\InputFilter\InputFilterProviderInterface;
 
+/** @extends Form<array{foo: non-empty-string}> */
 class InputFilterProvider extends Form implements InputFilterProviderInterface
 {
     /**

diff --git a/test/TestAsset/InputFilterProviderWithFieldset.php b/test/TestAsset/InputFilterProviderWithFieldset.php
@@ -7,6 +7,7 @@
 use Laminas\Form\Form;
 use Laminas\InputFilter\InputFilterProviderInterface;
 
+/** @extends Form<array{foo: non-empty-string}> */
 class InputFilterProviderWithFieldset extends Form implements InputFilterProviderInterface
 {
     /**

diff --git a/test/TestAsset/InvokableForm.php b/test/TestAsset/InvokableForm.php
@@ -6,6 +6,7 @@
 
 use Laminas\Form\Form;
 
+/** @extends Form<array<string, mixed>> */
 final class InvokableForm extends Form
 {
 }
diff --git a/test/TestAsset/NestedCollectionsForm.php b/test/TestAsset/NestedCollectionsForm.php
@@ -9,6 +9,7 @@
 use Laminas\Form\Fieldset;
 use Laminas\Form\Form;
 
+/** @extends Form<array<string, mixed>> */
 class NestedCollectionsForm extends Form
 {
     public function __construct()

diff --git a/test/TestAsset/NewProductForm.php b/test/TestAsset/NewProductForm.php
@@ -7,6 +7,7 @@
 use Laminas\Form\Form;
 use Laminas\Hydrator\ClassMethodsHydrator;
 
+/** @extends Form<array<string, mixed>> */
 class NewProductForm extends Form
 {
     public function __construct()
@@ -15,8 +16,7 @@ public function __construct()
 
         $this
             ->setAttribute('method', 'post')
-            ->setHydrator(new ClassMethodsHydrator())
-            ->setInputFilter(new InputFilter());
+            ->setHydrator(new ClassMethodsHydrator());
 
         $fieldset = new ProductFieldset();
         $fieldset->setUseAsBaseFieldset(true);

diff --git a/test/TestAsset/OrphansForm.php b/test/TestAsset/OrphansForm.php
@@ -6,17 +6,16 @@
 
 use Laminas\Form\Element\Collection;
 use Laminas\Form\Form;
-use LaminasTest\Form\TestAsset\OrphansFieldset;
 
+/** @extends Form<array<string, mixed>> */
 class OrphansForm extends Form
 {
     public function __construct()
     {
         parent::__construct('orphans');
 
         $this->setAttribute('method', 'post')
-            ->setBindOnValidate(self::BIND_ON_VALIDATE)
-            ->setInputFilter(new InputFilter());
+            ->setBindOnValidate(self::BIND_ON_VALIDATE);
 
         //adds a collection of 2
         $this->add(
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     use Laminas\Form\Form;
+    /** @extends Form<array<string, mixed>> */
     class FileInputFilterProviderForm extends Form
     {
         /**
@@ Expand Down @@