minor #424 Remove usage of deprecated PHUnit mocking APIs (stof)

This PR was merged into the 2.8-dev branch.

Discussion
----------

Remove usage of deprecated PHUnit mocking APIs

Commits
-------

1ddc07b Remove usage of deprecated PHUnit mocking APIs

Tests/Command/DumpCommandTest.php

@@ -49,9 +49,9 @@ protected function setUp()
         $this->definition = $this->getMockBuilder('Symfony\\Component\\Console\\Input\\InputDefinition')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
-        $this->helperSet = $this->getMock('Symfony\\Component\\Console\\Helper\\HelperSet');
-        $this->container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
+        $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
+        $this->helperSet = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\HelperSet')->getMock();
+        $this->container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
         $this->am = $this->getMockBuilder('Assetic\\Factory\\LazyAssetManager')
             ->disableOriginalConstructor()
             ->getMock();
@@ -120,7 +120,7 @@ public function testEmptyAssetManager()
 
     public function testDumpOne()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $this->am->expects($this->once())
             ->method('getNames')
@@ -161,8 +161,8 @@ public function testDumpOne()
 
     public function testDumpDebug()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetCollection');
-        $leaf = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetCollection')->getMock();
+        $leaf = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $this->am->expects($this->once())
             ->method('getNames')

Tests/Controller/AsseticControllerTest.php

@@ -27,13 +27,13 @@ protected function setUp()
             $this->markTestSkipped('Assetic is not available.');
         }
 
-        $this->request = $this->getMock('Symfony\\Component\\HttpFoundation\\Request', array('getETags', 'getMethod'));
-        $this->headers = $this->getMock('Symfony\\Component\\HttpFoundation\\ParameterBag');
+        $this->request = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\Request')->setMethods(array('getETags', 'getMethod'))->getMock();
+        $this->headers = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\ParameterBag')->getMock();
         $this->request->headers = $this->headers;
         $this->am = $this->getMockBuilder('Assetic\\Factory\\LazyAssetManager')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->cache = $this->getMock('Assetic\\Cache\\CacheInterface');
+        $this->cache = $this->getMockBuilder('Assetic\\Cache\\CacheInterface')->getMock();
 
         $this->request->expects($this->any())
             ->method('getMethod')
@@ -58,7 +58,7 @@ public function testRenderNotFound()
 
     public function testRenderLastModifiedFresh()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $name = 'foo';
         $lastModified = strtotime('2010-10-10 10:10:10');
@@ -93,7 +93,7 @@ public function testRenderLastModifiedFresh()
 
     public function testRenderLastModifiedStale()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $name = 'foo';
         $content = '==ASSET_CONTENT==';
@@ -135,7 +135,7 @@ public function testRenderLastModifiedStale()
 
     public function testRenderETagFresh()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $name = 'foo';
         $formula = array(array('js/core.js'), array(), array(''));
@@ -173,7 +173,7 @@ public function testRenderETagFresh()
 
     public function testRenderETagStale()
     {
-        $asset = $this->getMock('Assetic\\Asset\\AssetInterface');
+        $asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
 
         $name = 'foo';
         $content = '==ASSET_CONTENT==';

Tests/DependencyInjection/AsseticExtensionTest.php

@@ -56,7 +56,7 @@ protected function setUp()
             $this->markTestSkipped('Twig is not available.');
         }
 
-        $this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
+        $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
         // Symfony 2.3 BC

Tests/Factory/AssetFactoryTest.php

@@ -26,16 +26,16 @@ protected function setUp()
             $this->markTestSkipped('Assetic is not available.');
         }
 
-        $this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
-        $this->container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
-        $this->parameterBag = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBagInterface');
+        $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
+        $this->container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
+        $this->parameterBag = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBagInterface')->getMock();
         $this->factory = new AssetFactory($this->kernel, $this->container, $this->parameterBag, '/path/to/web');
     }
 
     public function testBundleNotation()
     {
         $input = '@MyBundle/Resources/css/main.css';
-        $bundle = $this->getMock('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface');
+        $bundle = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface')->getMock();
 
         $this->parameterBag->expects($this->once())
             ->method('resolveValue')
@@ -64,7 +64,7 @@ public function testBundleNotation()
      */
     public function testBundleGlobNotation($input)
     {
-        $bundle = $this->getMock('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface');
+        $bundle = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface')->getMock();
 
         $this->parameterBag->expects($this->once())
             ->method('resolveValue')

Tests/Factory/Resource/CoalescingDirectoryResourceTest.php

@@ -17,13 +17,13 @@ class CoalescingDirectoryResourceTest extends \PHPUnit_Framework_TestCase
 {
     public function testFiltering()
     {
-        $dir1 = $this->getMock('Assetic\\Factory\\Resource\\IteratorResourceInterface');
-        $file1a = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
-        $file1b = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
+        $dir1 = $this->getMockBuilder('Assetic\\Factory\\Resource\\IteratorResourceInterface')->getMock();
+        $file1a = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
+        $file1b = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
 
-        $dir2 = $this->getMock('Assetic\\Factory\\Resource\\IteratorResourceInterface');
-        $file2a = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
-        $file2c = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
+        $dir2 = $this->getMockBuilder('Assetic\\Factory\\Resource\\IteratorResourceInterface')->getMock();
+        $file2a = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
+        $file2c = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
 
         $dir1->expects($this->any())
             ->method('getIterator')

Tests/Factory/Resource/FileResourceTest.php

@@ -19,7 +19,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->loader = $this->getMock('Symfony\\Component\\Templating\\Loader\\LoaderInterface');
+        $this->loader = $this->getMockBuilder('Symfony\\Component\\Templating\\Loader\\LoaderInterface')->getMock();
     }
 
     public function testCastAsString()

Tests/FilterManagerTest.php

@@ -24,8 +24,8 @@ protected function setUp()
 
     public function testGet()
     {
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
-        $filter = $this->getMock('Assetic\\Filter\\FilterInterface');
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
+        $filter = $this->getMockBuilder('Assetic\\Filter\\FilterInterface')->getMock();
 
         $container->expects($this->exactly(2))
             ->method('get')
@@ -40,16 +40,16 @@ public function testGet()
 
     public function testHas()
     {
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
 
         $fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
         $this->assertTrue($fm->has('foo'), '->has() returns true for lazily mapped filters');
     }
 
     public function testGetNames()
     {
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
-        $filter = $this->getMock('Assetic\\Filter\\FilterInterface');
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
+        $filter = $this->getMockBuilder('Assetic\\Filter\\FilterInterface')->getMock();
 
         $fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
         $fm->set('bar', $filter);