Merge branch '1.3'

* 1.3:
  removed obsolete dep
  removed usage of obsolete PHPUnit method

tests/Silex/Tests/ApplicationTest.php

@@ -458,7 +458,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testRegisterShouldReturnSelf()
     {
         $app = new Application();
-        $provider = $this->getMock('Pimple\ServiceProviderInterface');
+        $provider = $this->getMockBuilder('Pimple\ServiceProviderInterface')->getMock();
 
         $this->assertSame($app, $app->register($provider));
     }

tests/Silex/Tests/EventListener/LogListenerTest.php

@@ -32,7 +32,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
 {
     public function testRequestListener()
     {
-        $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
         $logger
             ->expects($this->once())
             ->method('log')
@@ -42,7 +42,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new LogListener($logger));
 
-        $kernel = $this->getMock('Symfony\\Component\\HttpKernel\\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')->getMock();
 
         $dispatcher->dispatch(KernelEvents::REQUEST, new GetResponseEvent($kernel, Request::create('/subrequest'), HttpKernelInterface::SUB_REQUEST), 'Skip sub requests');
 
@@ -51,7 +51,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
 
     public function testResponseListener()
     {
-        $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
         $logger
             ->expects($this->once())
             ->method('log')
@@ -61,7 +61,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new LogListener($logger));
 
-        $kernel = $this->getMock('Symfony\\Component\\HttpKernel\\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')->getMock();
 
         $dispatcher->dispatch(KernelEvents::RESPONSE, new FilterResponseEvent($kernel, Request::create('/foo'), HttpKernelInterface::SUB_REQUEST, Response::create('subrequest', 200)), 'Skip sub requests');
 
@@ -70,7 +70,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
 
     public function testExceptionListener()
     {
-        $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
         $logger
             ->expects($this->at(0))
             ->method('log')
@@ -85,7 +85,7 @@ class LogListenerTest extends \PHPUnit_Framework_TestCase
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new LogListener($logger));
 
-        $kernel = $this->getMock('Symfony\\Component\\HttpKernel\\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')->getMock();
 
         $dispatcher->dispatch(KernelEvents::EXCEPTION, new GetResponseForExceptionEvent($kernel, Request::create('/foo'), HttpKernelInterface::SUB_REQUEST, new \RuntimeException('Fatal error')));
         $dispatcher->dispatch(KernelEvents::EXCEPTION, new GetResponseForExceptionEvent($kernel, Request::create('/foo'), HttpKernelInterface::SUB_REQUEST, new HttpException(400, 'Http error')));

tests/Silex/Tests/Provider/TwigServiceProviderTest.php

@@ -48,7 +48,7 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase
         $app->register(new TwigServiceProvider(), array(
             'twig.templates' => array('foo' => 'foo'),
         ));
-        $loader = $this->getMock('\Twig_LoaderInterface');
+        $loader = $this->getMockBuilder('\Twig_LoaderInterface')->getMock();
         $loader->expects($this->never())->method('getSource');
         $app['twig.loader.filesystem'] = function ($app) use ($loader) {
             return $loader;