Use short array syntax

doc/cache-invalidator.rst

@@ -50,7 +50,7 @@ Invalidate a URL with added header(s)::
 
     $cacheInvalidator->invalidatePath(
         'http://www.example.com/users',
-        array('Cookie' => 'foo=bar; fizz=bang')
+        ['Cookie' => 'foo=bar; fizz=bang']
     )->flush();
 
 .. include:: includes/custom-headers.rst
@@ -75,7 +75,7 @@ Refresh a URL with added header(s)::
 
     $cacheInvalidator->refreshPath(
         'http://www.example.com/users',
-        array('Cookie' => 'foo=bar; fizz=bang')
+        ['Cookie' => 'foo=bar; fizz=bang']
     )->flush();
 
 .. include:: includes/custom-headers.rst
@@ -105,7 +105,7 @@ caching proxy::
 To invalidate all ``.png`` files on host example.com::
 
     $cacheInvalidator
-        ->invalidateRegex('.*', 'image/png', array('example.com'))
+        ->invalidateRegex('.*', 'image/png', ['example.com'])
         ->flush()
     ;
 
@@ -124,7 +124,7 @@ default headers always present to simplify the cache configuration rules.
 
 To invalidate on a custom header ``X-My-Header``, you would do::
 
-    $cacheInvalidator->invalidate(array('X-My-Header' => 'my-value'))->flush();
+    $cacheInvalidator->invalidate(['X-My-Header' => 'my-value'])->flush();
 
 .. _flush:
 

doc/invalidation-handlers.rst

@@ -36,7 +36,7 @@ With tags you can group related representations so it becomes easier to
 invalidate them. You will have to make sure your web application adds the
 correct tags on all responses. You can add tags to the handler using::
 
-    $tagHandler->addTags(array('tag-two', 'group-a'));
+    $tagHandler->addTags(['tag-two', 'group-a']);
 
 Before any content is sent out, you need to send the tag header_::
 
@@ -67,7 +67,7 @@ Assume you sent four responses:
 
 You can now invalidate some URLs using tags::
 
-    $tagHandler->invalidateTags(array('group-a', 'tag-four'));
+    $tagHandler->invalidateTags(['group-a', 'tag-four']);
 
 This will ban all requests having either the tag ``group-a`` /or/ ``tag-four``.
 In the above example, this will invalidate ``/two``, ``/three`` and ``/four``.

doc/proxy-clients.rst

@@ -75,7 +75,7 @@ Varnish runs on if it is not port 80::
 
     use FOS\HttpCache\ProxyClient\Varnish;
 
-    $servers = array('10.0.0.1', '10.0.0.2:6081'); // Port 80 assumed for 10.0.0.1
+    $servers = ['10.0.0.1', '10.0.0.2:6081']; // Port 80 assumed for 10.0.0.1
     $varnish = new Varnish($servers);
 
 This is sufficient for invalidating absolute URLs. If you also wish to
@@ -102,7 +102,7 @@ NGINX runs on if it is not the default::
 
     use FOS\HttpCache\ProxyClient\Nginx;
 
-    $servers = array('10.0.0.1', '10.0.0.2:8088'); // Port 80 assumed for 10.0.0.1
+    $servers = ['10.0.0.1', '10.0.0.2:8088']; // Port 80 assumed for 10.0.0.1
     $nginx = new Nginx($servers);
 
 This is sufficient for invalidating absolute URLs. If you also wish to
@@ -134,7 +134,7 @@ the web server runs on if it is not the default::
 
     use FOS\HttpCache\ProxyClient\Symfony;
 
-    $servers = array('10.0.0.1', '10.0.0.2:8088'); // Port 80 assumed for 10.0.0.1
+    $servers = ['10.0.0.1', '10.0.0.2:8088']; // Port 80 assumed for 10.0.0.1
     $client = new Symfony($servers);
 
 This is sufficient for invalidating absolute URLs. If you also wish to
@@ -193,7 +193,7 @@ You can specify HTTP headers as the second argument to ``purge()``.
 For instance::
 
     $client
