updates for upgraded QA

.github/workflows/symfony.yml

@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
           - '8.1'
 
     steps:
@@ -56,8 +55,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
-          - '8.0'
           - '8.1'
 
     steps:

.php-cs-fixer.dist.php

@@ -17,6 +17,8 @@
 file that was distributed with this source code.',
             'location' => 'after_declare_strict',
         ],
+        'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)

CHANGELOG.md

@@ -0,0 +1,16 @@
+Version 1.0.1
+=============
+15 September 2023
+
+ - Allow newer versions of Twig (@Guite)
+ - Correct symfony/contracts to be more specific and fix Symfony v6 compatibility (@craigh)
+ - Fix small issue in unit tests (@On5-Repos)
+ - Fix dev dependencies at specific version (@mbabker)
+ - Reduce github actions matrix to only php 8.1 for QA related tools (@mbabker)
+ - Correct new QA issues from upgrades to tools (@craigh)
+
+Version 1.0.0
+=============
+21 June 2022
+
+ - Initial release

composer.json

@@ -29,11 +29,11 @@
         "symfony/validator": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.8",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.6",
-        "phpstan/phpstan-symfony": "^1.1",
-        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "3.26.1",
+        "phpstan/extension-installer": "1.3.1",
+        "phpstan/phpstan": "1.10.34",
+        "phpstan/phpstan-symfony": "1.3.2",
+        "phpunit/phpunit": "9.6.12",
         "roave/security-advisories": "dev-latest"
     },
     "suggest": {

phpstan.neon.dist

@@ -1,5 +1,4 @@
 parameters:
     paths:
         - src
-        - tests
     level: 8

src/Container/AbstractSpecificationContainer.php

@@ -15,14 +15,8 @@
 
 abstract class AbstractSpecificationContainer implements SpecificationContainerInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     abstract public function getFormSpecifications(array $params = []): array;
 
-    /**
-     * {@inheritDoc}
-     */
     public function getLabels(string $locale = ''): array
     {
         $labels = [];
@@ -33,9 +27,6 @@ public function getLabels(string $locale = ''): array
         return $labels;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getGroupedLabels(string $locale = ''): array
     {
         $labels = [];

src/Entity/AbstractResponseData.php

@@ -22,17 +22,11 @@ abstract class AbstractResponseData implements ResponseDataInterface
      */
     protected ?array $data = [];
 
-    /**
-     * {@inheritDoc}
-     */
     public function getData(): ?array
     {
         return $this->data;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function setData(?array $data): void
     {
         $this->data = $data;

src/Form/Data/FormTypesChoices.php

@@ -14,7 +14,6 @@
 namespace Zikula\Bundle\DynamicFormBundle\Form\Data;
 
 use ArrayAccess;
-use Exception;
 use Iterator;
 
 /**
@@ -23,7 +22,7 @@
  * @implements Iterator<string|null, array<string, string>|false>
  * @implements ArrayAccess<string, array<string, string>>
  */
-class FormTypesChoices implements ArrayAccess, Iterator
+class FormTypesChoices implements \ArrayAccess, \Iterator
 {
     /**
      * @var array<string, array<string, string>>
@@ -43,9 +42,6 @@ public function offsetExists($offset): bool
         return isset($this->choices[$offset]);
     }
 
-    /**
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
@@ -59,26 +55,20 @@ public function offsetSet($offset, $value): void
 
     public function offsetUnset($offset): void
     {
-        throw new Exception('Not allowed to unset!');
+        throw new \Exception('Not allowed to unset!');
     }
 
     public function rewind(): void
     {
         reset($this->choices);
     }
 
-    /**
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->choices);
     }
 
-    /**
-     * @return mixed
-     */
     #[\ReturnTypeWillChange]
     public function key()
     {

src/Form/DataMapper/ChoiceWithOtherDataMapper.php

@@ -19,9 +19,6 @@
 
 class ChoiceWithOtherDataMapper implements DataMapperInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function mapDataToForms($viewData, \Traversable $forms): void
     {
         /** @var FormInterface[] $forms */
@@ -58,9 +55,6 @@ public function mapDataToForms($viewData, \Traversable $forms): void
         $forms['other']->setData($other);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function mapFormsToData(\Traversable $forms, &$viewData): void
     {
         /** @var FormInterface[] $forms */
@@ -87,7 +81,7 @@ public function mapFormsToData(\Traversable $forms, &$viewData): void
                 $choicesData = array_merge($choicesData, $otherValue);
             }
 
-            $viewData = is_array($choicesData) ? implode(',', $choicesData) : $choicesData;
+            $viewData = implode(',', $choicesData);
         }
     }
 }

src/Form/Type/ChoiceWithOtherType.php

@@ -28,9 +28,6 @@ class ChoiceWithOtherType extends AbstractType
 {
     public const OTHER_VALUE = 'other';
 
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
@@ -54,9 +51,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         });
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([

src/Form/Type/FormSpecificationCollectionType.php

@@ -31,7 +31,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'entry_type' => FormSpecificationType::class,
             'allow_add' => true,
             'allow_delete' => true,
-            'delete_empty' => function (AbstractFormSpecification $property = null) {
+            'delete_empty' => function (?AbstractFormSpecification $property = null) {
                 return null === $property || empty($property->getName());
             },
             'prototype' => true, // required for javascript to work

src/Provider/LocaleProvider.php

@@ -28,9 +28,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher, bool $tra
         $this->translate = $translate;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getSupportedLocales(): array
     {
         if (!$this->translate) {
@@ -41,10 +38,7 @@ public function getSupportedLocales(): array
         return $event->getSupportedLocales();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function getSupportedLocaleNames(string $displayLocale = null): array
+    public function getSupportedLocaleNames(?string $displayLocale = null): array
     {
         if (!$this->translate) {
             return ['Default' => 'default'];

src/Provider/LocaleProviderInterface.php

@@ -27,5 +27,5 @@ public function getSupportedLocales(): array;
      *
      * @return array<string, string>
      */
-    public function getSupportedLocaleNames(string $displayLocale = null): array;
+    public function getSupportedLocaleNames(?string $displayLocale = null): array;
 }

tests/Form/Data/FormTypesChoicesTest.php

@@ -13,10 +13,7 @@
 
 namespace Zikula\Bundle\DynamicFormBundle\Tests\Form\Data;
 
-use ArrayAccess;
-use Iterator;
 use PHPUnit\Framework\TestCase;
-use Traversable;
 use Zikula\Bundle\DynamicFormBundle\Form\Data\FormTypesChoices;
 
 class FormTypesChoicesTest extends TestCase
@@ -27,9 +24,9 @@ class FormTypesChoicesTest extends TestCase
     public function testEmptyInstantiation(): void
     {
         $foo = new FormTypesChoices();
-        $this->assertInstanceOf(ArrayAccess::class, $foo);
-        $this->assertInstanceOf(Iterator::class, $foo);
-        $this->assertInstanceOf(Traversable::class, $foo);
+        $this->assertInstanceOf(\ArrayAccess::class, $foo);
+        $this->assertInstanceOf(\Iterator::class, $foo);
+        $this->assertInstanceOf(\Traversable::class, $foo);
     }
 
     /**
@@ -41,9 +38,9 @@ public function testInstantiationWithArg(): void
             'foo' => ['bar' => 'bar'],
             'three' => ['nine' => 'nine'],
         ]);
-        $this->assertInstanceOf(ArrayAccess::class, $foo);
-        $this->assertInstanceOf(Iterator::class, $foo);
-        $this->assertInstanceOf(Traversable::class, $foo);
+        $this->assertInstanceOf(\ArrayAccess::class, $foo);
+        $this->assertInstanceOf(\Iterator::class, $foo);
+        $this->assertInstanceOf(\Traversable::class, $foo);
         $this->assertArrayHasKey('foo', $foo);
         $this->assertArrayHasKey('three', $foo);
     }

tests/Form/DataTransformer/ArrayToStringTransformerTest.php

@@ -23,6 +23,7 @@ class ArrayToStringTransformerTest extends TestCase
 {
     /**
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ArrayToStringTransformer::transform
+     *
      * @dataProvider data
      */
     public function testTransform(string $storedAs, string $submitted, string $restored): void
@@ -33,6 +34,7 @@ public function testTransform(string $storedAs, string $submitted, string $resto
 
     /**
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ArrayToStringTransformer::reverseTransform
+     *
      * @dataProvider data
      */
     public function testReverseTransform(string $storedAs, string $submitted, string $restored): void
@@ -52,6 +54,7 @@ public function data(): \Iterator
      * @param string[] $restored
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ArrayToStringTransformer::transform
+     *
      * @dataProvider dataMultiple
      */
     public function testTransformMultiple(string $storedAs, array $submitted, array $restored): void
@@ -65,6 +68,7 @@ public function testTransformMultiple(string $storedAs, array $submitted, array
      * @param string[] $restored
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ArrayToStringTransformer::reverseTransform
+     *
      * @dataProvider dataMultiple
      */
     public function testReverseTransformMultiple(string $storedAs, array $submitted, array $restored): void

tests/Form/DataTransformer/ChoiceValuesTransformerTest.php

@@ -22,6 +22,7 @@ class ChoiceValuesTransformerTest extends TestCase
      * @param array<string, string> $storedAs
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ChoiceValuesTransformer::transform
+     *
      * @dataProvider data
      */
     public function testTransform(array $storedAs, string $submitted, string $restored): void
@@ -34,6 +35,7 @@ public function testTransform(array $storedAs, string $submitted, string $restor
      * @param array<string, string> $storedAs
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\ChoiceValuesTransformer::reverseTransform
+     *
      * @dataProvider data
      */
     public function testReverseTransform(array $storedAs, string $submitted, string $restored): void

tests/Form/DataTransformer/DefaultLabelToLabelsTransformerTest.php

@@ -22,6 +22,7 @@ class DefaultLabelToLabelsTransformerTest extends TestCase
      * @param array<string, string> $storedAs
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\DefaultLabelToLabelsTransformer::transform
+     *
      * @dataProvider data
      */
     public function testTransform(array $storedAs, string $submitted, string $restored): void
@@ -34,6 +35,7 @@ public function testTransform(array $storedAs, string $submitted, string $restor
      * @param array<string, string> $storedAs
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\DefaultLabelToLabelsTransformer::reverseTransform
+     *
      * @dataProvider data
      */
     public function testReverseTransform(array $storedAs, string $submitted, string $restored): void

tests/Form/DataTransformer/RegexConstraintTransformerTest.php

@@ -24,6 +24,7 @@ class RegexConstraintTransformerTest extends TestCase
      * @param mixed   $submitted
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\RegexConstraintTransformer::transform
+     *
      * @dataProvider data
      */
     public function testTransform(array $storedAs, $submitted, string $restored): void
@@ -37,6 +38,7 @@ public function testTransform(array $storedAs, $submitted, string $restored): vo
      * @param mixed   $submitted
      *
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\DataTransformer\RegexConstraintTransformer::reverseTransform
+     *
      * @dataProvider data
      */
     public function testReverseTransform(array $storedAs, $submitted, string $restored): void

tests/Form/Type/DynamicFieldsTypeTest.php

@@ -41,7 +41,7 @@ protected function setUp(): void
             /**
              * @param string[] $parameters this is for phpstan
              */
-            public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string
+            public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
             {
                 return $id;
             }

tests/Form/Type/FormSpecificationTypeTest.php

@@ -91,6 +91,7 @@ public function testBasicFormSubmission(): void
 
     /**
      * @param string[] $expectedOptions
+     *
      * @covers \Zikula\Bundle\DynamicFormBundle\Entity\AbstractFormSpecification
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\Type\ChoiceTypeTransformed
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\Type\ChoiceWithOtherType
@@ -104,6 +105,7 @@ public function testBasicFormSubmission(): void
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\Type\DynamicOptions\MoneyFormOptionsArrayType
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\Type\DynamicOptions\RangeFormOptionsArrayType
      * @covers \Zikula\Bundle\DynamicFormBundle\Form\Type\DynamicOptions\RegexibleFormOptionsArrayType
+     *
      * @dataProvider data
      */
     public function testProperFormCreation(string $type, array $expectedOptions): void