Merge pull request #347 from FriendsOfSymfony/style

dbu · web-flow · commit 58f763c40590 · 2017-02-02T08:39:34.000+01:00
additional style instructions
diff --git a/.styleci.yml b/.styleci.yml
@@ -1 +1,5 @@
 preset: symfony
+
+enabled:
+  - alpha_ordered_imports
+  - short_array_syntax
diff --git a/src/CacheInvalidator.php b/src/CacheInvalidator.php
@@ -16,11 +16,11 @@
 use FOS\HttpCache\Exception\ProxyResponseException;
 use FOS\HttpCache\Exception\ProxyUnreachableException;
 use FOS\HttpCache\Exception\UnsupportedProxyOperationException;
-use FOS\HttpCache\ProxyClient\ProxyClient;
-use FOS\HttpCache\ProxyClient\Invalidation\TagCapable;
 use FOS\HttpCache\ProxyClient\Invalidation\BanCapable;
 use FOS\HttpCache\ProxyClient\Invalidation\PurgeCapable;
 use FOS\HttpCache\ProxyClient\Invalidation\RefreshCapable;
+use FOS\HttpCache\ProxyClient\Invalidation\TagCapable;
+use FOS\HttpCache\ProxyClient\ProxyClient;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
diff --git a/src/ProxyClient/MultiplexerClient.php b/src/ProxyClient/MultiplexerClient.php
@@ -138,7 +138,7 @@ public function invalidateTags(array $tags)
      *
      * @return $this
      */
-    public function purge($url, array $headers = array())
+    public function purge($url, array $headers = [])
     {
         $this->invoke(PurgeCapable::class, 'purge', [$url, $headers]);
 
diff --git a/src/ResponseTagger.php b/src/ResponseTagger.php
@@ -51,14 +51,14 @@ class ResponseTagger
      * @param TagCapable $proxyClient
      * @param array      $options
      */
-    public function __construct(TagCapable $proxyClient, array $options = array())
+    public function __construct(TagCapable $proxyClient, array $options = [])
     {
         $this->proxyClient = $proxyClient;
 
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'strict' => false,
-        ));
+        ]);
 
         $resolver->setAllowedTypes('strict', 'bool');
 
diff --git a/src/SymfonyCache/CustomTtlListener.php b/src/SymfonyCache/CustomTtlListener.php
@@ -98,9 +98,9 @@ public function cleanResponse(CacheEvent $e)
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PRE_STORE => 'useCustomTtl',
             Events::POST_HANDLE => 'cleanResponse',
-        );
+        ];
     }
 }
diff --git a/src/Test/EventDispatchingHttpCacheTestCase.php b/src/Test/EventDispatchingHttpCacheTestCase.php
@@ -11,9 +11,9 @@
 
 namespace FOS\HttpCache\Test;
 
+use FOS\HttpCache\SymfonyCache\CacheEvent;
 use FOS\HttpCache\SymfonyCache\CacheInvalidation;
 use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
-use FOS\HttpCache\SymfonyCache\CacheEvent;
 use FOS\HttpCache\SymfonyCache\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Test/HttpClient.php b/src/Test/HttpClient.php
@@ -11,10 +11,10 @@
 
 namespace FOS\HttpCache\Test;
 
+use Http\Client\HttpClient as PhpHttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Discovery\UriFactoryDiscovery;
-use Http\Client\HttpClient as PhpHttpClient;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
diff --git a/tests/Functional/Fixtures/Symfony/AppCache.php b/tests/Functional/Fixtures/Symfony/AppCache.php
@@ -13,13 +13,13 @@
 
 use FOS\HttpCache\SymfonyCache\CacheInvalidation;
 use FOS\HttpCache\SymfonyCache\CustomTtlListener;
