Merge branch 'feature/php-short-array-syntax'

zendframework · Jun 5, 2015 · ffd15a5 · ffd15a5
2 parents debea31 + 4a92e53
commit ffd15a5
Show file tree

Hide file tree

Showing 201 changed files with 2,269 additions and 2,268 deletions.
diff --git a/.php_cs b/.php_cs
@@ -32,6 +32,7 @@ $config->fixers(
         'object_operator',
         'php_closing_tag',
         'remove_lines_between_uses',
+        'short_array_syntax',
         'short_tag',
         'standardize_not_equal',
         'trailing_spaces',

diff --git a/src/Adapter/Adapter.php b/src/Adapter/Adapter.php
@@ -70,7 +70,7 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
     public function __construct($driver, Platform\PlatformInterface $platform = null, ResultSet\ResultSetInterface $queryResultPrototype = null, Profiler\ProfilerInterface $profiler = null)
     {
         // first argument can be an array of parameters
-        $parameters = array();
+        $parameters = [];
 
         if (is_array($driver)) {
             $parameters = $driver;
@@ -166,7 +166,7 @@ public function getCurrentSchema()
      */
     public function query($sql, $parametersOrQueryMode = self::QUERY_MODE_PREPARE, ResultSet\ResultSetInterface $resultPrototype = null)
     {
-        if (is_string($parametersOrQueryMode) && in_array($parametersOrQueryMode, array(self::QUERY_MODE_PREPARE, self::QUERY_MODE_EXECUTE))) {
+        if (is_string($parametersOrQueryMode) && in_array($parametersOrQueryMode, [self::QUERY_MODE_PREPARE, self::QUERY_MODE_EXECUTE])) {
             $mode = $parametersOrQueryMode;
             $parameters = null;
         } elseif (is_array($parametersOrQueryMode) || $parametersOrQueryMode instanceof ParameterContainer) {
@@ -210,15 +210,15 @@ public function createStatement($initialSql = null, $initialParameters = null)
     {
         $statement = $this->driver->createStatement($initialSql);
         if ($initialParameters === null || !$initialParameters instanceof ParameterContainer && is_array($initialParameters)) {
-            $initialParameters = new ParameterContainer((is_array($initialParameters) ? $initialParameters : array()));
+            $initialParameters = new ParameterContainer((is_array($initialParameters) ? $initialParameters : []));
         }
         $statement->setParameterContainer($initialParameters);
         return $statement;
     }
 
     public function getHelpers(/* $functions */)
     {
-        $functions = array();
+        $functions = [];
         $platform = $this->platform;
         foreach (func_get_args() as $arg) {
             switch ($arg) {
@@ -270,7 +270,7 @@ protected function createDriver($parameters)
             throw new Exception\InvalidArgumentException(__FUNCTION__ . ' expects a "driver" to be a string or instance of DriverInterface');
         }
 
-        $options = array();
+        $options = [];
         if (isset($parameters['options'])) {
             $options = (array) $parameters['options'];
             unset($parameters['options']);
@@ -322,7 +322,7 @@ protected function createPlatform($parameters)
         }
 
         // currently only supported by the IbmDb2 & Oracle concrete implementations
-        $options = (isset($parameters['platform_options'])) ? $parameters['platform_options'] : array();
+        $options = (isset($parameters['platform_options'])) ? $parameters['platform_options'] : [];
 
         switch ($platformName) {
             case 'Mysql':

diff --git a/src/Adapter/AdapterAbstractServiceFactory.php b/src/Adapter/AdapterAbstractServiceFactory.php
@@ -73,23 +73,23 @@ protected function getConfig(ServiceLocatorInterface $services)
         }
 
         if (!$services->has('Config')) {
-            $this->config = array();
+            $this->config = [];
             return $this->config;
         }
 
         $config = $services->get('Config');
         if (!isset($config['db'])
             || !is_array($config['db'])
         ) {
-            $this->config = array();
+            $this->config = [];
             return $this->config;
         }
 
         $config = $config['db'];
         if (!isset($config['adapters'])
             || !is_array($config['adapters'])
         ) {
-            $this->config = array();
+            $this->config = [];
             return $this->config;
         }
 

diff --git a/src/Adapter/Driver/AbstractConnection.php b/src/Adapter/Driver/AbstractConnection.php
@@ -17,7 +17,7 @@ abstract class AbstractConnection implements ConnectionInterface, ProfilerAwareI
     /**
      * @var array
      */
-    protected $connectionParameters = array();
+    protected $connectionParameters = [];
 
     /**
      * @var string|null

diff --git a/src/Adapter/Driver/IbmDb2/Connection.php b/src/Adapter/Driver/IbmDb2/Connection.php
@@ -116,11 +116,11 @@ public function connect()
             return;
         };
 
-        $database     = $findParameterValue(array('database', 'db'));
-        $username     = $findParameterValue(array('username', 'uid', 'UID'));
-        $password     = $findParameterValue(array('password', 'pwd', 'PWD'));
-        $isPersistent = $findParameterValue(array('persistent', 'PERSISTENT', 'Persistent'));
-        $options      = (isset($p['driver_options']) ? $p['driver_options'] : array());
+        $database     = $findParameterValue(['database', 'db']);
+        $username     = $findParameterValue(['username', 'uid', 'UID']);
+        $password     = $findParameterValue(['password', 'pwd', 'PWD']);
+        $isPersistent = $findParameterValue(['persistent', 'PERSISTENT', 'Persistent']);
+        $options      = (isset($p['driver_options']) ? $p['driver_options'] : []);
         $connect      = ((bool) $isPersistent) ? 'db2_pconnect' : 'db2_connect';
 
         $this->resource = $connect($database, $username, $password, $options);

diff --git a/src/Adapter/Driver/Mysqli/Connection.php b/src/Adapter/Driver/Mysqli/Connection.php
@@ -104,10 +104,10 @@ public function connect()
             return;
         };
 
-        $hostname = $findParameterValue(array('hostname', 'host'));
-        $username = $findParameterValue(array('username', 'user'));
-        $password = $findParameterValue(array('password', 'passwd', 'pw'));
-        $database = $findParameterValue(array('database', 'dbname', 'db', 'schema'));
+        $hostname = $findParameterValue(['hostname', 'host']);
+        $username = $findParameterValue(['username', 'user']);
+        $password = $findParameterValue(['password', 'passwd', 'pw']);
+        $database = $findParameterValue(['database', 'dbname', 'db', 'schema']);
         $port     = (isset($p['port'])) ? (int) $p['port'] : null;
         $socket   = (isset($p['socket'])) ? $p['socket'] : null;
 

diff --git a/src/Adapter/Driver/Mysqli/Mysqli.php b/src/Adapter/Driver/Mysqli/Mysqli.php
@@ -39,9 +39,9 @@ class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
     /**
      * @var array
      */
-    protected $options = array(
+    protected $options = [
         'buffer_results' => false
-    );
+    ];
 
     /**
      * Constructor
@@ -51,7 +51,7 @@ class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
      * @param null|Result $resultPrototype
      * @param array $options
      */
-    public function __construct($connection, Statement $statementPrototype = null, Result $resultPrototype = null, array $options = array())
+    public function __construct($connection, Statement $statementPrototype = null, Result $resultPrototype = null, array $options = [])
     {
         if (!$connection instanceof Connection) {
             $connection = new Connection($connection);

diff --git a/src/Adapter/Driver/Mysqli/Result.php b/src/Adapter/Driver/Mysqli/Result.php
@@ -59,7 +59,7 @@ class Result implements
      *
      * @var array
      */
-    protected $statementBindValues = array('keys' => null, 'values' => array());
+    protected $statementBindValues = ['keys' => null, 'values' => []];
 
     /**
      * @var mixed
@@ -189,17 +189,17 @@ protected function loadDataFromMysqliStatement()
     {
         // build the default reference based bind structure, if it does not already exist
         if ($this->statementBindValues['keys'] === null) {
-            $this->statementBindValues['keys'] = array();
+            $this->statementBindValues['keys'] = [];
             $resultResource = $this->resource->result_metadata();
             foreach ($resultResource->fetch_fields() as $col) {
                 $this->statementBindValues['keys'][] = $col->name;
             }
             $this->statementBindValues['values'] = array_fill(0, count($this->statementBindValues['keys']), null);
-            $refs = array();
+            $refs = [];
             foreach ($this->statementBindValues['values'] as $i => &$f) {
                 $refs[$i] = &$f;
             }
-            call_user_func_array(array($this->resource, 'bind_result'), $this->statementBindValues['values']);
+            call_user_func_array([$this->resource, 'bind_result'], $this->statementBindValues['values']);
         }
 
         if (($r = $this->resource->fetch()) === null) {

diff --git a/src/Adapter/Driver/Mysqli/Statement.php b/src/Adapter/Driver/Mysqli/Statement.php
@@ -283,7 +283,7 @@ protected function bindParametersFromContainer()
     {
         $parameters = $this->parameterContainer->getNamedArray();
         $type = '';
-        $args = array();
+        $args = [];
 
         foreach ($parameters as $name => &$value) {
             if ($this->parameterContainer->offsetHasErrata($name)) {
@@ -309,7 +309,7 @@ protected function bindParametersFromContainer()
 
         if ($args) {
             array_unshift($args, $type);
-            call_user_func_array(array($this->resource, 'bind_param'), $args);
+            call_user_func_array([$this->resource, 'bind_param'], $args);
         }
     }
 }
diff --git a/src/Adapter/Driver/Oci8/Connection.php b/src/Adapter/Driver/Oci8/Connection.php
@@ -104,15 +104,15 @@ public function connect()
         };
 
         // http://www.php.net/manual/en/function.oci-connect.php
-        $username = $findParameterValue(array('username'));
-        $password = $findParameterValue(array('password'));
-        $connectionString = $findParameterValue(array('connection_string', 'connectionstring', 'connection', 'hostname', 'instance'));
-        $characterSet = $findParameterValue(array('character_set', 'charset', 'encoding'));
-        $sessionMode = $findParameterValue(array('session_mode'));
+        $username = $findParameterValue(['username']);
+        $password = $findParameterValue(['password']);
+        $connectionString = $findParameterValue(['connection_string', 'connectionstring', 'connection', 'hostname', 'instance']);
+        $characterSet = $findParameterValue(['character_set', 'charset', 'encoding']);
+        $sessionMode = $findParameterValue(['session_mode']);
 
         // connection modifiers
-        $isUnique = $findParameterValue(array('unique'));
-        $isPersistent = $findParameterValue(array('persistent'));
+        $isUnique = $findParameterValue(['unique']);
+        $isPersistent = $findParameterValue(['persistent']);
 
         if ($isUnique == true) {
             $this->resource = oci_new_connect($username, $password, $connectionString, $characterSet, $sessionMode);

diff --git a/src/Adapter/Driver/Oci8/Result.php b/src/Adapter/Driver/Oci8/Result.php
@@ -52,7 +52,7 @@ class Result implements Iterator, ResultInterface
      *
      * @var array
      */
-    protected $statementBindValues = array('keys' => null, 'values' => array());
+    protected $statementBindValues = ['keys' => null, 'values' => []];
 
     /**
      * @var mixed

diff --git a/src/Adapter/Driver/Pdo/Connection.php b/src/Adapter/Driver/Pdo/Connection.php
@@ -77,7 +77,7 @@ public function setConnectionParameters(array $connectionParameters)
             $this->driverName = strtolower($connectionParameters['pdodriver']);
         } elseif (isset($connectionParameters['driver'])) {
             $this->driverName = strtolower(substr(
-                str_replace(array('-', '_', ' '), '', $connectionParameters['driver']),
+                str_replace(['-', '_', ' '], '', $connectionParameters['driver']),
                 3
             ));
         }
@@ -160,7 +160,7 @@ public function connect()
         }
 
         $dsn = $username = $password = $hostname = $database = null;
-        $options = array();
+        $options = [];
         foreach ($this->connectionParameters as $key => $value) {
             switch (strtolower($key)) {
                 case 'dsn':
@@ -169,7 +169,7 @@ public function connect()
                 case 'driver':
                     $value = strtolower((string) $value);
                     if (strpos($value, 'pdo') === 0) {
-                        $pdoDriver = str_replace(array('-', '_', ' '), '', $value);
+                        $pdoDriver = str_replace(['-', '_', ' '], '', $value);
                         $pdoDriver = substr($pdoDriver, 3) ?: '';
                         $pdoDriver = strtolower($pdoDriver);
                     }
@@ -211,7 +211,7 @@ public function connect()
         }
 
         if (!isset($dsn) && isset($pdoDriver)) {
-            $dsn = array();
+            $dsn = [];
             switch ($pdoDriver) {
                 case 'sqlite':
                     $dsn[] = $database;

diff --git a/src/Adapter/Driver/Pdo/Pdo.php b/src/Adapter/Driver/Pdo/Pdo.php
@@ -41,7 +41,7 @@ class Pdo implements DriverInterface, DriverFeatureInterface, Profiler\ProfilerA
     /**
      * @var array
      */
-    protected $features = array();
+    protected $features = [];
 
     /**
      * @param array|Connection|\PDO $connection

diff --git a/src/Adapter/Driver/Pgsql/Connection.php b/src/Adapter/Driver/Pgsql/Connection.php
@@ -261,14 +261,14 @@ private function getConnectionString()
             return;
         };
 
-        $connectionParameters = array(
-            'host'     => $findParameterValue(array('hostname', 'host')),
-            'user'     => $findParameterValue(array('username', 'user')),
-            'password' => $findParameterValue(array('password', 'passwd', 'pw')),
-            'dbname'   => $findParameterValue(array('database', 'dbname', 'db', 'schema')),
+        $connectionParameters = [
+            'host'     => $findParameterValue(['hostname', 'host']),
+            'user'     => $findParameterValue(['username', 'user']),
+            'password' => $findParameterValue(['password', 'passwd', 'pw']),
+            'dbname'   => $findParameterValue(['database', 'dbname', 'db', 'schema']),
             'port'     => isset($p['port']) ? (int) $p['port'] : null,
             'socket'   => isset($p['socket']) ? $p['socket'] : null,
-        );
+        ];
 
         return urldecode(http_build_query(array_filter($connectionParameters), null, ' '));
     }

diff --git a/src/Adapter/Driver/Pgsql/Pgsql.php b/src/Adapter/Driver/Pgsql/Pgsql.php
@@ -38,9 +38,9 @@ class Pgsql implements DriverInterface, Profiler\ProfilerAwareInterface
     /**
      * @var array
      */
-    protected $options = array(
+    protected $options = [
         'buffer_results' => false
-    );
+    ];
 
     /**
      * Constructor

diff --git a/src/Adapter/Driver/Sqlsrv/Connection.php b/src/Adapter/Driver/Sqlsrv/Connection.php
@@ -94,9 +94,9 @@ public function connect()
         }
 
         $serverName = '.';
-        $params = array(
+        $params = [
             'ReturnDatesAsStrings' => true
-        );
+        ];
         foreach ($this->connectionParameters as $key => $value) {
             switch (strtolower($key)) {
                 case 'hostname':

diff --git a/src/Adapter/Driver/Sqlsrv/Exception/ErrorException.php b/src/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
@@ -18,7 +18,7 @@ class ErrorException extends Exception\ErrorException implements ExceptionInterf
      *
      * @var array
      */
-    protected $errors = array();
+    protected $errors = [];
 
     /**
      * Construct

diff --git a/src/Adapter/Driver/Sqlsrv/Statement.php b/src/Adapter/Driver/Sqlsrv/Statement.php
@@ -45,7 +45,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
     /**
      * @var array
      */
-    protected $parameterReferences = array();
+    protected $parameterReferences = [];
 
     /**
      * @var ParameterContainer
@@ -66,12 +66,12 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
     /**
      * @var array
      */
-    protected $prepareParams = array();
+    protected $prepareParams = [];
 
     /**
      * @var array
      */
-    protected $prepareOptions = array();
+    protected $prepareOptions = [];
 
     /**
      * Set driver
@@ -196,7 +196,7 @@ public function getSql()
      * @throws Exception\RuntimeException
      * @return Statement
      */
-    public function prepare($sql = null, array $options = array())
+    public function prepare($sql = null, array $options = [])
     {
         if ($this->isPrepared) {
             throw new Exception\RuntimeException('Already prepared');
@@ -207,7 +207,7 @@ public function prepare($sql = null, array $options = array())
         $pRef = &$this->parameterReferences;
         for ($position = 0, $count = substr_count($sql, '?'); $position < $count; $position++) {
             if (!isset($this->prepareParams[$position])) {
-                $pRef[$position] = array('', SQLSRV_PARAM_IN, null, null);
+                $pRef[$position] = ['', SQLSRV_PARAM_IN, null, null];
             } else {
                 $pRef[$position] = &$this->prepareParams[$position];
             }