Fix phpstan issues

sulu · Nov 12, 2019 · d87468f · d87468f
1 parent cb36d7e
commit d87468f
Show file tree

Hide file tree

Showing 26 changed files with 111 additions and 112 deletions.
diff --git a/Content/Application/Message/CreateContentMessage.php b/Content/Application/Message/CreateContentMessage.php
@@ -28,13 +28,13 @@ class CreateContentMessage
     private $data;
 
     /**
-     * @var array<string, string|int|float|bool|null>
+     * @var mixed[]
      */
     private $dimensionAttributes;
 
     /**
      * @param mixed[] $data
-     * @param array<string, string|int|float|bool|null> $dimensionAttributes
+     * @param mixed[] $dimensionAttributes
      */
     public function __construct(ContentInterface $content, array $data, array $dimensionAttributes)
     {
@@ -57,7 +57,7 @@ public function getData(): array
     }
 
     /**
-     * @return array<string, string|int|float|bool|null>
+     * @return mixed[]
      */
     public function getDimensionAttributes(): array
     {

diff --git a/Content/Application/Message/LoadContentMessage.php b/Content/Application/Message/LoadContentMessage.php
@@ -23,12 +23,12 @@ class LoadContentMessage
     private $content;
 
     /**
-     * @var array<string, string|int|float|bool|null>
+     * @var mixed[]
      */
     private $dimensionAttributes;
 
     /**
-     * @param array<string, string|int|float|bool|null> $dimensionAttributes
+     * @param mixed[] $dimensionAttributes
      */
     public function __construct(ContentInterface $content, array $dimensionAttributes)
     {
@@ -42,7 +42,7 @@ public function getContent(): ContentInterface
     }
 
     /**
-     * @return array<string, string|int|float|bool|null>
+     * @return mixed[]
      */
     public function getDimensionAttributes(): array
     {

diff --git a/Content/Application/Message/ModifyContentMessage.php b/Content/Application/Message/ModifyContentMessage.php
@@ -28,13 +28,13 @@ class ModifyContentMessage
     private $data;
 
     /**
-     * @var array<string, string|int|float|bool|null>
+     * @var mixed[]
      */
     private $dimensionAttributes;
 
     /**
      * @param mixed[] $data
-     * @param array<string, string|int|float|bool|null> $dimensionAttributes
+     * @param mixed[] $dimensionAttributes
      */
     public function __construct(ContentInterface $content, array $data, array $dimensionAttributes)
     {
@@ -57,7 +57,7 @@ public function getData(): array
     }
 
     /**
-     * @return array<string, string|int|float|bool|null>
+     * @return mixed[]
      */
     public function getDimensionAttributes(): array
     {

diff --git a/Content/Domain/Model/ExcerptInterface.php b/Content/Domain/Model/ExcerptInterface.php
@@ -61,22 +61,22 @@ public function getExcerptTagNames(): array;
     public function setExcerptTags(array $excerptTags): void;
 
     /**
-     * @return array<string, int|string|null>|null
+     * @return mixed[]|null
      */
     public function getExcerptImage(): ?array;
 
     /**
-     * @param array<string, int|string|null>|null $excerptImage
+     * @param mixed[]|null $excerptImage
      */
     public function setExcerptImage(?array $excerptImage): void;
 
     /**
-     * @return array<string, int|string|null>|null
+     * @return mixed[]|null
      */
     public function getExcerptIcon(): ?array;
 
     /**
-     * @param array<string, int|string|null>|null $excerptIcon
+     * @param mixed[]|null $excerptIcon
      */
     public function setExcerptIcon(?array $excerptIcon): void;
 }
diff --git a/Content/Domain/Model/ExcerptTrait.php b/Content/Domain/Model/ExcerptTrait.php
@@ -159,7 +159,7 @@ public function setExcerptTags(array $excerptTags): void
     }
 
     /**
-     * @return array{id: int}|null
+     * @return mixed[]|null
      */
     public function getExcerptImage(): ?array
     {
@@ -173,15 +173,15 @@ public function getExcerptImage(): ?array
     }
 
     /**
-     * @param array{id: int}|null $excerptImage
+     * @param mixed[]|null $excerptImage
      */
     public function setExcerptImage(?array $excerptImage): void
     {
         $this->excerptImageId = $excerptImage['id'] ?? null;
     }
 
     /**
-     * @return array{id: int}|null
+     * @return mixed[]|null
      */
     public function getExcerptIcon(): ?array
     {
@@ -195,7 +195,7 @@ public function getExcerptIcon(): ?array
     }
 
     /**
-     * @param array{id: int}|null $excerptIcon
+     * @param mixed[]|null $excerptIcon
      */
     public function setExcerptIcon(?array $excerptIcon): void
     {

diff --git a/Dimension/Domain/Factory/DimensionCollectionFactory.php b/Dimension/Domain/Factory/DimensionCollectionFactory.php
@@ -32,7 +32,7 @@ public function __construct(DimensionRepositoryInterface $dimensionRepository)
     }
 
     /**
-     * @param array<string, string|int|float|bool|null> $dimensionAttributes
+     * @param mixed[] $dimensionAttributes
      */
     public function create(array $dimensionAttributes): DimensionCollectionInterface
     {

diff --git a/Dimension/Domain/Factory/DimensionCollectionFactoryInterface.php b/Dimension/Domain/Factory/DimensionCollectionFactoryInterface.php
@@ -18,7 +18,7 @@
 interface DimensionCollectionFactoryInterface
 {
     /**
-     * @param array<string, string|int|float|bool|null> $dimensionAttributes
+     * @param mixed[] $dimensionAttributes
      */
     public function create(array $dimensionAttributes): DimensionCollectionInterface;
 }
diff --git a/Dimension/Domain/Model/DimensionCollection.php b/Dimension/Domain/Model/DimensionCollection.php
@@ -19,17 +19,17 @@
 class DimensionCollection implements \IteratorAggregate, DimensionCollectionInterface
 {
     /**
-     * @var array<string, string|int|float|bool,null>
+     * @var mixed[]
      */
     private $attributes;
 
     /**
-     * @var array<string, string|int|float|bool,null>|null
+     * @var mixed[]|null
      */
     private $localizedAttributes;
 
     /**
-     * @var array<string, string|int|float|bool,null>
+     * @var mixed[]
      */
     private $unlocalizedAttributes;
 
@@ -49,7 +49,7 @@ class DimensionCollection implements \IteratorAggregate, DimensionCollectionInte
     private $unlocalizedDimension;
 
     /**
-     * @param array<string, string|int|float|bool,null> $attributes
+     * @param mixed[] $attributes
      * @param DimensionInterface[] $dimensions
      */
     public function __construct(array $attributes, array $dimensions)
@@ -67,38 +67,38 @@ public function __construct(array $attributes, array $dimensions)
 
         $criteria = Criteria::create();
         foreach ($this->unlocalizedAttributes as $key => $value) {
-            $criteria->andWhere($criteria->expr()->eq($key, $value));
+            $criteria->andWhere($criteria->expr()->eq((string) $key, $value));
         }
 
         $this->unlocalizedDimension = $this->dimensions->matching($criteria)->first() ?: null;
 
         if ($this->localizedAttributes) {
             $criteria = Criteria::create();
             foreach ($this->localizedAttributes as $key => $value) {
-                $criteria->andWhere($criteria->expr()->eq($key, $value));
+                $criteria->andWhere($criteria->expr()->eq((string) $key, $value));
             }
             $this->localizedDimension = $this->dimensions->matching($criteria)->first() ?: null;
         }
     }
 
     /**
-     * @return array<string, string|int|float|bool,null>
+     * @return mixed[]
      */
     public function getAttributes(): array
     {
         return $this->attributes;
     }
 
     /**
-     * @return array<string, string|int|float|bool,null>
+     * @return mixed[]
      */
     public function getUnlocalizedAttributes(): array
     {
         return $this->unlocalizedAttributes;
     }
 
     /**
-     * @return array<string, string|int|float|bool,null>
+     * @return mixed[]
      */
     public function getLocalizedAttributes(): ?array
     {

diff --git a/Dimension/Domain/Model/DimensionCollectionInterface.php b/Dimension/Domain/Model/DimensionCollectionInterface.php
@@ -19,17 +19,17 @@
 interface DimensionCollectionInterface extends \Traversable, \Countable
 {
     /**
-     * @return array<string, string|int|float|bool,null>|null
+     * @return mixed[]|null
      */
     public function getLocalizedAttributes(): ?array;
 
     /**
-     * @return array<string, string|int|float|bool,null>
+     * @return mixed[]
      */
     public function getUnlocalizedAttributes(): array;
 
     /**
-     * @return array<string, string|int|float|bool,null>
+     * @return mixed[]
      */
     public function getAttributes(): array;
 

diff --git a/Dimension/Domain/Model/DimensionInterface.php b/Dimension/Domain/Model/DimensionInterface.php
@@ -25,7 +25,7 @@ public function getLocale(): ?string;
     public function getWorkflowStage(): string;
 
     /**
-     * @return array<string, string|int|float|bool|null>
+     * @return mixed[]
      */
     public function getAttributes(): array;
 

diff --git a/Dimension/Domain/Repository/DimensionRepositoryInterface.php b/Dimension/Domain/Repository/DimensionRepositoryInterface.php
@@ -19,7 +19,7 @@
 interface DimensionRepositoryInterface
 {
     /**
-     * @param array<string, string|int|float|bool|null> $attributes
+     * @param mixed[] $attributes
      */
     public function create(
         ?string $id = null,
@@ -31,7 +31,7 @@ public function add(DimensionInterface $directory): void;
     public function remove(DimensionInterface $directory): void;
 
     /**
-     * @param array<string, string|int|float|bool|null> $attributes
+     * @param mixed[] $attributes
      */
     public function findByAttributes(array $attributes): DimensionCollectionInterface;
 

diff --git a/Dimension/Infrastructure/Doctrine/DimensionRepository.php b/Dimension/Infrastructure/Doctrine/DimensionRepository.php
@@ -26,7 +26,7 @@
 class DimensionRepository implements DimensionRepositoryInterface
 {
     /**
-     * @var class-string<DimensionInterface>
+     * @var string
      */
     private $className;
 
@@ -98,17 +98,17 @@ public function findBy(array $criteria): iterable
     /**
      * Less specific should be returned first to merge correctly.
      *
-     * @param array<string, string|int|float|bool|null> $attributes
+     * @param mixed[] $attributes
      */
-    private function addSortBy(QueryBuilder $queryBuilder, $attributes): void
+    private function addSortBy(QueryBuilder $queryBuilder, array $attributes): void
     {
         foreach ($attributes as $key => $value) {
             $queryBuilder->addOrderBy('dimension.' . $key);
         }
     }
 
     /**
-     * @param array<string, string|int|float|bool|null> $attributes
+     * @param mixed[] $attributes
      */
     private function getAttributesCriteria(string $dimensionAlias, array $attributes): Criteria
     {
@@ -130,9 +130,9 @@ private function getAttributesCriteria(string $dimensionAlias, array $attributes
     }
 
     /**
-     * @param array<string, string|int|float|bool|null> $attributes
+     * @param mixed[] $attributes
      *
-     * @return array<string, string|int|float|bool|null>
+     * @return mixed[]
      */
     private function getNormalizedAttributes(array $attributes): array
     {

diff --git a/TestCases/Content/ExcerptTestCaseTrait.php b/TestCases/Content/ExcerptTestCaseTrait.php
@@ -55,6 +55,7 @@ public function testGetSetExcerptImageId(): void
         $model = $this->getExcerptInstance();
         $this->assertNull($model->getExcerptImage());
         $model->setExcerptImage(['id' => 1]);
+        $this->assertNotNull($model->getExcerptImage());
         $this->assertSame(['id' => 1], $model->getExcerptImage());
     }
 
@@ -63,6 +64,7 @@ public function testGetSetExcerptIconId(): void
         $model = $this->getExcerptInstance();
         $this->assertNull($model->getExcerptIcon());
         $model->setExcerptIcon(['id' => 2]);
+        $this->assertNotNull($model->getExcerptIcon());
         $this->assertSame(['id' => 2], $model->getExcerptIcon());
     }
 

diff --git a/...nt/Infrastructure/CategoryFactoryTest.php → ...tructure/Doctrine/CategoryFactoryTest.php b/...nt/Infrastructure/CategoryFactoryTest.php → ...tructure/Doctrine/CategoryFactoryTest.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Tests\Content\Infrastructure\Doctrine;
+namespace Sulu\Bundle\ContentBundle\Tests\Functional\Content\Infrastructure\Doctrine;
 
 use Sulu\Bundle\CategoryBundle\Entity\CategoryInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Factory\CategoryFactoryInterface;
@@ -32,8 +32,10 @@ public function createCategoryFactory(): CategoryFactoryInterface
 
     /**
      * @dataProvider dataProvider
+     *
+     * @param int[] $categoryIds
      */
-    public function testCreate($categoryIds): void
+    public function testCreate(array $categoryIds): void
     {
         $categoryFactory = $this->createCategoryFactory();
 
@@ -48,7 +50,7 @@ function (CategoryInterface $category) {
         );
     }
 
-    public function dataProvider()
+    public function dataProvider(): \Generator
     {
         yield [
             [