Merge pull request #914 from xabbuh/fix-tests

fix ContainerBuilder mock generation in tests
FriendsOfSymfony · Dec 1, 2014 · 221ceea · 221ceea
2 parents c8bcd83 + e7e3872
commit 221ceea
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/Tests/DependencyInjection/Compiler/ConfigurationCheckPassTest.php b/Tests/DependencyInjection/Compiler/ConfigurationCheckPassTest.php
@@ -25,7 +25,9 @@ class ConfigurationCheckPassTest extends \PHPUnit_Framework_TestCase
      */
     public function testShouldThrowRuntimeExceptionWhenFOSRestBundleAnnotations()
     {
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
+            ->setMethods(array('has'))
+            ->getMock();
         $container->expects($this->at(0))
             ->method('has')
             ->with($this->equalTo('sensio_framework_extra.view.listener'))
@@ -46,7 +48,9 @@ public function testShouldThrowRuntimeExceptionWhenBodyConverterIsEnabledButPara
             'RuntimeException',
             'You need to enable the parameter converter listeners in SensioFrameworkExtraBundle when using the FOSRestBundle RequestBodyParamConverter'
         );
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
+            ->setMethods(array('has'))
+            ->getMock();
         $container->expects($this->at(1))
             ->method('has')
             ->with($this->equalTo('fos_rest.converter.request_body'))

diff --git a/Tests/DependencyInjection/Compiler/FormatListenerRulesPassTest.php b/Tests/DependencyInjection/Compiler/FormatListenerRulesPassTest.php
@@ -22,7 +22,9 @@ public function testRulesAreAddedWhenFormatListenerAndProfilerToolbarAreEnabled(
     {
         $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition', array('addMethod'));
 
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
+            ->setMethods(array('hasDefinition', 'getDefinition', 'hasParameter', 'getParameter'))
+            ->getMock();
 
         $container->expects($this->exactly(3))
             ->method('hasDefinition')
@@ -62,7 +64,9 @@ public function testNoRulesAreAddedWhenProfilerToolbarAreDisabled()
     {
         $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition', array('addMethod'));
 
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
+            ->setMethods(array('hasDefinition', 'getDefinition', 'hasParameter', 'getParameter'))
+            ->getMock();
 
         $container->expects($this->exactly(2))
             ->method('hasDefinition')

diff --git a/Tests/FOSRestBundleTest.php b/Tests/FOSRestBundleTest.php
@@ -22,7 +22,9 @@ class FOSRestBundleTest extends \PHPUnit_Framework_TestCase
 {
     public function testBuild()
     {
-        $container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerBuilder')
+            ->setMethods(array('addCompilerPass'))
+            ->getMock();
         $container->expects($this->exactly(3))
             ->method('addCompilerPass')
             ->with($this->isInstanceOf('\Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface'));

diff --git a/Tests/Routing/Loader/LoaderTest.php b/Tests/Routing/Loader/LoaderTest.php
@@ -61,6 +61,7 @@ protected function getControllerLoader(array $formats = array())
         if ($this->containerMock === null) {
             $this->containerMock = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
                 ->disableOriginalConstructor()
+                ->setMethods(array('get', 'has'))
                 ->getMock();
         }
         $l = $this->getMockBuilder('Symfony\Component\Config\FileLocator')

diff --git a/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php b/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php
@@ -153,6 +153,7 @@ public function testControllerAsServiceWithClassName()
         // We register the controller in the fake container by its class name
         $this->containerMock = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
             ->disableOriginalConstructor()
+            ->setMethods(array('has', 'get', 'enterScope', 'leaveScope'))
             ->getMock();
         $this->containerMock->expects($this->any())
             ->method('has')

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+    <php>
+        <!-- Disable E_USER_DEPRECATED until 3.0 -->
+        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
 
     <testsuites>
         <testsuite name="FOSRestBundle test suite">