fix cs and phpstan

sonata-project · Oct 3, 2020 · 0fb5e7a · 0fb5e7a
1 parent 87fbb8e
commit 0fb5e7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Form/ChoiceList/ModelChoiceLoader.php b/src/Form/ChoiceList/ModelChoiceLoader.php
@@ -67,7 +67,7 @@ final class ModelChoiceLoader implements ChoiceLoaderInterface
     /**
      * @param object[] $choices
      *
-     * @phpstan-param class-string|null $class
+     * @phpstan-param class-string $class
      */
     public function __construct(
         ModelManagerInterface $modelManager,
@@ -78,6 +78,7 @@ public function __construct(
         array $choices = []
     ) {
         $this->modelManager = $modelManager;
+        $this->propertyAccessor = $propertyAccessor;
         $this->class = $class;
         $this->property = $property;
         $this->choices = $choices;
@@ -89,8 +90,6 @@ public function __construct(
 
             $this->query = $query;
         }
-
-        $this->propertyAccessor = $propertyAccessor;
     }
 
     public function loadChoiceList($value = null): ChoiceListInterface

diff --git a/tests/Form/Type/ModelTypeTest.php b/tests/Form/Type/ModelTypeTest.php
@@ -68,7 +68,7 @@ public function testCompoundOption(bool $expectedCompound, bool $multiple, bool
 
         $this->type->configureOptions($optionResolver);
 
-        $options = $optionResolver->resolve(['model_manager' => $modelManager,'class' => \stdClass::class, 'choices' => [], 'multiple' => $multiple, 'expanded' => $expanded]);
+        $options = $optionResolver->resolve(['model_manager' => $modelManager, 'class' => \stdClass::class, 'choices' => [], 'multiple' => $multiple, 'expanded' => $expanded]);
 
         $this->assertSame($expectedCompound, $options['compound']);
         $this->assertSame('choice', $options['template']);