-        ->purge('/some/path', array('X-Foo' => 'bar')
+        ->purge('/some/path', ['X-Foo' => 'bar'])
         ->flush()
     ;
 
@@ -221,7 +221,7 @@ You can specify HTTP headers as the second argument to ``refresh()``. For
 instance, to only refresh the JSON representation of an URL::
 
     $client
-        ->refresh('/some/path', array('Accept' => 'application/json')
+        ->refresh('/some/path', ['Accept' => 'application/json'])
         ->flush()
     ;
 
@@ -256,11 +256,11 @@ Varnish client::
 
     use FOS\HttpCache\ProxyClient\Varnish;
 
-    $varnish->ban(array(
+    $varnish->ban([
         Varnish::HTTP_HEADER_URL   => '.*\.png$',
         Varnish::HTTP_HEADER_HOST  => '.*example\.com',
         Varnish::HTTP_HEADER_CACHE => 'my-tag',
-    ));
+    ]);
 
 Make sure to add any headers that you want to ban on to your
 :doc:`proxy configuration <proxy-configuration>`.

doc/user-context.rst

@@ -56,10 +56,10 @@ implement at least one ContextProvider and register that with the HashGenerator:
 
     use FOS\HttpCache\UserContext\HashGenerator;
 
-    $hashGenerator = new HashGenerator(array(
+    $hashGenerator = new HashGenerator([
         new IsAuthenticatedProvider(),
         new RoleProvider(),
-    ));
+    ]);
 
 Once all providers are registered, call ``generateHash()`` to get the hash for
 the current user context.

src/EventListener/LogSubscriber.php

@@ -34,10 +34,10 @@ public function __construct(LoggerInterface $logger)
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PROXY_UNREACHABLE_ERROR => 'onProxyUnreachableError',
-            Events::PROXY_RESPONSE_ERROR    => 'onProxyResponseError'
-        );
+            Events::PROXY_RESPONSE_ERROR    => 'onProxyResponseError',
+        ];
     }
 
     public function onProxyUnreachableError(Event $event)
@@ -52,9 +52,9 @@ public function onProxyResponseError(Event $event)
 
     private function log($level, \Exception $exception)
     {
-        $context = array(
-            'exception' => $exception
-        );
+        $context = [
+            'exception' => $exception,
+        ];
 
         $this->logger->log($level, $exception->getMessage(), $context);
     }

src/ProxyClient/Symfony.php

@@ -52,9 +52,9 @@ public function __construct(
         parent::__construct($servers, $baseUrl, $httpAdapter);
 
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'purge_method' => PurgeSubscriber::DEFAULT_PURGE_METHOD,
-        ));
+        ]);
 
         $this->options = $resolver->resolve($options);
     }

src/SymfonyCache/PurgeSubscriber.php

@@ -58,11 +58,11 @@ public function __construct(array $options = [])
         } else {
             $resolver->setOptional(['purge_client_matcher', 'purge_client_ips', 'purge_method']);
         }
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'purge_client_matcher' => null,
             'purge_client_ips' => null,
             'purge_method' => static::DEFAULT_PURGE_METHOD,
-        ));
+        ]);
 
         $this->options = $resolver->resolve($options);
 
