- Patch #318016 by Dave Reid: step one to standardizing type-hinting.

8 files changed, 43 insertions, 43 deletions

diff --git a/includes/database/database.inc b/includes/database/database.inc
index 215e90ba9..bd154e626 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -459,7 +459,7 @@ abstract class DatabaseConnection extends PDO {
    *   not be set by a user.  If there is an error, this method will return NULL
    *   and may throw an exception if $options['throw_exception'] is TRUE.
    */
-  public function query($query, Array $args = array(), $options = array()) {
+  public function query($query, array $args = array(), $options = array()) {
 
     // Use default values if not already set.
     $options += $this->defaultOptions();
@@ -522,7 +522,7 @@ abstract class DatabaseConnection extends PDO {
    * @return
    *   A new SelectQuery object.
    */
-  public function select($table, $alias = NULL, Array $options = array()) {
+  public function select($table, $alias = NULL, array $options = array()) {
     if (empty($this->selectClass)) {
       $this->selectClass = 'SelectQuery_' . $this->driver();
       if (!class_exists($this->selectClass)) {
@@ -546,7 +546,7 @@ abstract class DatabaseConnection extends PDO {
    * @return
    *   A new InsertQuery object.
    */
-  public function insert($table, Array $options = array()) {
+  public function insert($table, array $options = array()) {
     if (empty($this->insertClass)) {
       $this->insertClass = 'InsertQuery_' . $this->driver();
       if (!class_exists($this->insertClass)) {
@@ -566,7 +566,7 @@ abstract class DatabaseConnection extends PDO {
    * @return
    *   A new MergeQuery object.
    */
-  public function merge($table, Array $options = array()) {
+  public function merge($table, array $options = array()) {
     if (empty($this->mergeClass)) {
       $this->mergeClass = 'MergeQuery_' . $this->driver();
       if (!class_exists($this->mergeClass)) {
@@ -587,7 +587,7 @@ abstract class DatabaseConnection extends PDO {
    * @return
    *   A new UpdateQuery object.
    */
-  public function update($table, Array $options = array()) {
+  public function update($table, array $options = array()) {
     if (empty($this->updateClass)) {
       $this->updateClass = 'UpdateQuery_' . $this->driver();
       if (!class_exists($this->updateClass)) {
@@ -607,7 +607,7 @@ abstract class DatabaseConnection extends PDO {
    * @return
    *   A new DeleteQuery object.
    */
-  public function delete($table, Array $options = array()) {
+  public function delete($table, array $options = array()) {
     if (empty($this->deleteClass)) {
       $this->deleteClass = 'DeleteQuery_' . $this->driver();
       if (!class_exists($this->deleteClass)) {
@@ -693,7 +693,7 @@ abstract class DatabaseConnection extends PDO {
    *   A database query result resource, or NULL if the query was not executed
    *   correctly.
    */
-  abstract public function queryRange($query, Array $args, $from, $count, Array $options = array());
+  abstract public function queryRange($query, array $args, $from, $count, array $options = array());
 
   /**
    * Runs a SELECT query and stores its results in a temporary table.
@@ -721,7 +721,7 @@ abstract class DatabaseConnection extends PDO {
    *   A database query result resource, or FALSE if the query was not executed
    *   correctly.
    */
-  abstract function queryTemporary($query, Array $args, $tablename, Array $options = array());
+  abstract function queryTemporary($query, array $args, $tablename, array $options = array());
 
   /**
    * Returns the type of database driver.
@@ -1363,7 +1363,7 @@ interface DatabaseStatementInterface extends Traversable {
    * @return
    *   An array of results.
    */
-  // function fetchAll($mode = NULL, $column_index = NULL, Array $constructor_arguments);
+  // function fetchAll($mode = NULL, $column_index = NULL, array $constructor_arguments);
 
   /**
    * Returns an entire single column of a result set as an indexed array.
@@ -1625,7 +1625,7 @@ function db_query_temporary($query, $args, $tablename, $options = array()) {
  * @return
  *   A new InsertQuery object for this connection.
  */
-function db_insert($table, Array $options = array()) {
+function db_insert($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
     $options['target'] = 'default';
   }
@@ -1642,7 +1642,7 @@ function db_insert($table, Array $options = array()) {
  * @return
  *   A new MergeQuery object for this connection.
  */
-function db_merge($table, Array $options = array()) {
+function db_merge($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
     $options['target'] = 'default';
   }
@@ -1659,7 +1659,7 @@ function db_merge($table, Array $options = array()) {
  * @return
  *   A new UpdateQuery object for this connection.
  */
-function db_update($table, Array $options = array()) {
+function db_update($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
     $options['target'] = 'default';
   }
@@ -1676,7 +1676,7 @@ function db_update($table, Array $options = array()) {
  * @return
  *   A new DeleteQuery object for this connection.
  */
-function db_delete($table, Array $options = array()) {
+function db_delete($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
     $options['target'] = 'default';
   }
@@ -1695,7 +1695,7 @@ function db_delete($table, Array $options = array()) {
  * @return
  *   A new SelectQuery object for this connection.
  */
-function db_select($table, $alias = NULL, Array $options = array()) {
+function db_select($table, $alias = NULL, array $options = array()) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 661503cd6..9a9c57082 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -13,7 +13,7 @@
 
 class DatabaseConnection_mysql extends DatabaseConnection {
 
-  public function __construct(Array $connection_options = array()) {
+  public function __construct(array $connection_options = array()) {
     // This driver defaults to non transaction support.
     $this->transactionSupport = !empty($connection_option['transactions']);
 
@@ -40,11 +40,11 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     $this->exec('SET sql_mode=STRICT_ALL_TABLES');
   }
 
-  public function queryRange($query, Array $args, $from, $count, Array $options = array()) {
+  public function queryRange($query, array $args, $from, $count, array $options = array()) {
     return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
   }
 
-  public function queryTemporary($query, Array $args, $tablename, Array $options = array()) {
+  public function queryTemporary($query, array $args, $tablename, array $options = array()) {
     return $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' Engine=MEMORY SELECT', $query), $args, $options);
   }
 
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc
index 53e7b3578..3513b293b 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -13,7 +13,7 @@
 
 class DatabaseConnection_pgsql extends DatabaseConnection {
 
-  public function __construct(Array $connection_options = array()) {
+  public function __construct(array $connection_options = array()) {
     // This driver defaults to transaction support, except if explicitly passed FALSE.
     $this->transactionSupport = !isset($connection_options['transactions']) || $connection_options['transactions'] === FALSE;
 
@@ -31,7 +31,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     ));
   }
 
-  public function query($query, Array $args = array(), $options = array()) {
+  public function query($query, array $args = array(), $options = array()) {
 
     $options += $this->defaultOptions();
 
@@ -73,11 +73,11 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
     }
   }
 
-  public function queryRange($query, Array $args, $from, $count, Array $options = array()) {
+  public function queryRange($query, array $args, $from, $count, array $options = array()) {
     return $this->query($query . ' LIMIT ' . $count . ' OFFSET ' . $from, $args, $options);
   }
 
-  public function queryTemporary($query, Array $args, $tablename, Array $options = array()) {
+  public function queryTemporary($query, array $args, $tablename, array $options = array()) {
     return $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' AS SELECT', $query), $args, $options);
   }
 
diff --git a/includes/database/pgsql/query.inc b/includes/database/pgsql/query.inc
index a489cbeae..02cddda1e 100644
--- a/includes/database/pgsql/query.inc
+++ b/includes/database/pgsql/query.inc
@@ -9,7 +9,7 @@
 
 class InsertQuery_pgsql extends InsertQuery {
 
-  public function __construct($connection, $table, Array $options = array()) {
+  public function __construct($connection, $table, array $options = array()) {
     parent::__construct($connection, $table, $options);
     $this->queryOptions['return'] = Database::RETURN_NULL;
   }
diff --git a/includes/database/prefetch.inc b/includes/database/prefetch.inc
index d47bf8f9c..1132114d9 100644
--- a/includes/database/prefetch.inc
+++ b/includes/database/prefetch.inc
@@ -119,7 +119,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
     'column' => 0,
   );
 
-  public function __construct(DatabaseConnection $connection, $query, Array $driver_options = array()) {
+  public function __construct(DatabaseConnection $connection, $query, array $driver_options = array()) {
     $this->dbh = $connection;
     $this->queryString = $query;
     $this->driverOptions = $driver_options;
@@ -215,7 +215,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
    *
    * @param $query
    *   The query.
-   * @param Array $args
+   * @param array $args
    *   An array of arguments.
    * @return
    *   A PDOStatement object.
diff --git a/includes/database/query.inc b/includes/database/query.inc
index 5c51696b7..1d5d2216c 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -253,7 +253,7 @@ class InsertQuery extends Query {
    */
   protected $insertValues = array();
 
-  public function __construct($connection, $table, Array $options = array()) {
+  public function __construct($connection, $table, array $options = array()) {
     $options['return'] = Database::RETURN_INSERT_ID;
     $options += array('delay' => FALSE);
     parent::__construct($connection, $options);
@@ -279,7 +279,7 @@ class InsertQuery extends Query {
    * @return
    *   The called object.
    */
-  public function fields(Array $fields, Array $values = array()) {
+  public function fields(array $fields, array $values = array()) {
     if (empty($this->insertFields)) {
       if (empty($values)) {
         if (!is_numeric(key($fields))) {
@@ -309,7 +309,7 @@ class InsertQuery extends Query {
    * @return
    *   The called object.
    */
-  public function values(Array $values) {
+  public function values(array $values) {
     if (is_numeric(key($values))) {
       $this->insertValues[] = $values;
     }
@@ -342,7 +342,7 @@ class InsertQuery extends Query {
    * @return
    *   The called object.
    */
-  public function useDefaults(Array $fields) {
+  public function useDefaults(array $fields) {
     $this->defaultFields = $fields;
     return $this;
   }
@@ -486,7 +486,7 @@ class MergeQuery extends Query {
    */
   protected $expressionFields = array();
 
-  public function __construct($connection, $table, Array $options = array()) {
+  public function __construct($connection, $table, array $options = array()) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -510,7 +510,7 @@ class MergeQuery extends Query {
    * @return
    *   The called object.
    */
-  public function fields(Array $fields, Array $values = array()) {
+  public function fields(array $fields, array $values = array()) {
     if (count($values) > 0) {
       $fields = array_combine($fields, $values);
     }
@@ -544,7 +544,7 @@ class MergeQuery extends Query {
    * @return
    *   The called object.
    */
-  public function key(Array $fields, Array $values = array()) {
+  public function key(array $fields, array $values = array()) {
     if ($values) {
       $fields = array_combine($fields, $values);
     }
@@ -568,7 +568,7 @@ class MergeQuery extends Query {
    * @return
    *   The called object.
    */
-  public function update(Array $fields, Array $values = array()) {
+  public function update(array $fields, array $values = array()) {
    if ($values) {
       $fields = array_combine($fields, $values);
     }
@@ -624,7 +624,7 @@ class MergeQuery extends Query {
    * @return
    *   The called object.
    */
-  public function expression($field, $expression, Array $arguments = NULL) {
+  public function expression($field, $expression, array $arguments = NULL) {
     $this->expressionFields[$field] = array(
       'expression' => $expression,
       'arguments' => $arguments,
@@ -719,7 +719,7 @@ class DeleteQuery extends Query implements QueryConditionInterface {
    */
   protected $condition;
 
-  public function __construct(DatabaseConnection $connection, $table, Array $options = array()) {
+  public function __construct(DatabaseConnection $connection, $table, array $options = array()) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -824,7 +824,7 @@ class UpdateQuery extends Query implements QueryConditionInterface {
   protected $expressionFields = array();
 
 
-  public function __construct(DatabaseConnection $connection, $table, Array $options = array()) {
+  public function __construct(DatabaseConnection $connection, $table, array $options = array()) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -866,7 +866,7 @@ class UpdateQuery extends Query implements QueryConditionInterface {
    * @return
    *   The called object.
    */
-  public function fields(Array $fields) {
+  public function fields(array $fields) {
     $this->fields = $fields;
     return $this;
   }
@@ -888,7 +888,7 @@ class UpdateQuery extends Query implements QueryConditionInterface {
    * @return
    *   The called object.
    */
-  public function expression($field, $expression, Array $arguments = NULL) {
+  public function expression($field, $expression, array $arguments = NULL) {
     $this->expressionFields[$field] = array(
       'expression' => $expression,
       'arguments' => $arguments,
diff --git a/includes/database/select.inc b/includes/database/select.inc
index 86110bc79..218650b16 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -384,7 +384,7 @@ class SelectQuery extends Query implements QueryConditionInterface, QueryAlterab
    * @return
    *   The called object.
    */
-  public function fields($table_alias, Array $fields = array()) {
+  public function fields($table_alias, array $fields = array()) {
 
     if ($fields) {
       foreach ($fields as $field) {
diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc
index b918440b5..e10c7c1f0 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -18,7 +18,7 @@ include_once DRUPAL_ROOT . '/includes/database/prefetch.inc';
  */
 class DatabaseConnection_sqlite extends DatabaseConnection {
 
-  public function __construct(Array $connection_options = array()) {
+  public function __construct(array $connection_options = array()) {
     // We don't need a specific PDOStatement class here, we simulate it below.
     $this->statementClass = NULL;
 
@@ -99,7 +99,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
    * a DatabaseStatement_sqlite object, that will create a PDOStatement
    * using the semi-private PDOPrepare() method below.
    */
-  public function prepare($query, Array $options = array()) {
+  public function prepare($query, array $options = array()) {
     return new DatabaseStatement_sqlite($this, $query, $options);
   }
 
@@ -115,15 +115,15 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
    * DatabaseStatement_sqlite needs to call it, we have no other choice but to
    * expose this function to the world.
    */
-  public function PDOPrepare($query, Array $options = array()) {
+  public function PDOPrepare($query, array $options = array()) {
     return parent::prepare($query, $options);
   }
 
-  public function queryRange($query, Array $args, $from, $count, Array $options = array()) {
+  public function queryRange($query, array $args, $from, $count, array $options = array()) {
     return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
   }
 
-  public function queryTemporary($query, Array $args, $tablename, Array $options = array()) {
+  public function queryTemporary($query, array $args, $tablename, array $options = array()) {
     return $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' AS SELECT', $query), $args, $options);
   }