[phpstan] Fixed issues reported by phpstan

Author: adamwojs

phpstan-baseline.neon

@@ -13,19 +13,12 @@
 
 class NoValidLocationsException extends Exception
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content|\Ibexa\Contracts\Core\Repository\Values\Content\Content[]
-     */
-    private $content;
+    private Content $content;
 
-    /**
-     * NoValidLocationsException constructor.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     */
     public function __construct(Content $content)
     {
         parent::__construct("No valid location could be determined for content #{$content->id}");
+
         $this->content = $content;
     }
 

src/lib/Exception/NoValidLocationsException.php

@@ -89,8 +89,8 @@ function ($input) {
         if (isset($inputArray['sortBy'])) {
             $query->sortClauses = array_map(
                 static function ($sortClauseClass) {
-                    /** @var Query\SortClause $lastSortClause */
-                    static $lastSortClause;
+                    /** @var Query\SortClause|null $lastSortClause */
+                    static $lastSortClause = null;
 
                     if ($sortClauseClass === Query::SORT_DESC) {
                         if (!$lastSortClause instanceof Query\SortClause) {

src/lib/InputMapper/SearchQueryMapper.php

@@ -20,8 +20,8 @@ public function mapInputToSortClauses(array $sortInput)
     {
         $sortClauses = array_map(
             static function (string $sortClauseClass) {
-                /** @var Query\SortClause $lastSortClause */
-                static $lastSortClause;
+                /** @var Query\SortClause|null $lastSortClause */
+                static $lastSortClause = null;
 
                 if ($sortClauseClass === Query::SORT_DESC) {
                     if (!$lastSortClause instanceof Query\SortClause) {

src/lib/InputMapper/SearchQuerySortByMapper.php

@@ -15,18 +15,17 @@
  */
 class ImageAssetFieldResolver
 {
-    /* @var array<\Ibexa\GraphQL\Mapper\ImageAssetMapperStrategyInterface> */
-    private $strategies;
+    /** @var array<\Ibexa\GraphQL\Mapper\ImageAssetMapperStrategyInterface> */
+    private array $strategies;
 
     /**
      * @param iterable<\Ibexa\GraphQL\Mapper\ImageAssetMapperStrategyInterface> $strategies
      */
     public function __construct(iterable $strategies)
     {
+        $this->strategies = [];
         foreach ($strategies as $strategy) {
-            if ($strategy instanceof ImageAssetMapperStrategyInterface) {
-                $this->strategies[] = $strategy;
-            }
+            $this->strategies[] = $strategy;
         }
     }
 

src/lib/Resolver/ImageAssetFieldResolver.php

@@ -8,6 +8,8 @@
 namespace Ibexa\GraphQL\Resolver;
 
 use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Core\Variation\VariationHandler;
 use Ibexa\Core\FieldType;
@@ -80,7 +82,7 @@ public function resolveImageVariation(ImageFieldValue $fieldValue, $args)
     }
 
     /**
-     * @return [Content, Field]
+     * @phpstan-return array{Content, Field}
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
@@ -92,7 +94,7 @@ protected function getImageField(ImageFieldValue $fieldValue): array
         $content = $this->contentLoader->findSingle(new Criterion\ContentId($contentId));
 
         $fieldFound = false;
-        /** @var $field \Ibexa\Contracts\Core\Repository\Values\Content\Field */
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Field $field */
         foreach ($content->getFields() as $field) {
             if ($field->id == $fieldId) {
                 $fieldFound = true;