Merge pull request #320 from FriendsOfSymfony/class-constants

dbu · web-flow · commit 181a03fc9bcb · 2016-11-24T19:00:16.000+01:00
use class name constants instead of strings for mocks
diff --git a/Tests/Functional/Command/InvalidatePathCommandTest.php b/Tests/Functional/Command/InvalidatePathCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InvalidatePathCommandTest extends CommandTestCase
@@ -20,7 +21,7 @@ public function testExecute()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidatePath')->once()->with('http://example.com/my/path')
@@ -37,7 +38,7 @@ public function testExecuteVerbose()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidatePath')->once()->with('http://example.com/my/path')
diff --git a/Tests/Functional/Command/InvalidateRegexCommandTest.php b/Tests/Functional/Command/InvalidateRegexCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InvalidateRegexCommandTest extends CommandTestCase
@@ -20,7 +21,7 @@ public function testExecute()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidateRegex')->once()->with('/my.*/path')
@@ -36,7 +37,7 @@ public function testExecuteVerbose()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidateRegex')->once()->with('/my.*/path')
diff --git a/Tests/Functional/Command/InvalidateTagCommandTest.php b/Tests/Functional/Command/InvalidateTagCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InvalidateTagCommandTest extends CommandTestCase
@@ -20,7 +21,7 @@ public function testExecute()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidate')->once()->with(array('X-Cache-Tags' => '(my\\-tag|other\\-tag)(,.+)?$'))
@@ -36,7 +37,7 @@ public function testExecuteVerbose()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidate')->once()->with(array('X-Cache-Tags' => '(my\\-tag|other\\-tag)(,.+)?$'))
diff --git a/Tests/Functional/Command/RefreshPathCommandTest.php b/Tests/Functional/Command/RefreshPathCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RefreshPathCommandTest extends CommandTestCase
@@ -20,7 +21,7 @@ public function testExecute()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('refreshPath')->once()->with('http://example.com/my/path')
@@ -37,7 +38,7 @@ public function testExecuteVerbose()
         $client = self::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('refreshPath')->once()->with('http://example.com/my/path')
diff --git a/Tests/Functional/EventListener/InvalidationListenerTest.php b/Tests/Functional/EventListener/InvalidationListenerTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\EventListener;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class InvalidationListenerTest extends WebTestCase
@@ -21,7 +22,7 @@ public function testInvalidateRoute()
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidateRoute')->once()->with('test_noncached', array())
@@ -42,7 +43,7 @@ public function testInvalidatePath($statusCode)
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidatePath')->once()->with('/cached')
@@ -61,7 +62,7 @@ public function testErrorIsNotInvalidated()
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidatePath')->never()
diff --git a/Tests/Functional/EventListener/TagListenerTest.php b/Tests/Functional/EventListener/TagListenerTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\EventListener;
 
+use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class TagListenerTest extends WebTestCase
@@ -34,7 +35,7 @@ public function testAnnotationTagsAreInvalidated()
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidate')->with(array('X-Cache-Tags' => '(all\\-items)(,.+)?$'))
@@ -51,7 +52,7 @@ public function testErrorIsNotInvalidated()
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidate')->never()
@@ -76,7 +77,7 @@ public function testConfigurationTagsAreInvalidated()
 
         $client->getContainer()->mock(
             'fos_http_cache.cache_manager',
-            '\FOS\HttpCacheBundle\CacheManager'
+            CacheManager::class
         )
             ->shouldReceive('supports')->andReturn(true)
             ->shouldReceive('invalidate')->once()->with(array('X-Cache-Tags' => '(area|area\\-51)(,.+)?$'))
diff --git a/Tests/Functional/Fixtures/app/AppKernel.php b/Tests/Functional/Fixtures/app/AppKernel.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use FOS\HttpCacheBundle\Tests\Functional\Fixtures\Session\TestSessionStorage;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
@@ -77,7 +78,7 @@ protected function prepareContainer(\Symfony\Component\DependencyInjection\Conta
 
         $container->setDefinition(
             'session.test_storage',
-            new \Symfony\Component\DependencyInjection\Definition('FOS\HttpCacheBundle\Tests\Functional\Fixtures\Session\TestSessionStorage')
+            new \Symfony\Component\DependencyInjection\Definition(TestSessionStorage::class)
         );
     }
 }
diff --git a/Tests/Functional/Security/Http/Logout/ContextInvalidationLogoutHandlerTest.php b/Tests/Functional/Security/Http/Logout/ContextInvalidationLogoutHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Security\Http\Logout;
 
+use FOS\HttpCache\ProxyClient\Varnish;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
 
@@ -21,7 +22,7 @@ public function testLogout()
         $client = static::createClient();
         $client->getContainer()->mock(
             'fos_http_cache.proxy_client.varnish',
-            '\FOS\HttpCache\ProxyClient\Varnish'
+            Varnish::class
         )
             ->shouldReceive('ban')->once()->with(array('accept' => 'application/vnd.fos.user-context-hash', 'Cookie' => '.*test.*'))
             ->shouldReceive('ban')->once()->with(array('accept' => 'application/vnd.fos.user-context-hash', 'Authorization' => '.*test.*'))
