Fix some psalm issues (#1433)

sonata-project · May 9, 2021 · b59f9e5 · b59f9e5
1 parent 2798e05
commit b59f9e5
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 235 deletions.
diff --git a/src/Filter/CallbackFilter.php b/src/Filter/CallbackFilter.php
@@ -61,8 +61,9 @@ public function getRenderSettings(): array
 
     protected function association(ProxyQueryInterface $query, FilterData $data): array
     {
-        $alias = $query->entityJoin($this->getParentAssociationMappings());
+        $alias = $this->getOption('alias', $query->entityJoin($this->getParentAssociationMappings()));
+        \assert(\is_string($alias));
 
-        return [$this->getOption('alias', $alias), $this->getFieldName()];
+        return [$alias, $this->getFieldName()];
     }
 }
diff --git a/tests/DependencyInjection/SonataDoctrineORMAdminExtensionTest.php b/tests/DependencyInjection/SonataDoctrineORMAdminExtensionTest.php
@@ -19,26 +19,16 @@
 
 class SonataDoctrineORMAdminExtensionTest extends TestCase
 {
-    /**
-     * @var ContainerBuilder
-     */
-    protected $configuration;
-
-    protected function tearDown(): void
-    {
-        unset($this->configuration);
-    }
-
     public function testEntityManagerSetFactory(): void
     {
-        $this->configuration = new ContainerBuilder();
-        $this->configuration->setParameter('kernel.bundles', ['SimpleThingsEntityAuditBundle' => true]);
+        $configuration = new ContainerBuilder();
+        $configuration->setParameter('kernel.bundles', ['SimpleThingsEntityAuditBundle' => true]);
         $loader = new SonataDoctrineORMAdminExtension();
-        $loader->load([], $this->configuration);
+        $loader->load([], $configuration);
 
-        $definition = $this->configuration->getDefinition('sonata.admin.entity_manager');
+        $definition = $configuration->getDefinition('sonata.admin.entity_manager');
 
         $this->assertNotNull($definition->getFactory());
-        $this->assertNotFalse($this->configuration->getParameter('sonata_doctrine_orm_admin.audit.force'));
+        $this->assertNotFalse($configuration->getParameter('sonata_doctrine_orm_admin.audit.force'));
     }
 }
diff --git a/tests/Filter/FilterTestCase.php b/tests/Filter/FilterTestCase.php
@@ -108,13 +108,13 @@ private function createExprStub(): Expr
         $expr = $this->createStub(Expr::class);
 
         $expr->method('orX')->willReturnCallback(
-            static function ($x = null): Orx {
+            static function (): Orx {
                 return new Orx(\func_get_args());
             }
         );
 
         $expr->method('andX')->willReturnCallback(
-            static function ($x = null): Andx {
+            static function (): Andx {
                 return new Andx(\func_get_args());
             }
         );

diff --git a/tests/Fixtures/Entity/ContainerEntity.php b/tests/Fixtures/Entity/ContainerEntity.php
@@ -16,7 +16,7 @@
 class ContainerEntity
 {
     /**
-     * @var int
+     * @var int|null
      */
     protected $plainField;
 

diff --git a/tests/Fixtures/Entity/Embeddable/EmbeddedEntity.php b/tests/Fixtures/Entity/Embeddable/EmbeddedEntity.php
@@ -16,11 +16,32 @@
 class EmbeddedEntity
 {
     /**
-     * @var bool
+     * @var bool|null
      */
-    protected $plainField;
+    public $plainField;
+
     /**
-     * @var SubEmbeddedEntity
+     * @var SubEmbeddedEntity|null
      */
-    protected $subEmbeddedEntity;
+    private $subEmbeddedEntity;
+
+    public function setPlainField(bool $plainField): void
+    {
+        $this->plainField = $plainField;
+    }
+
+    public function getPlaingField(): ?bool
+    {
+        return $this->plainField;
+    }
+
+    public function setSubEmbeddedEntity(SubEmbeddedEntity $subEmbeddedEntity): void
+    {
+        $this->subEmbeddedEntity = $subEmbeddedEntity;
+    }
+
+    public function getSubEmbeddedEntity(): ?SubEmbeddedEntity
+    {
+        return $this->subEmbeddedEntity;
+    }
 }
diff --git a/tests/Fixtures/Entity/Embeddable/SubEmbeddedEntity.php b/tests/Fixtures/Entity/Embeddable/SubEmbeddedEntity.php
@@ -16,7 +16,17 @@
 class SubEmbeddedEntity
 {
     /**
-     * @var bool
+     * @var bool|null
      */
-    protected $plainField;
+    private $plainField;
+
+    public function setPlainField(bool $plainField): void
+    {
+        $this->plainField = $plainField;
+    }
+
+    public function getPlaingField(): ?bool
+    {
+        return $this->plainField;
+    }
 }
diff --git a/tests/Fixtures/Entity/ORM/Menu.php b/tests/Fixtures/Entity/ORM/Menu.php
diff --git a/tests/Fixtures/Entity/ORM/Product.php b/tests/Fixtures/Entity/ORM/Product.php
diff --git a/tests/Fixtures/Entity/ORM/Store.php b/tests/Fixtures/Entity/ORM/Store.php
diff --git a/tests/Fixtures/Entity/ORM/StoreProduct.php b/tests/Fixtures/Entity/ORM/StoreProduct.php
diff --git a/tests/Fixtures/Entity/ORM/User.php b/tests/Fixtures/Entity/ORM/User.php
@@ -25,7 +25,17 @@ class User
      * @ORM\GeneratedValue(strategy="AUTO")
      * @ORM\Column(name="id", type="integer")
      *
-     * @var int
+     * @var int|null
      */
     private $id;
+
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
 }
diff --git a/tests/Fixtures/Entity/ORM/UserBrowser.php b/tests/Fixtures/Entity/ORM/UserBrowser.php
@@ -25,7 +25,7 @@ class UserBrowser
      * @ORM\GeneratedValue(strategy="NONE")
      * @ORM\Column(type="integer")
      *
-     * @var int
+     * @var int|null
      */
     private $userId;
 
@@ -34,7 +34,27 @@ class UserBrowser
      * @ORM\GeneratedValue(strategy="NONE")
      * @ORM\Column(type="integer")
      *
-     * @var int
+     * @var int|null
      */
     private $browserId;
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function setBrowserId(int $browserId): void
+    {
+        $this->browserId = $browserId;
+    }
+
+    public function getBrowserId(): ?int
+    {
+        return $this->browserId;
+    }
 }