-
-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #248 from gsteel/payload-shapes
Introduce Form Template to improve inference for processed payloads
- Loading branch information
Showing
34 changed files
with
224 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace LaminasTest\Form\StaticAnalysis\Asset; | ||
|
|
||
| use Laminas\Form\Element\Number; | ||
| use Laminas\Form\Element\Text; | ||
| use Laminas\Form\Form; | ||
|
|
||
| /** | ||
| * @psalm-import-type ValidPayload from ExampleInputFilter | ||
| * @extends Form<ValidPayload> | ||
| */ | ||
| final class ExampleForm extends Form | ||
| { | ||
| public function init(): void | ||
| { | ||
| $this->add([ | ||
| 'name' => 'string', | ||
| 'type' => Text::class, | ||
| ]); | ||
| $this->add([ | ||
| 'name' => 'number', | ||
| 'type' => Number::class, | ||
| ]); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace LaminasTest\Form\StaticAnalysis\Asset; | ||
|
|
||
| use Laminas\Filter\ToInt; | ||
| use Laminas\InputFilter\InputFilter; | ||
|
|
||
| /** | ||
| * @psalm-type ValidPayload = array{ | ||
| * string: non-empty-string, | ||
| * number: int, | ||
| * } | ||
| * @extends InputFilter<ValidPayload> | ||
| */ | ||
| final class ExampleInputFilter extends InputFilter | ||
| { | ||
| public function init(): void | ||
| { | ||
| $this->add([ | ||
| 'name' => 'string', | ||
| 'required' => true, | ||
| ]); | ||
|
|
||
| $this->add([ | ||
| 'name' => 'number', | ||
| 'required' => true, | ||
| 'filters' => [ | ||
| ['name' => ToInt::class], | ||
| ], | ||
| ]); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace LaminasTest\Form\StaticAnalysis; | ||
|
|
||
| use Laminas\Form\FormInterface; | ||
| use LaminasTest\Form\StaticAnalysis\Asset\ExampleForm; | ||
|
|
||
| use function assert; | ||
| use function is_array; | ||
|
|
||
| final class FormTemplates | ||
| { | ||
| /** @return non-empty-string */ | ||
| public function getSingleValueFromComposedInputFilter(): string | ||
| { | ||
| $form = new ExampleForm(); | ||
|
|
||
| return $form->getInputFilter()->getValues()['string']; | ||
| } | ||
|
|
||
| /** @return non-empty-string */ | ||
| public function getDataWithExplicitArray(): string | ||
| { | ||
| $form = new ExampleForm(); | ||
| $data = $form->getData(FormInterface::VALUES_AS_ARRAY); | ||
|
|
||
| return $data['string']; | ||
| } | ||
|
|
||
| /** @return non-empty-string */ | ||
| public function getDataWithValuesNormalized(): string | ||
| { | ||
| $form = new ExampleForm(); | ||
| $data = $form->getData(FormInterface::VALUES_NORMALIZED); | ||
| assert(is_array($data)); | ||
|
|
||
| return $data['string']; | ||
| } | ||
|
|
||
| /** @return non-empty-string */ | ||
| public function testThatFluidReturnTypesPreserveTemplatesForSetPreferFormInputFilter(): string | ||
| { | ||
| $form = new ExampleForm(); | ||
| return $form->setPreferFormInputFilter(true) | ||
| ->getData(FormInterface::VALUES_AS_ARRAY)['string']; | ||
| } | ||
|
|
||
| /** @return non-empty-string */ | ||
| public function testThatFluidReturnTypesPreserveTemplatesForSetWrapElements(): string | ||
| { | ||
| $form = new ExampleForm(); | ||
| return $form->setWrapElements(true) | ||
| ->getData(FormInterface::VALUES_AS_ARRAY)['string']; | ||
| } | ||
| } |
Oops, something went wrong.