Fix scrutinizer

bjd-php · May 10, 2018 · 83bf4b1 · 83bf4b1
1 parent d9276ea
commit 83bf4b1
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/Tests/Form/Extension/ParsleyTypeExtensionTest.php b/Tests/Form/Extension/ParsleyTypeExtensionTest.php
@@ -45,12 +45,9 @@ class ParsleyTypeExtensionTest extends TestCase
     public function testConfiguration(): void
     {
         $extension = $this->createExtension();
-        $this->assertSame(FormType::class, $extension->getExtendedType());
-
-        $resolver = new OptionsResolver();
-        $extension->configureOptions($resolver);
-        $options = $resolver->resolve([]);
+        $options = $this->resolveExtensionOptions($extension, []);
 
+        $this->assertSame(FormType::class, $extension->getExtendedType());
         $this->assertTrue($options['parsley_enabled']);
         $this->assertSame('blur', $options['parsley_trigger_event']);
     }
@@ -67,7 +64,8 @@ public function testFinishViewDisabled(bool $enabled, bool $parsleyEnabled): voi
         $view = $this->createMock(FormView::class);
 
         $extension = $this->createExtension($enabled);
-        $this->finishView($extension, $view, $form, ['parsley_enabled' => $parsleyEnabled]);
+        $options = $this->resolveExtensionOptions($extension, ['parsley_enabled' => $parsleyEnabled]);
+        $extension->finishView($view, $form, $options);
 
         $this->assertEmpty($view->vars['attr']);
     }
@@ -91,7 +89,8 @@ public function testFinishViewRootForm(): void
         $this->setUpForm($form, true);
 
         $extension = $this->createExtension();
-        $this->finishView($extension, $view, $form);
+        $options = $this->resolveExtensionOptions($extension);
+        $extension->finishView($view, $form, $options);
 
         $this->assertSame(
             [
@@ -110,7 +109,8 @@ public function testFinishViewWithoutReaders(): void
         $this->setUpForm($form);
 
         $extension = $this->createExtension();
-        $this->finishView($extension, $view, $form);
+        $options = $this->resolveExtensionOptions($extension);
+        $extension->finishView($view, $form, $options);
 
         $this->assertSame(['data-parsley-trigger' => 'blur'], $view->vars['attr']);
     }
@@ -137,7 +137,8 @@ public function testFinishViewWithoutConstraints(): void
         ;
 
         $extension = $this->createExtension();
-        $this->finishView($extension, $view, $form);
+        $options = $this->resolveExtensionOptions($extension);
+        $extension->finishView($view, $form, $options);
 
         $this->assertSame(['data-parsley-trigger' => 'blur'], $view->vars['attr']);
     }
@@ -179,7 +180,8 @@ public function testFinishViewWithUnsupportedConstraints(): void
         ;
 
         $extension = $this->createExtension();
-        $this->finishView($extension, $view, $form);
+        $options = $this->resolveExtensionOptions($extension);
+        $extension->finishView($view, $form, $options);
 
         $this->assertSame(['data-parsley-trigger' => 'blur'], $view->vars['attr']);
     }
@@ -224,7 +226,8 @@ public function testFinishViewWithConstraints(): void
         ;
 
         $extension = $this->createExtension();
-        $this->finishView($extension, $view, $form);
+        $options = $this->resolveExtensionOptions($extension);
+        $extension->finishView($view, $form, $options);
 
         $this->assertSame(
             [
@@ -264,20 +267,16 @@ private function setUpForm(MockObject $form, bool $root = false): void
 
     /**
      * @param AbstractTypeExtension $extension
-     * @param MockObject|FormView $view
-     * @param FormInterface|MockObject $form
      * @param array $options
+     *
+     * @return array
      */
-    private function finishView(
-        AbstractTypeExtension $extension,
-        MockObject $view,
-        MockObject $form,
-        array $options = []
-    ): void {
+    private function resolveExtensionOptions(AbstractTypeExtension $extension, array $options = []): array
+    {
         $resolver = new OptionsResolver();
         $extension->configureOptions($resolver);
 
-        $extension->finishView($view, $form, $resolver->resolve($options));
+        return $resolver->resolve($options);
     }
 
     /**