Consistently use [] array syntax

hacfi · hacfi · commit 4875ae9a488a · 2015-01-08T12:40:23.000+01:00
diff --git a/src/Docker/Container.php b/src/Docker/Container.php
@@ -29,12 +29,12 @@ class Container
     /**
      * @var array
      */
-    private $config = array();
+    private $config = [];
 
     /**
      * @var array
      */
-    private $runtimeInformations = array();
+    private $runtimeInformations = [];
 
     /**
      * @var null|integer
@@ -49,12 +49,12 @@ class Container
     /**
      * @var array
      */
-    private $data = array();
+    private $data = [];
 
     /**
      * @param array $config
      */
-    public function __construct(array $config = array())
+    public function __construct(array $config = [])
     {
         $this->config = $config;
     }
diff --git a/src/Docker/Context/Context.php b/src/Docker/Context/Context.php
@@ -125,7 +125,7 @@ public function toTar()
     public function toStream()
     {
         if (!is_resource($this->process)) {
-            $this->process = proc_open("/usr/bin/env tar c .", array(array("pipe", "r"), array("pipe", "w"), array("pipe", "w")), $pipes, $this->directory);
+            $this->process = proc_open("/usr/bin/env tar c .", [["pipe", "r"], ["pipe", "w"], ["pipe", "w"]], $pipes, $this->directory);
             $this->stream  = $pipes[1];
         }
 
diff --git a/src/Docker/Context/ContextBuilder.php b/src/Docker/Context/ContextBuilder.php
@@ -19,12 +19,12 @@ class ContextBuilder
     /**
      * @var array
      */
-    private $commands = array();
+    private $commands = [];
 
     /**
      * @var array
      */
-    private $files = array();
+    private $files = [];
 
     /**
      * @var \Symfony\Component\Filesystem\Filesystem
diff --git a/src/Docker/Docker.php b/src/Docker/Docker.php
@@ -135,7 +135,7 @@ public function build(ContextInterface $context, $name, callable $callback = nul
             'nocache' => (integer) !$cache,
             'rm' => (integer) $rm,
         ]]], [
-            'headers'  => array('Content-Type' => 'application/tar'),
+            'headers'  => ['Content-Type' => 'application/tar'],
             'body'     => $content,
             'stream'   => true,
             'callback' => $callback,
@@ -155,7 +155,7 @@ public function build(ContextInterface $context, $name, callable $callback = nul
      *
      * @see https://docs.docker.io/en/latest/api/docker_remote_api_v1.7/#create-a-new-image-from-a-container-s-changes
      */
-    public function commit(Container $container, $config = array())
+    public function commit(Container $container, $config = [])
     {
         if (isset($config['run'])) {
             $config['run'] = json_encode($config['run']);
diff --git a/src/Docker/Http/Adapter/DockerAdapter.php b/src/Docker/Http/Adapter/DockerAdapter.php
@@ -173,7 +173,7 @@ private function createResponse(TransactionInterface $transaction)
 
     private function getResponseWithHeaders($stream)
     {
-        $headers = array();
+        $headers = [];
 
         while (($line = fgets($stream)) !== false) {
             if (rtrim($line) === '') {
@@ -216,10 +216,10 @@ private function setResponseStream(Response $response, $socket, EmitterInterface
 
         // Attach filter
         if ($useFilter) {
-            stream_filter_append($socket, 'event', STREAM_FILTER_READ, array(
+            stream_filter_append($socket, 'event', STREAM_FILTER_READ, [
                 'emitter' => $emitter,
                 'content_type' => $response->getHeader('Content-Type'),
-            ));
+            ]);
         }
 
         $stream = new Stream($socket);
@@ -289,9 +289,9 @@ private function fwrite($stream, $bytes)
         // the stream, write to it again if PHP claims that it's writable, and
         // consider the pipe broken if the write fails.
 
-        $read = array();
-        $write = array($stream);
-        $except = array();
+        $read = [];
+        $write = [$stream];
+        $except = [];
 
         @stream_select($read, $write, $except, 0);
 
diff --git a/src/Docker/Http/DockerClient.php b/src/Docker/Http/DockerClient.php
@@ -74,13 +74,13 @@ public static function createWithEnv(array $config = [])
             file_put_contents($fullcert, file_get_contents($certfile));
             file_put_contents($fullcert, file_get_contents($keyfile), FILE_APPEND);
 
-            $context = stream_context_create(array(
-                'ssl' => array(
+            $context = stream_context_create([
+                'ssl' => [
                     'cafile' => $cafile,
                     'local_cert' => $fullcert,
                     'peer_name' => $peername,
-                ),
-            ));
+                ],
+            ]);
         }
 
         return new self($config, $entrypoint, $context, $useTls);
diff --git a/src/Docker/Http/Stream/Filter/Event.php b/src/Docker/Http/Stream/Filter/Event.php
@@ -110,7 +110,7 @@ public function onCreate()
 
     private function jsonSplitDecode($json)
     {
-        $splited = array();
+        $splited = [];
         $size    = strlen($json);
         $inquote = false;
 
@@ -119,15 +119,15 @@ private function jsonSplitDecode($json)
                 $inquote = !$inquote;
             }
 
-            if (!$inquote && in_array($json[$i], array(" ", "\r", "\n", "\t"))) {
+            if (!$inquote && in_array($json[$i], [" ", "\r", "\n", "\t"])) {
                 continue;
             }
 
-            if (!$inquote && in_array($json[$i], array('{', '['))) {
+            if (!$inquote && in_array($json[$i], ['{', '['])) {
                 $level++;
             }
 
-            if (!$inquote && in_array($json[$i], array('}', ']'))) {
+            if (!$inquote && in_array($json[$i], ['}', ']'])) {
                 $level--;
 
                 if ($level == 0) {
diff --git a/src/Docker/Http/Stream/InteractiveStream.php b/src/Docker/Http/Stream/InteractiveStream.php
@@ -30,7 +30,7 @@ public function __construct(StreamInterface $stream)
     public function write($data)
     {
         $rand  = rand(0, 28);
-        $frame = array(
+        $frame = [
             'fin'      => 1,
             'rsv1'     => 0,
             'rsv2'     => 0,
@@ -40,7 +40,7 @@ public function write($data)
             'len'      => strlen($data),
             'mask_key' => substr(md5(uniqid()), $rand, 4),
             'data'     => $data,
-        );
+        ];
 
         if ($frame['mask'] == 1) {
             for ($i = 0; $i < $frame['len']; $i++) {
@@ -102,7 +102,7 @@ public function receive($block = true)
             $firstByte = $this->read(1);
         }
 
-        $frame      = array();
+        $frame      = [];
         $firstByte  = ord($firstByte);
         $secondByte = ord($this->read(1));
 
diff --git a/src/Docker/Manager/ContainerManager.php b/src/Docker/Manager/ContainerManager.php
@@ -37,7 +37,7 @@ public function __construct(HttpClient $client)
      *
      * @return Container[]
      */
-    public function findAll(array $params = array())
+    public function findAll(array $params = [])
     {
         $response = $this->client->get('/containers/json', [
             'query' => $params
@@ -133,10 +133,10 @@ public function create(Container $container)
                 'name' => $container->getName(),
             ],
         ]],
-        array(
+        [
             'body'         => Json::encode($container->getConfig()),
-            'headers'      => array('content-type' => 'application/json'),
-        ));
+            'headers'      => ['content-type' => 'application/json'],
+        ]);
 
         if ($response->getStatusCode() !== "201") {
             throw UnexpectedStatusCodeException::fromResponse($response);
@@ -155,13 +155,13 @@ public function create(Container $container)
      *
      * @return \Docker\Manager\ContainerManager
      */
-    public function start(Container $container, array $hostConfig = array())
+    public function start(Container $container, array $hostConfig = [])
     {
-        $response = $this->client->post(['/containers/{id}/start', ['id' => $container->getId()]], array(
+        $response = $this->client->post(['/containers/{id}/start', ['id' => $container->getId()]], [
             'body'         => Json::encode($hostConfig),
-            'headers'      => array('content-type' => 'application/json'),
+            'headers'      => ['content-type' => 'application/json'],
             'wait'         => true,
-        ));
+        ]);
 
         if ($response->getStatusCode() !== "204") {
             throw UnexpectedStatusCodeException::fromResponse($response);
@@ -186,7 +186,7 @@ public function start(Container $container, array $hostConfig = array())
      *
      * @return boolean|null Return true when the process want well, false if an error append during the run process, or null when daemon is set to true
      */
-    public function run(Container $container, callable $attachCallback = null, array $hostConfig = array(), $daemon = false, $timeout = null)
+    public function run(Container $container, callable $attachCallback = null, array $hostConfig = [], $daemon = false, $timeout = null)
     {
         $this->create($container);
 
@@ -239,10 +239,10 @@ public function attach(Container $container, callable $callback, $logs = true, $
                 'stdout' => $stdout,
                 'stderr' => $stderr,
             ]
-        ]], array(
+        ]], [
             'timeout'  => $timeout !== null ? $timeout : $this->client->getDefaultOption('timeout'),
             'callback' => $callback,
-        ));
+        ]);
 
         if ($response->getStatusCode() !== "200") {
             throw UnexpectedStatusCodeException::fromResponse($response);
@@ -276,15 +276,15 @@ public function interact(Container $container, $logs = true, $stream = true, $st
                 'stdout' => $stdout,
                 'stderr' => $stderr,
             ]
-        ]], array(
-            'headers' => array(
+        ]], [
+            'headers' => [
                 'Origin' => 'php://docker-php',
                 'Upgrade' => 'websocket',
                 'Connection' => 'Upgrade',
                 'Sec-WebSocket-Version' => '13',
                 'Sec-WebSocket-Key' => base64_encode(uniqid()),
-            ),
-        ));
+            ],
+        ]);
 
         return new InteractiveStream($response->getBody());
     }
@@ -301,9 +301,9 @@ public function interact(Container $container, $logs = true, $stream = true, $st
      */
     public function wait(Container $container, $timeout = null)
     {
-        $response = $this->client->post(['/containers/{id}/wait', ['id' => $container->getId()]], array(
+        $response = $this->client->post(['/containers/{id}/wait', ['id' => $container->getId()]], [
             'timeout' => null === $timeout ? $this->client->getDefaultOption('timeout') : $timeout,
-        ));
+        ]);
 
         if ($response->getStatusCode() !== "200") {
             throw UnexpectedStatusCodeException::fromResponse($response);
@@ -389,7 +389,7 @@ public function top(Container $container, $psArgs = "aux")
             throw UnexpectedStatusCodeException::fromResponse($response);
         }
 
-        $processes = array();
+        $processes = [];
         $data      = $response->json();
 
         $keys = $data['Titles'];
@@ -459,10 +459,10 @@ public function export(Container $container)
      */
     public function logs(Container $container, $follow = false, $stdout = false, $stderr = false, $timestamp = false, $tail = "all")
     {
-        $logs = array();
+        $logs = [];
 
         $callback = function ($output, $type) use(&$logs) {
-            $logs[] = array('type' => $type, 'output' => $output);
+            $logs[] = ['type' => $type, 'output' => $output];
         };
 
         $this->client->get(['/containers/{id}/logs{?data*}', [
diff --git a/src/Docker/Tests/Manager/ContainerManagerTest.php b/src/Docker/Tests/Manager/ContainerManagerTest.php
@@ -62,7 +62,7 @@ public function testInteract()
 
         stream_set_blocking($stream->getSocket(), 0);
 
-        $read   = array($stream->getSocket());
+        $read   = [$stream->getSocket()];
         $write  = null;
         $expect = null;
 
@@ -111,7 +111,7 @@ public function testRunDefault()
         $container = new Container(['Image' => 'ubuntu:precise', 'Cmd' => ['/bin/true']]);
         $manager = $this
             ->getMockBuilder('\Docker\Manager\ContainerManager')
-            ->setMethods(array('create', 'start', 'wait'))
+            ->setMethods(['create', 'start', 'wait'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -140,7 +140,7 @@ public function testRunAttach()
         $container = new Container(['Image' => 'ubuntu:precise', 'Cmd' => ['/bin/true']]);
         $manager = $this
             ->getMockBuilder('\Docker\Manager\ContainerManager')
-            ->setMethods(array('create', 'start', 'wait', 'attach'))
+            ->setMethods(['create', 'start', 'wait', 'attach'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -182,7 +182,7 @@ public function testRunDaemon()
         $container = new Container(['Image' => 'ubuntu:precise', 'Cmd' => ['/bin/true']]);
         $manager = $this
             ->getMockBuilder('\Docker\Manager\ContainerManager')
-            ->setMethods(array('create', 'start', 'wait'))
+            ->setMethods(['create', 'start', 'wait'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -201,7 +201,7 @@ public function testRunDaemon()
         $manager->expects($this->never())
             ->method('wait');
 
-        $this->assertNull($manager->run($container, null, array(), true));
+        $this->assertNull($manager->run($container, null, [], true));
     }
 
     public function testAttach()
@@ -357,7 +357,7 @@ public function testTop()
     {
         $container = new Container(['Image' => 'ubuntu:precise', 'Cmd' => ['sleep', '2']]);
         $manager = $this->getManager();
-        $manager->run($container, null, array(), true);
+        $manager->run($container, null, [], true);
 
         $processes = $manager->top($container);
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function toTar()`
`125`	`125`	`public function toStream()`
`126`	`126`	`{`
`127`	`127`	`if (!is_resource($this->process)) {`
`128`		`- $this->process = proc_open("/usr/bin/env tar c .", array(array("pipe", "r"), array("pipe", "w"), array("pipe", "w")), $pipes, $this->directory);`
	`128`	`+ $this->process = proc_open("/usr/bin/env tar c .", [["pipe", "r"], ["pipe", "w"], ["pipe", "w"]], $pipes, $this->directory);`
`129`	`129`	`$this->stream = $pipes[1];`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function onCreate()`
`110`	`110`
`111`	`111`	`private function jsonSplitDecode($json)`
`112`	`112`	`{`
`113`		`- $splited = array();`
	`113`	`+ $splited = [];`
`114`	`114`	`$size = strlen($json);`
`115`	`115`	`$inquote = false;`
`116`	`116`
`@@ -119,15 +119,15 @@ private function jsonSplitDecode($json)`
`119`	`119`	`$inquote = !$inquote;`
`120`	`120`	`}`
`121`	`121`
`122`		`- if (!$inquote && in_array($json[$i], array(" ", "\r", "\n", "\t"))) {`
	`122`	`+ if (!$inquote && in_array($json[$i], [" ", "\r", "\n", "\t"])) {`
`123`	`123`	`continue;`
`124`	`124`	`}`
`125`	`125`
`126`		`- if (!$inquote && in_array($json[$i], array('{', '['))) {`
	`126`	`+ if (!$inquote && in_array($json[$i], ['{', '['])) {`
`127`	`127`	`$level++;`
`128`	`128`	`}`
`129`	`129`
`130`		`- if (!$inquote && in_array($json[$i], array('}', ']'))) {`
	`130`	`+ if (!$inquote && in_array($json[$i], ['}', ']'])) {`
`131`	`131`	`$level--;`
`132`	`132`
`133`	`133`	`if ($level == 0) {`