Fix issues reported by PHPStan 1.1

Author: emodric

bundle/Controller/Admin/SynonymController.php

@@ -9,7 +9,6 @@
 use Netgen\TagsBundle\Form\Type\SynonymCreateType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use function count;
 
 final class SynonymController extends Controller
@@ -19,15 +18,9 @@ final class SynonymController extends Controller
      */
     private $tagsService;
 
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(TagsService $tagsService, TranslatorInterface $translator)
+    public function __construct(TagsService $tagsService)
     {
         $this->tagsService = $tagsService;
-        $this->translator = $translator;
     }
 
     /**

bundle/Controller/Admin/TagController.php

@@ -19,7 +19,6 @@
 use Pagerfanta\Adapter\AdapterInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use function count;
 use function in_array;
 use function trim;
@@ -36,11 +35,6 @@ final class TagController extends Controller
      */
     private $contentTypeService;
 
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    private $translator;
-
     /**
      * @var \Pagerfanta\Adapter\AdapterInterface
      */
@@ -54,13 +48,11 @@ final class TagController extends Controller
     public function __construct(
         TagsService $tagsService,
         ContentTypeService $contentTypeService,
-        TranslatorInterface $translator,
         AdapterInterface $tagChildrenAdapter,
         SearchTagsAdapter $searchTagsAdapter
     ) {
         $this->tagsService = $tagsService;
         $this->contentTypeService = $contentTypeService;
-        $this->translator = $translator;
         $this->tagChildrenAdapter = $tagChildrenAdapter;
         $this->searchTagsAdapter = $searchTagsAdapter;
     }
@@ -492,7 +484,7 @@ public function translationAction(Request $request, Tag $tag): Response
      */
     public function childrenAction(Request $request, ?Tag $tag = null): Response
     {
-        if (count((array) $request->request->get('Tags') ?? []) === 0) {
+        if (count((array) $request->request->get('Tags')) === 0) {
             $this->addFlashMessage('errors', 'no_selected_tags');
 
             return $this->redirectToTag($tag);

bundle/Core/Pagination/Pagerfanta/ChildrenTagsAdapter.php

@@ -21,7 +21,7 @@ final class ChildrenTagsAdapter implements AdapterInterface, TagAdapterInterface
     private $tagsService;
 
     /**
-     * @var int
+     * @var int|null
      */
     private $nbResults;
 

bundle/Core/Pagination/Pagerfanta/RelatedContentAdapter.php

@@ -31,7 +31,7 @@ final class RelatedContentAdapter implements AdapterInterface, TagAdapterInterfa
     private $configResolver;
 
     /**
-     * @var int
+     * @var int|null
      */
     private $nbResults;
 

bundle/Form/Type/FieldType/FieldValueTransformer.php

@@ -31,6 +31,9 @@ public function __construct(FieldType $fieldType, Field $field)
         $this->field = $field;
     }
 
+    /**
+     * @param \Netgen\TagsBundle\Core\FieldType\Tags\Value|null $value
+     */
     public function transform($value): ?array
     {
         if (!$value instanceof Value) {
@@ -60,6 +63,9 @@ public function transform($value): ?array
         ];
     }
 
+    /**
+     * @param mixed[]|null $value
+     */
     public function reverseTransform($value): Value
     {
         if ($value === null) {

bundle/Form/Type/TagTreeType.php

@@ -57,12 +57,20 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->addModelTransformer(
             new class() implements DataTransformerInterface {
+                /**
+                 * @param mixed $value
+                 *
+                 * @return mixed
+                 */
                 public function transform($value)
                 {
                     return $value;
                 }
 
-                public function reverseTransform($value)
+                /**
+                 * @param mixed $value
+                 */
+                public function reverseTransform($value): int
                 {
                     return (int) $value;
                 }

bundle/Resources/config/admin/controllers.yaml

@@ -15,7 +15,6 @@ services:
         arguments:
             - "@eztags.api.service.tags"
             - "@ezpublish.api.service.content_type"
-            - "@translator"
             - "@eztags.pagerfanta.children_tags_adapter"
             - "@eztags.pagerfanta.search_tags_adapter"
 
@@ -33,7 +32,6 @@ services:
         public: true
         arguments:
             - "@eztags.api.service.tags"
-            - "@translator"
 
     eztags.admin.controller.tree:
         class: Netgen\TagsBundle\Controller\Admin\TreeController

composer.json

@@ -34,10 +34,10 @@
     "require-dev": {
         "symfony/var-dumper": "^5.0",
         "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
-        "phpstan/phpstan-symfony": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12"
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

phpstan.neon

@@ -4,6 +4,7 @@ includes:
 
 parameters:
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
 
     ignoreErrors:
         -
@@ -20,6 +21,7 @@ parameters:
         - '#Method .*::getRelatedContent\(\) should return .* but returns .*#'
 
         # Errors caused by public properties in eZ Platform
+        - '#Property eZ\\Publish\\API\\Repository\\Values\\User\\Limitation::\$limitationValues \(array\) on left side of \?\? is not nullable.#'
         - '#eZ\\Publish\\API\\Repository\\Values\\Content\\Query\\Criterion::\$value#'
         - '#Call to function is_string\(\) with string will always evaluate to true.#'
         - '#Call to function is_array\(\) with array(<.*>)? will always evaluate to true.#'

phpstan.tests.neon

@@ -11,3 +11,5 @@ parameters:
         - '#Access to an undefined property Netgen\\TagsBundle\\API\\Repository\\Values\\Tags\\Tag::\$notDefined.#'
         - '#Property Netgen\\TagsBundle\\API\\Repository\\Values\\Tags\\Tag::\$id is not writable.#'
         - '#Property Netgen\\TagsBundle\\API\\Repository\\Values\\Tags\\Tag::\$id \(int\) does not accept null.#'
+        - '#Missing call to parent::setUp\(\) method.#'
+        - '#Static property .+ is not nullable.#'