diff --git a/Tests/Functional/Test/ProxyTestCaseAnnotationTest.php b/Tests/Functional/Test/ProxyTestCaseAnnotationTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Test;
 
+use FOS\HttpCache\Test\Proxy\VarnishProxy;
 use FOS\HttpCacheBundle\Test\ProxyTestCase;
 
 class ProxyTestCaseAnnotationTest extends ProxyTestCase
@@ -19,7 +20,7 @@ protected function setUp()
     {
         static::getContainer()->mock(
             'fos_http_cache.test.default_proxy_server',
-            '\FOS\HttpCache\Test\Proxy\VarnishProxy'
+            VarnishProxy::class
         )
             ->shouldReceive('clear')->once()
         ;
diff --git a/Tests/Functional/Test/ProxyTestCaseTest.php b/Tests/Functional/Test/ProxyTestCaseTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Functional\Test;
 
+use FOS\HttpCache\Test\Proxy\VarnishProxy;
 use FOS\HttpCacheBundle\Test\ProxyTestCase;
 
 class ProxyTestCaseTest extends ProxyTestCase
@@ -19,7 +20,7 @@ protected function setUp()
     {
         static::getContainer()->mock(
             'fos_http_cache.test.default_proxy_server',
-            '\FOS\HttpCache\Test\Proxy\VarnishProxy'
+            VarnishProxy::class
         );
 
         parent::setUp();
diff --git a/Tests/Unit/CacheManagerTest.php b/Tests/Unit/CacheManagerTest.php
@@ -11,6 +11,10 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit;
 
+use FOS\HttpCache\ProxyClient\Invalidation\BanInterface;
+use FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface;
+use FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface;
+use FOS\HttpCache\ProxyClient\ProxyClientInterface;
 use FOS\HttpCacheBundle\CacheManager;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -21,12 +25,12 @@ class CacheManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->proxyClient = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
+        $this->proxyClient = \Mockery::mock(ProxyClientInterface::class);
     }
 
     public function testInvalidateRoute()
     {
-        $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface')
+        $httpCache = \Mockery::mock(PurgeInterface::class)
             ->shouldReceive('purge')->once()->with('/my/route', array())
             ->shouldReceive('purge')->once()->with('/route/with/params/id/123', array())
             ->shouldReceive('purge')->once()->with('/route/with/params/id/123', array('X-Foo' => 'bar'))
@@ -53,7 +57,7 @@ public function testInvalidateRoute()
 
     public function testRefreshRoute()
     {
-        $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface')
+        $httpCache = \Mockery::mock(RefreshInterface::class)
             ->shouldReceive('refresh')->once()->with('/my/route', null)
             ->shouldReceive('refresh')->once()->with('/route/with/params/id/123', null)
             ->shouldReceive('refresh')->once()->with('/route/with/params/id/123', array('X-Foo' => 'bar'))
@@ -84,8 +88,8 @@ public function testRefreshRoute()
      */
     public function testTagResponse()
     {
-        $ban = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\BanInterface');
-        $router = \Mockery::mock('\Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+        $ban = \Mockery::mock(BanInterface::class);
+        $router = \Mockery::mock(UrlGeneratorInterface::class);
 
         $tags1 = array('post-1', 'posts');
         $tags2 = array('post-2');
diff --git a/Tests/Unit/Command/BaseInvalidateCommandTest.php b/Tests/Unit/Command/BaseInvalidateCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use FOS\HttpCacheBundle\Command\InvalidatePathCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -19,7 +20,7 @@ class BaseInvalidateCommandTest extends \PHPUnit_Framework_TestCase
 {
     public function testContainerAccess()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\CacheManager')
+        $invalidator = \Mockery::mock(CacheManager::class)
             ->shouldReceive('invalidatePath')->once()->with('/my/path')
             ->shouldReceive('invalidatePath')->once()->with('/other/path')
             ->shouldReceive('invalidatePath')->once()->with('/another')
diff --git a/Tests/Unit/Command/InvalidatePathCommandTest.php b/Tests/Unit/Command/InvalidatePathCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use FOS\HttpCacheBundle\Command\InvalidatePathCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -22,7 +23,7 @@ class InvalidatePathCommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecuteMissingParameters()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\CacheManager');
+        $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();
         $application->add(new InvalidatePathCommand($invalidator));
@@ -34,7 +35,7 @@ public function testExecuteMissingParameters()
 
     public function testExecuteParameter()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\CacheManager')
+        $invalidator = \Mockery::mock(CacheManager::class)
             ->shouldReceive('invalidatePath')->once()->with('/my/path')
             ->shouldReceive('invalidatePath')->once()->with('/other/path')
             ->getMock()
diff --git a/Tests/Unit/Command/InvalidateRegexCommandTest.php b/Tests/Unit/Command/InvalidateRegexCommandTest.php
@@ -11,6 +11,7 @@
 
 namespace FOS\HttpCacheBundle\Tests\Unit\Command;
 
+use FOS\HttpCacheBundle\CacheManager;
 use FOS\HttpCacheBundle\Command\InvalidateRegexCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -22,7 +23,7 @@ class InvalidateRegexCommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecuteNoParameters()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\CacheManager');
+        $invalidator = \Mockery::mock(CacheManager::class);
 
         $application = new Application();
         $application->add(new InvalidateRegexCommand($invalidator));
@@ -34,7 +35,7 @@ public function testExecuteNoParameters()
 
     public function testExecuteParameter()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\CacheManager')
+        $invalidator = \Mockery::mock(CacheManager::class)
             ->shouldReceive('invalidateRegex')->once()->with('/my.*/path')
             ->getMock()
         ;
diff --git a/Tests/Unit/Command/InvalidateTagCommandTest.php b/Tests/Unit/Command/InvalidateTagCommandTest.php
@@ -12,6 +12,7 @@
 namespace FOS\HttpCacheBundle\Tests\Unit\Command;
 
 use FOS\HttpCacheBundle\Command\InvalidateTagCommand;
+use FOS\HttpCacheBundle\Handler\TagHandler;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -22,7 +23,7 @@ class InvalidateTagCommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecuteMissingParameters()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\Handler\TagHandler');
+        $invalidator = \Mockery::mock(TagHandler::class);
 
         $application = new Application();
         $application->add(new InvalidateTagCommand($invalidator));
@@ -34,7 +35,7 @@ public function testExecuteMissingParameters()
 
     public function testExecuteParameter()
     {
-        $invalidator = \Mockery::mock('\FOS\HttpCacheBundle\Handler\TagHandler')
+        $invalidator = \Mockery::mock(TagHandler::class)
             ->shouldReceive('invalidateTags')->once()->with(array('my-tag'))
             ->getMock()
         ;
diff --git a/Tests/Unit/Command/RefreshPathCommandTest.php b/Tests/Unit/Command/RefreshPathCommandTest.php
diff --git a/Tests/Unit/EventListener/CacheControlListenerTest.php b/Tests/Unit/EventListener/CacheControlListenerTest.php
diff --git a/Tests/Unit/EventListener/InvalidationListenerTest.php b/Tests/Unit/EventListener/InvalidationListenerTest.php
diff --git a/Tests/Unit/EventListener/TagListenerTest.php b/Tests/Unit/EventListener/TagListenerTest.php
diff --git a/Tests/Unit/EventListener/UserContextListenerTest.php b/Tests/Unit/EventListener/UserContextListenerTest.php
diff --git a/Tests/Unit/HttpCacheTest.php b/Tests/Unit/HttpCacheTest.php
diff --git a/Tests/Unit/SymfonyCache/EventDispatchingHttpCacheTest.php b/Tests/Unit/SymfonyCache/EventDispatchingHttpCacheTest.php

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
	`12`	`+use FOS\HttpCacheBundle\Tests\Functional\Fixtures\Session\TestSessionStorage;`
`12`	`13`	`use Symfony\Component\Config\Loader\LoaderInterface;`
`13`	`14`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`14`	`15`	`use Symfony\Component\HttpKernel\Kernel;`
`@@ -77,7 +78,7 @@ protected function prepareContainer(\Symfony\Component\DependencyInjection\Conta`
`77`	`78`
`78`	`79`	`$container->setDefinition(`
`79`	`80`	`'session.test_storage',`
`80`		`- new \Symfony\Component\DependencyInjection\Definition('FOS\HttpCacheBundle\Tests\Functional\Fixtures\Session\TestSessionStorage')`
	`81`	`+ new \Symfony\Component\DependencyInjection\Definition(TestSessionStorage::class)`
`81`	`82`	`);`
`82`	`83`	`}`
`83`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace FOS\HttpCacheBundle\Tests\Functional\Test;`
`13`	`13`
	`14`	`+use FOS\HttpCache\Test\Proxy\VarnishProxy;`
`14`	`15`	`use FOS\HttpCacheBundle\Test\ProxyTestCase;`
`15`	`16`
`16`	`17`	`class ProxyTestCaseAnnotationTest extends ProxyTestCase`
`@@ -19,7 +20,7 @@ protected function setUp()`
`19`	`20`	`{`
`20`	`21`	`static::getContainer()->mock(`
`21`	`22`	`'fos_http_cache.test.default_proxy_server',`
`22`		`- '\FOS\HttpCache\Test\Proxy\VarnishProxy'`
	`23`	`+ VarnishProxy::class`
`23`	`24`	`)`
`24`	`25`	`->shouldReceive('clear')->once()`
`25`	`26`	`;`