Merge branch '1.9'

ezecosystem · Jun 2, 2017 · 0111cdb · 0111cdb
2 parents 79686de + 6135235
commit 0111cdb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Tests/Twig/TwigYuiExtensionTest.php b/Tests/Twig/TwigYuiExtensionTest.php
@@ -134,8 +134,8 @@ public function testConfig(array $modules, $filter, $expectedResult)
      */
     protected function getEnvironmentMock()
     {
-        $envMock = $this->getMock('Twig_Environment');
-        $functionMock = $this->getMock('Twig_Function');
+        $envMock = $this->getMockBuilder('Twig_Environment')->disableOriginalConstructor()->getMock();
+        $functionMock = $this->getMockBuilder('Twig_Function')->disableOriginalConstructor()->getMock();
         $envMock->expects($this->any())->method('getFunction')->will($this->returnValue($functionMock));
         $functionMock
             ->expects($this->any())