Merge pull request #280 from fezfez/update-laminas-coding-standard

laminas/laminas-coding-standard:^3.0 + composer bump --dev-only

composer.json

@@ -23,24 +23,24 @@
     },
     "require-dev": {
         "ext-intl": "*",
-        "doctrine/annotations": "^1.14.3 || ^2.0.1",
+        "doctrine/annotations": "^1.14.3 || ^2.0.2",
         "laminas/laminas-captcha": "^2.17",
-        "laminas/laminas-coding-standard": "^2.5",
+        "laminas/laminas-coding-standard": "^3.0.1",
         "laminas/laminas-db": "^2.20",
-        "laminas/laminas-escaper": "^2.13",
+        "laminas/laminas-escaper": "^2.14",
         "laminas/laminas-eventmanager": "^3.13.1",
-        "laminas/laminas-filter": "^2.36",
-        "laminas/laminas-i18n": "^2.28.0",
+        "laminas/laminas-filter": "^2.39",
+        "laminas/laminas-i18n": "^2.29.0",
         "laminas/laminas-modulemanager": "^2.16.0",
-        "laminas/laminas-recaptcha": "^3.7",
-        "laminas/laminas-servicemanager": "^3.22.1",
+        "laminas/laminas-recaptcha": "^3.8",
+        "laminas/laminas-servicemanager": "^3.23.0",
         "laminas/laminas-session": "^2.21",
         "laminas/laminas-text": "^2.11.0",
         "laminas/laminas-validator": "^2.64.1",
         "laminas/laminas-view": "^2.35",
-        "phpunit/phpunit": "^10.5.29",
+        "phpunit/phpunit": "^10.5.38",
         "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^5.25"
+        "vimeo/psalm": "^5.26.1"
     },
     "conflict": {
         "doctrine/annotations": "<1.14.0",

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="src/Annotation/AbstractBuilder.php">
     <InvalidArrayOffset>
       <code><![CDATA[$params['elementSpec']['spec']['type']]]></code>
@@ -1258,6 +1258,11 @@
       <code><![CDATA[$options]]></code>
     </MissingParamType>
   </file>
+  <file src="test/TestAsset/StringToArrayFilter.php">
+    <DeprecatedClass>
+      <code><![CDATA[AbstractFilter]]></code>
+    </DeprecatedClass>
+  </file>
   <file src="test/TestAsset/ValueStoringFieldset.php">
     <PropertyNotSetInConstructor>
       <code><![CDATA[$storedValue]]></code>

psalm.xml

@@ -5,6 +5,8 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorLevel="2"
     errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="false"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src"/>

src/Annotation/Attributes.php

@@ -29,8 +29,6 @@ public function __construct(private array $attributes)
 
     /**
      * Retrieve the attributes
-     *
-     * @return array
      */
     public function getAttributes(): array
     {

src/Annotation/BuilderAbstractFactory.php

@@ -72,8 +72,6 @@ public function canCreate(ContainerInterface $container, $requestedName): bool
      * array if not found or not an array.
      *
      * Otherwise, returns the `form_annotation_builder` array.
-     *
-     * @return array
      */
     private function marshalConfig(ContainerInterface $container): array
     {
@@ -96,7 +94,6 @@ private function marshalConfig(ContainerInterface $container): array
      * - if the fetched instance is not a `ListenerAggregate`, raises an exception
      * - otherwise attaches it to the event manager
      *
-     * @param  array $config
      * @throws ServiceNotCreatedException If any listener is not an event listener aggregate.
      */
     private function injectListeners(array $config, EventManagerInterface $events, ContainerInterface $container): void

src/Annotation/ComposedObject.php

@@ -80,8 +80,6 @@ public function isCollection(): bool
 
     /**
      * Retrieve the options for the composed object
-     *
-     * @return array
      */
     public function getOptions(): array
     {

src/Annotation/ElementAnnotationsListener.php

@@ -389,7 +389,6 @@ public function handleValidatorAnnotation(EventInterface $e): void
     /**
      * @param array|ArrayAccess      $elementSpec
      * @param ComposedObject|Options $annotation
-     * @return array
      */
     private function mergeOptions($elementSpec, $annotation): array
     {

src/Annotation/Filter.php

@@ -67,8 +67,6 @@ public function __construct($name, array $options = [], ?int $priority = null)
 
     /**
      * Retrieve the filter specification
-     *
-     * @return array
      */
     public function getFilterSpecification(): array
     {

src/Annotation/Flags.php

@@ -32,8 +32,6 @@ public function __construct(private array $flags)
 
     /**
      * Retrieve the flags
-     *
-     * @return array
      */
     public function getFlags(): array
     {

src/Annotation/Hydrator.php

@@ -58,8 +58,6 @@ public function __construct($type, array $options = [])
 
     /**
      * Retrieve the hydrator specification
-     *
-     * @return array
      */
     public function getHydratorSpecification(): array
     {

src/Annotation/Options.php

@@ -31,8 +31,6 @@ public function __construct(private array $options)
 
     /**
      * Retrieve the options
-     *
-     * @return array
      */
     public function getOptions(): array
     {

src/Annotation/ValidationGroup.php

@@ -30,8 +30,6 @@ public function __construct(private array $validationGroup)
 
     /**
      * Retrieve the options
-     *
-     * @return array
      */
     public function getValidationGroup(): array
     {

src/Annotation/Validator.php

@@ -74,8 +74,6 @@ public function __construct($name, array $options = [], ?bool $breakChainOnFailu
 
     /**
      * Retrieve the validator specification
-     *
-     * @return array
      */
     public function getValidatorSpecification(): array
     {

src/Element.php

@@ -128,8 +128,6 @@ public function setOptions(iterable $options)
 
     /**
      * Get defined options
-     *
-     * @return array
      */
     public function getOptions(): array
     {
@@ -324,8 +322,6 @@ public function setLabelOptions(iterable $arrayOrTraversable)
 
     /**
      * Get label specific options
-     *
-     * @return array
      */
     public function getLabelOptions(): array
     {
@@ -346,7 +342,6 @@ public function clearLabelOptions()
     /**
      * Remove many attributes at once
      *
-     * @param array $keys
      * @return $this
      */
     public function removeLabelOptions(array $keys)

src/Element/Collection.php

@@ -267,8 +267,6 @@ public function allowValueBinding(): bool
     /**
      * Bind values to the object
      *
-     * @param array $values
-     * @param array $validationGroup
      * @return array|mixed|void
      */
     public function bindValues(array $values = [], ?array $validationGroup = null)
@@ -476,7 +474,6 @@ public function prepareElement(FormInterface $form): void
     }
 
     /**
-     * @return array
      * @throws Exception\InvalidArgumentException
      * @throws InvalidArgumentException
      * @throws Exception\DomainException

src/Element/Csrf.php

@@ -44,9 +44,6 @@ public function setOptions(iterable $options)
         return $this;
     }
 
-    /**
-     * @return array
-     */
     public function getCsrfValidatorOptions(): array
     {
         return $this->csrfValidatorOptions;

src/Element/MultiCheckbox.php

@@ -170,8 +170,6 @@ protected function getValidator(): ?ValidatorInterface
 
     /**
      * Get only the values from the options attribute
-     *
-     * @return array
      */
     protected function getValueOptionsValues(): array
     {

src/Element/Select.php

@@ -47,9 +47,6 @@ class Select extends Element implements InputProviderInterface
     /** @var string */
     protected $unselectedValue = '';
 
-    /**
-     * @return array
-     */
     public function getValueOptions(): array
     {
         return $this->valueOptions;
@@ -299,8 +296,6 @@ public function getInputSpecification(): array
 
     /**
      * Get only the values from the options attribute
-     *
-     * @return array
      */
     protected function getValueOptionsValues(): array
     {

src/ElementInterface.php

@@ -37,8 +37,6 @@ public function setOption(string $key, mixed $value);
 
     /**
      * get the defined options
-     *
-     * @return array
      */
     public function getOptions(): array;
 

src/Fieldset.php

@@ -139,7 +139,6 @@ public function getFormFactory(): Factory
      *
      * @todo   Should we detect if the element/fieldset name conflicts?
      * @param  array|Traversable|ElementInterface $elementOrFieldset
-     * @param  array                              $flags
      * @return $this
      * @throws Exception\InvalidArgumentException
      */
@@ -347,7 +346,6 @@ public function prepareElement(FormInterface $form): void
     /**
      * Recursively populate values of attached elements and fieldsets
      *
-     * @param  iterable $data
      * @throws Exception\InvalidArgumentException
      */
     public function populateValues(iterable $data): void
@@ -535,7 +533,6 @@ public function allowValueBinding(): bool
     /**
      * Bind values to the bound object
      *
-     * @param  array      $values
      * @param  array|null $validationGroup
      * @return mixed
      */
@@ -603,8 +600,6 @@ public function useAsBaseFieldset(): bool
 
     /**
      * Extract values from the bound object
-     *
-     * @return array
      */
     protected function extract(): array
     {

src/FieldsetInterface.php

@@ -27,7 +27,6 @@ interface FieldsetInterface extends
      *                                                               ElementInterface; however, keeping it flexible
      *                                                               to allow a factory-based form
      *                                                               implementation as well
-     * @param  array $flags
      * @return $this
      */
     public function add($elementOrFieldset, array $flags = []);

src/Form.php

@@ -134,7 +134,6 @@ class Form extends Fieldset implements FormInterface
      * Set options for a form. Accepted options are:
      * - prefer_form_input_filter: is form input filter is preferred?
      *
-     * @param  iterable $options
      * @return $this
      * @throws Exception\InvalidArgumentException
      */
@@ -163,7 +162,6 @@ public function setOptions(iterable $options)
      * the element or fieldset, order in which to prioritize it, etc.
      *
      * @param  array|Traversable|ElementInterface $elementOrFieldset
-     * @param  array                              $flags
      * @return $this
      */
     public function add($elementOrFieldset, array $flags = [])
@@ -312,8 +310,6 @@ public function setHydrator(HydratorInterface $hydrator)
 
     /**
      * Bind values to the bound object
-     *
-     * @param  array $values
      */
     public function bindValues(array $values = [], ?array $validationGroup = null): void
     {
@@ -355,8 +351,6 @@ public function bindValues(array $values = [], ?array $validationGroup = null):
 
     /**
      * Parse filtered values and return only posted fields for binding
-     *
-     * @return array
      */
     protected function prepareBindData(array $values, array $match): array
     {
@@ -883,8 +877,6 @@ public function populateValues(iterable $data, bool $onlyBase = false): void
 
     /**
      * Recursively extract values for elements and sub-fieldsets
-     *
-     * @return array
      */
     protected function extract(): array
     {

src/FormAbstractServiceFactory.php

@@ -66,8 +66,6 @@ public function canCreate(ContainerInterface $container, $requestedName): bool
 
     /**
      * Get forms configuration, if any
-     *
-     * @return array
      */
     protected function getConfig(ContainerInterface $container): array
     {
@@ -119,8 +117,6 @@ protected function getFormFactory(ContainerInterface $container): Factory
      *   retrieves it and resets the specification to the instance.
      * - otherwise, pulls the input filter factory from the form factory, and
      *   attaches the FilterManager and ValidatorManager to it.
-     *
-     * @param array $config
      */
     protected function marshalInputFilter(array &$config, ContainerInterface $container, Factory $formFactory): void
     {

src/LabelAwareInterface.php

@@ -44,8 +44,6 @@ public function setLabelOptions(iterable $arrayOrTraversable);
 
     /**
      * Get label specific options
-     *
-     * @return array
      */
     public function getLabelOptions(): array;
 
@@ -80,7 +78,6 @@ public function hasLabelOption(string $key): bool;
     /**
      * Remove many attributes at once
      *
-     * @param  array $keys
      * @return $this
      */
     public function removeLabelOptions(array $keys);

src/LabelAwareTrait.php

@@ -35,8 +35,6 @@ public function setLabelAttributes(array $labelAttributes)
 
     /**
      * Get the attributes to use with the label
-     *
-     * @return array
      */
     public function getLabelAttributes(): array
     {
@@ -61,8 +59,6 @@ public function setLabelOptions(iterable $arrayOrTraversable)
 
     /**
      * Get label specific options
-     *
-     * @return array
      */
     public function getLabelOptions(): array
     {

src/Module.php

@@ -12,8 +12,6 @@ final class Module
 {
     /**
      * Return laminas-form configuration for laminas-mvc application.
-     *
-     * @return array
      */
     public function getConfig(): array
     {