@@ -74,9 +74,9 @@ public function __construct(array $options = [])
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PRE_INVALIDATE => 'handlePurge',
-        );
+        ];
     }
 
     /**

src/SymfonyCache/RefreshSubscriber.php

@@ -45,10 +45,10 @@ class RefreshSubscriber extends AccessControlledSubscriber
     public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'refresh_client_matcher' => null,
             'refresh_client_ips' => null,
-        ));
+        ]);
         $options = $resolver->resolve($options);
 
         parent::__construct($options['refresh_client_matcher'], $options['refresh_client_ips']);
@@ -59,9 +59,9 @@ public function __construct(array $options = [])
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PRE_HANDLE => 'handleRefresh',
-        );
+        ];
     }
 
     /**

src/SymfonyCache/UserContextSubscriber.php

@@ -59,14 +59,14 @@ class UserContextSubscriber implements EventSubscriberInterface
     public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'anonymous_hash' => '38015b703d82206ebc01d17a39c727e5',
             'user_hash_accept_header' => 'application/vnd.fos.user-context-hash',
             'user_hash_header' => 'X-User-Context-Hash',
             'user_hash_uri' => '/_fos_user_context_hash',
             'user_hash_method' => 'GET',
             'session_name_prefix' => 'PHPSESSID',
-        ));
+        ]);
 
         $this->options = $resolver->resolve($options);
     }
@@ -76,9 +76,9 @@ public function __construct(array $options = [])
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PRE_HANDLE => 'preHandle',
-        );
+        ];
     }
 
     /**

src/Test/Proxy/NginxProxy.php

@@ -37,10 +37,10 @@ public function start()
     {
         $this->runCommand(
             $this->getBinary(),
-            array(
-                '-c', $this->getConfigFile() ,
-                '-g', 'pid ' . $this->pid . ';'
-            )
+            [
+                '-c', $this->getConfigFile(),
+                '-g', 'pid ' . $this->pid . ';',
+            ]
         );
 
         $this->waitFor($this->getIp(), $this->getPort(), 2000);

src/Test/Proxy/VarnishProxy.php

@@ -42,14 +42,14 @@ public function start()
     {
         $this->runCommand(
             $this->getBinary(),
-            array(
+            [
                 '-a', $this->ip . ':' . $this->getPort(),
                 '-T', $this->ip . ':' . $this->getManagementPort(),
                 '-f', $this->getConfigFile(),
                 '-n', $this->getCacheDir(),
                 '-p', 'vcl_dir=' . $this->getConfigDir(),
-                '-P', $this->pid
-            )
+                '-P', $this->pid,
+            ]
         );
 
         $this->waitFor($this->ip, $this->getPort(), 2000);

tests/Unit/CacheInvalidatorTest.php

@@ -93,10 +93,10 @@ public function testRefreshPath()
 
     public function testInvalidate()
     {
-        $headers = array(
+        $headers = [
             'X-Header' => '^value.*$',
             'Other-Header' => '^a|b|c$',
-        );
+        ];
 
         $ban = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\BanInterface')
             ->shouldReceive('ban')

tests/Unit/SymfonyCache/EventDispatchingHttpCacheTest.php

@@ -34,15 +34,15 @@ protected function getHttpCachePartialMock(array $mockedMethods = null)
         ;
 
         // Force setting options property since we can't use original constructor.
-        $options = array(
+        $options = [
             'debug' => false,
             'default_ttl' => 0,
             'private_headers' => [ 'Authorization', 'Cookie' ],
             'allow_reload' => false,
             'allow_revalidate' => false,
             'stale_while_revalidate' => 2,
             'stale_if_error' => 60,
-        );
+        ];
 
         $refHttpCache = new \ReflectionClass('Symfony\Component\HttpKernel\HttpCache\HttpCache');
         // Workaround for Symfony 2.3 where $options property is not defined.
@@ -161,10 +161,10 @@ public function __construct($test, $kernel, $request)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             Events::PRE_HANDLE => 'preHandle',
-            Events::PRE_INVALIDATE => 'preInvalidate'
-        );
+            Events::PRE_INVALIDATE => 'preInvalidate',
+        ];
     }
 
     public function preHandle(CacheEvent $event)

tests/Unit/SymfonyCache/PurgeSubscriberTest.php

@@ -131,10 +131,10 @@ public function testOtherMethod()
             ->method('isRequestAllowed')
         ;
 
-        $purgeSubscriber = new PurgeSubscriber(array(
+        $purgeSubscriber = new PurgeSubscriber([
             'purge_client_matcher' => $matcher,
             'purge_method' => 'FOO',
-        ));
+        ]);
         $request = Request::create('http://example.com/foo', 'PURGE');
         $event = new CacheEvent($this->kernel, $request);
 

tests/Unit/SymfonyCache/UserContextSubscriberTest.php

@@ -46,17 +46,17 @@ public function provideConfigOptions()
         $prop->setAccessible(true);
         $options = $prop->getValue($subscriber);
 
-        $custom = array(
+        $custom = [
             'user_hash_uri' => '/test-uri',
             'user_hash_header' => 'test/header',
             'user_hash_accept_header' => 'test accept',
             'anonymous_hash' => 'test hash',
-        );;
+        ];
 
-        return array(
+        return [
             [[], $options],
             [$custom, $custom + $options]
-        );
+        ];
     }
 
     /**
@@ -124,11 +124,11 @@ public function testUserHashUserWithSession($arg, $options)
         $catch = true;
         $sessionId1 = 'my_session_id';
         $sessionId2 = 'another_session_id';
-        $cookies = array(
+        $cookies = [
             'PHPSESSID' => $sessionId1,
             'PHPSESSIDsdiuhsdf4535d4f' => $sessionId2,
-            'foo' => 'bar'
-        );
+            'foo' => 'bar',
+        ];
         $cookieString = "PHPSESSID=$sessionId1; foo=bar; PHPSESSIDsdiuhsdf4535d4f=$sessionId2";
         $request = Request::create('/foo', 'GET', [], $cookies, [], ['Cookie' => $cookieString]);
 

tests/Unit/Test/Proxy/VarnishProxyTest.php

@@ -36,14 +36,14 @@ public function testStart()
 
         $this->assertEquals('/usr/sbin/varnishd', $proxy->command);
         $this->assertEquals(
-            array(
+            [
                 '-a', '192.168.0.1:6181',
                 '-T', '192.168.0.1:1331',
                 '-f', 'config.vcl',
                 '-n', '/tmp/cache/dir',
                 '-p', 'vcl_dir=/my/varnish/dir',
                 '-P', '/tmp/foshttpcache-varnish.pid',
-            ),
+            ],
             $proxy->arguments
         );
     }