-use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use FOS\HttpCache\SymfonyCache\DebugListener;
+use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
 use FOS\HttpCache\SymfonyCache\PurgeListener;
 use FOS\HttpCache\SymfonyCache\RefreshListener;
 use FOS\HttpCache\SymfonyCache\UserContextListener;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpKernel\HttpCache\StoreInterface;
 use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -28,7 +28,7 @@ class AppCache extends HttpCache implements CacheInvalidation
 {
     use EventDispatchingHttpCache;
 
-    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = array())
+    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = [])
     {
         parent::__construct($kernel, $store, $surrogate, $options);
 
diff --git a/tests/Unit/ProxyClient/HttpDispatcherTest.php b/tests/Unit/ProxyClient/HttpDispatcherTest.php
@@ -17,13 +17,13 @@
 use FOS\HttpCache\Exception\ProxyUnreachableException;
 use FOS\HttpCache\ProxyClient\HttpDispatcher;
 use Http\Client\Exception\HttpException;
+use Http\Client\Exception\RequestException;
 use Http\Client\HttpAsyncClient;
+use Http\Discovery\MessageFactoryDiscovery;
 use Http\Discovery\UriFactoryDiscovery;
 use Http\Message\MessageFactory;
 use Http\Message\UriFactory;
 use Http\Mock\Client;
-use Http\Client\Exception\RequestException;
-use Http\Discovery\MessageFactoryDiscovery;
 use Http\Promise\Promise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/Unit/ResponseTaggerTest.php b/tests/Unit/ResponseTaggerTest.php
@@ -11,11 +11,11 @@
 
 namespace FOS\HttpCache\Tests\Unit;
 
+use FOS\HttpCache\Exception\InvalidTagException;
 use FOS\HttpCache\ProxyClient\HttpDispatcher;
 use FOS\HttpCache\ProxyClient\Invalidation\TagCapable;
-use FOS\HttpCache\ResponseTagger;
 use FOS\HttpCache\ProxyClient\Varnish;
-use FOS\HttpCache\Exception\InvalidTagException;
+use FOS\HttpCache\ResponseTagger;
 use Psr\Http\Message\ResponseInterface;
 
 class ResponseTaggerTest extends \PHPUnit_Framework_TestCase
@@ -104,10 +104,10 @@ public function testStrictEmptyTag()
         $httpAdapter = new HttpDispatcher(['localhost'], 'localhost');
         $proxyClient = new Varnish($httpAdapter);
 
-        $tagHandler = new ResponseTagger($proxyClient, array('strict' => true));
+        $tagHandler = new ResponseTagger($proxyClient, ['strict' => true]);
 
         try {
-            $tagHandler->addTags(array('post-1', false));
+            $tagHandler->addTags(['post-1', false]);
             $this->fail('Expected exception');
         } catch (InvalidTagException $e) {
             // success
@@ -124,7 +124,7 @@ public function testNonStrictEmptyTag()
             ->getMock();
 
         $tagHandler = new ResponseTagger($proxyClient);
-        $tagHandler->addTags(array('post-1', false, null, ''));
+        $tagHandler->addTags(['post-1', false, null, '']);
         $this->assertTrue($tagHandler->hasTags());
         $this->assertEquals('post-1', $tagHandler->getTagsHeaderValue());
     }
diff --git a/tests/Unit/SymfonyCache/CustomTtlListenerTest.php b/tests/Unit/SymfonyCache/CustomTtlListenerTest.php
@@ -34,10 +34,10 @@ public function testCustomTtl()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Reverse-Proxy-TTL' => '120',
             'Cache-Control' => 's-maxage=60, max-age=30',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->useCustomTtl($event);
@@ -52,10 +52,10 @@ public function testCustomTtlNoSmaxage()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Reverse-Proxy-TTL' => '120',
             'Cache-Control' => 'max-age=30',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->useCustomTtl($event);
@@ -70,9 +70,9 @@ public function testNoCustomTtl()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'Cache-Control' => 'max-age=30, s-maxage=33',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->useCustomTtl($event);
@@ -87,11 +87,11 @@ public function testCleanup()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Reverse-Proxy-TTL' => '120',
             'Cache-Control' => 's-maxage=120, max-age=30',
             CustomTtlListener::SMAXAGE_BACKUP => '60',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->cleanResponse($event);
@@ -108,11 +108,11 @@ public function testCleanupNoSmaxage()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Reverse-Proxy-TTL' => '120',
             'Cache-Control' => 's-maxage=120, max-age=30',
             CustomTtlListener::SMAXAGE_BACKUP => 'false',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->cleanResponse($event);
@@ -128,9 +128,9 @@ public function testCleanupNoCustomTtl()
     {
         $ttlListener = new CustomTtlListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'Cache-Control' => 's-maxage=60, max-age=30',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $ttlListener->cleanResponse($event);
diff --git a/tests/Unit/SymfonyCache/DebugListenerTest.php b/tests/Unit/SymfonyCache/DebugListenerTest.php
@@ -33,9 +33,9 @@ public function testDebugHit()
     {
         $debugListener = new DebugListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Symfony-Cache' => '... fresh ...',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $debugListener->handleDebug($event);
@@ -49,9 +49,9 @@ public function testDebugMiss()
     {
         $debugListener = new DebugListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Symfony-Cache' => '... miss ...',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $debugListener->handleDebug($event);
@@ -65,9 +65,9 @@ public function testDebugUndefined()
     {
         $debugListener = new DebugListener();
         $request = Request::create('http://example.com/foo', 'GET');
-        $response = new Response('', 200, array(
+        $response = new Response('', 200, [
             'X-Symfony-Cache' => '... foobar ...',
-        ));
+        ]);
         $event = new CacheEvent($this->kernel, $request, $response);
 
         $debugListener->handleDebug($event);
diff --git a/tests/Unit/Test/NginxTestTest.php b/tests/Unit/Test/NginxTestTest.php
@@ -11,8 +11,8 @@
 
 namespace FOS\HttpCache\Tests\Unit\Test\Proxy;
 
-use FOS\HttpCache\Test\Proxy\NginxProxy;
 use FOS\HttpCache\Test\NginxTest;
+use FOS\HttpCache\Test\Proxy\NginxProxy;
 
 class NginxTestTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function invalidateTags(array $tags)`
`138`	`138`	`*`
`139`	`139`	`* @return $this`
`140`	`140`	`*/`
`141`		`- public function purge($url, array $headers = array())`
	`141`	`+ public function purge($url, array $headers = [])`
`142`	`142`	`{`
`143`	`143`	`$this->invoke(PurgeCapable::class, 'purge', [$url, $headers]);`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,9 @@ public function cleanResponse(CacheEvent $e)`
`98`	`98`	`*/`
`99`	`99`	`public static function getSubscribedEvents()`
`100`	`100`	`{`
`101`		`- return array(`
	`101`	`+ return [`
`102`	`102`	`Events::PRE_STORE => 'useCustomTtl',`
`103`	`103`	`Events::POST_HANDLE => 'cleanResponse',`
`104`		`- );`
	`104`	`+ ];`
`105`	`105`	`}`
`106`	`106`	`}`