Fix tests again.

lakiboy · Jan 5, 2018 · 0b15adf · 0b15adf
1 parent fa2c24e
commit 0b15adf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Tests/Form/DateNormalizerTest.php b/Tests/Form/DateNormalizerTest.php
@@ -20,7 +20,7 @@ public function setUp()
     public function it_leaves_non_datetime_type_intact()
     {
         $dummy = new \stdClass();
-        $this->assertSame($dummy, $this->normalizer->normalizeDate($dummy, $this->getMock('Symfony\Component\Form\FormInterface')));
+        $this->assertSame($dummy, $this->normalizer->normalizeDate($dummy, $this->makeMock('Symfony\Component\Form\FormInterface')));
     }
 
     /**
@@ -32,8 +32,8 @@ public function it_normalizes_date()
         $datePreNormalized = new \DateTime();
         $dateNormalized    = new \DateTime();
 
-        $transformer1 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
-        $transformer2 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+        $transformer1 = $this->makeMock('Symfony\Component\Form\DataTransformerInterface');
+        $transformer2 = $this->makeMock('Symfony\Component\Form\DataTransformerInterface');
 
         $transformer1
             ->expects($this->once())
@@ -59,14 +59,14 @@ public function it_normalizes_date()
      */
     private function getForm(array $transformers)
     {
-        $config = $this->getMock('Symfony\Component\Form\FormConfigInterface');
+        $config = $this->makeMock('Symfony\Component\Form\FormConfigInterface');
         $config
             ->expects($this->once())
             ->method('getViewTransformers')
             ->willReturn($transformers)
         ;
 
-        $form = $this->getMock('Symfony\Component\Form\FormInterface');
+        $form = $this->makeMock('Symfony\Component\Form\FormInterface');
         $form
             ->expects($this->once())
             ->method('getConfig')
@@ -76,12 +76,12 @@ private function getForm(array $transformers)
         return $form;
     }
 
-    public function getMock($originalClassName)
+    private function makeMock($originalClassName)
     {
         if (method_exists($this, 'createMock')) {
             return $this->createMock($originalClassName);
         }
 
-        return parent::getMock($originalClassName);
+        return $this->getMock($originalClassName);
     }
 }
diff --git a/Tests/Twig/GenemuFormExtensionTest.php b/Tests/Twig/GenemuFormExtensionTest.php
@@ -13,7 +13,7 @@ class GenemuFormExtensionTest extends \PHPUnit_Framework_TestCase
     public function it_registers_functions()
     {
         $twig = new \Twig_Environment(new \Twig_Loader_Array());
-        $twig->addExtension(new GenemuFormExtension($this->getMock('Symfony\Component\Form\FormRendererInterface')));
+        $twig->addExtension(new GenemuFormExtension($this->makeMock('Symfony\Component\Form\FormRendererInterface')));
 
         $f1 = $twig->getFunction('form_javascript');
         $f2 = $twig->getFunction('form_stylesheet');
@@ -29,7 +29,7 @@ public function it_proxies_to_form_renderer()
     {
         $view = new FormView();
 
-        $renderer = $this->getMock('Symfony\Component\Form\FormRendererInterface');
+        $renderer = $this->makeMock('Symfony\Component\Form\FormRendererInterface');
         $renderer
             ->expects($this->exactly(3))
             ->method('searchAndRenderBlock')
@@ -48,12 +48,12 @@ public function it_proxies_to_form_renderer()
         call_user_func($twig->getFunction('form_stylesheet')->getCallable(), $view);
     }
 
-    protected function getMock($originalClassName)
+    private function makeMock($originalClassName)
     {
         if (method_exists($this, 'createMock')) {
             return $this->createMock($originalClassName);
         }
 
-        return parent::getMock($originalClassName);
+        return $this->getMock($originalClassName);
     }
 }