vanilla / garden-db

garden/Schema.php

Doc Comments +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
     /**
      * Select the first non-empty value from an array.
      *
-     * @param array $keys An array of keys to try.
+     * @param string[] $keys An array of keys to try.
      * @param array $array The array to select from.
      * @param mixed $default The default value if non of the keys exist.
      * @return mixed Returns the first non-empty value of {@link $default} if none are found.
@@ -411,7 +411,7 @@ 
      *
      * @param array &$data The data to validate.
      * @param Validation &$validation This argument will be filled with the validation result.
-     * @return bool Returns true if the data is valid, false otherwise.
+     * @return Schema Returns true if the data is valid, false otherwise.
      * @throws ValidationException Throws an exception when the data does not validate against the schema.
      */
     public function validate(array &$data, Validation &$validation = null) {

Spacing +7 added lines, -7 removed lines

@@ -154,7 +154,7 @@ 
      * @param string $path The path to current parameters for nested objects.
      * @return Schema Returns the current instance for fluent calls.
      */
-    protected function filterData(array &$data, array $schema, Validation &$validation, $path = '') {
+    protected function filterData(array &$data, array $schema, Validation & $validation, $path = '') {
         foreach ($data as $key => $val) {
             if (array_key_exists($key, $schema)) {
                 continue;
@@ -355,7 +355,7 @@ 
      * @return Schema Returns `$this` for fluent calls.
      */
     public function requireOneOf(array $fieldnames, $count = 1) {
-        $result = $this->addValidator('*', function ($data, Validation $validation) use ($fieldnames, $count) {
+        $result = $this->addValidator('*', function($data, Validation $validation) use ($fieldnames, $count) {
             $hasCount = 0;
             $flattened = [];
 
@@ -384,7 +384,7 @@ 
                 }
             }
 
-            $messageFields = array_map(function ($v) {
+            $messageFields = array_map(function($v) {
                 if (is_array($v)) {
                     return '('.implode(', ', $v).')';
                 }
@@ -414,7 +414,7 @@ 
      * @return bool Returns true if the data is valid, false otherwise.
      * @throws ValidationException Throws an exception when the data does not validate against the schema.
      */
-    public function validate(array &$data, Validation &$validation = null) {
+    public function validate(array &$data, Validation & $validation = null) {
         if (!$this->isValidInternal($data, $this->schema, $validation, '')) {
             if ($validation === null) {
                 // Although this should never be null, scrutinizer complains that it might be.
@@ -433,7 +433,7 @@ 
      * @param Validation &$validation This argument will be filled with the validation result.
      * @return bool Returns true if the data is valid. False otherwise.
      */
-    public function isValid(array &$data, Validation &$validation = null) {
+    public function isValid(array &$data, Validation & $validation = null) {
         return $this->isValidInternal($data, $this->schema, $validation, '');
     }
 
@@ -446,7 +446,7 @@ 
      * @param string $path The path to the current path for nested objects.
      * @return bool Returns true if the data is valid. False otherwise.
      */
-    protected function isValidInternal(array &$data, array $schema, Validation &$validation = null, $path = '') {
+    protected function isValidInternal(array &$data, array $schema, Validation & $validation = null, $path = '') {
         if ($validation === null) {
             $validation = new Validation();
         }
@@ -683,7 +683,7 @@ 
         } else {
             $bools = [
                 '0' => false, 'false' => false, 'no' => false, 'off' => false,
-                '1' => true,  'true'  => true, 'yes' => true,  'on'  => true
+                '1' => true, 'true'  => true, 'yes' => true, 'on'  => true
             ];
             if ((is_string($value) || is_numeric($value)) && isset($bools[$value])) {
                 $value = $bools[$value];

src/Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
     /**
      * Get the defaultOrder.
      *
-     * @return array Returns the defaultOrder.
+     * @return string[] Returns the defaultOrder.
      */
     public function getDefaultOrder() {
         return $this->defaultOrder;

src/MySqlDb.php

Doc Comments +1 added lines, -1 removed lines

@@ -594,7 +594,7 @@
     /**
      * Build a sql update statement.
      *
-     * @param string|Literal $tableName The name of the table to update.
+     * @param string $tableName The name of the table to update.
      * @param array $set An array of columns to set.
      * @param array $where The where filter.
      * @param array $options Additional options for the query.

src/TableQuery.php

Doc Comments +7 added lines, -1 removed lines

@@ -41,6 +41,9 @@ 
      */
     private $calculator;
 
+    /**
+     * @param string $table
+     */
     public function __construct($table, $where, Db $db) {
         $this->table = $table;
         $this->where = $where;
@@ -141,6 +144,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $name
+     */
     protected function getOption($name, $default = null) {
         return isset($this->options[$name]) ? $this->options[$name] : $default;
     }
@@ -181,7 +187,7 @@ 
     /**
      * Set the calculator.
      *
-     * @param callable|null $calculator
+     * @param callable $calculator
      * @return $this
      */
     public function setCalculator(callable $calculator) {

src/TableDef.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
             }
 
             if ($type === Db::INDEX_PK || array_diff($index['columns'], $columns) == []) {
-                $currentIndex =& $this->indexes[$i];
+                $currentIndex = & $this->indexes[$i];
                 break;
             }
         }

src/Db.php

Spacing +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
         $this->px = $px;
 
         $fetchMode = $this->pdo->getAttribute(PDO::ATTR_DEFAULT_FETCH_MODE);
-        $this->setDefaultFetchMode($fetchMode === PDO::FETCH_BOTH ? PDO::FETCH_ASSOC: $fetchMode);
+        $this->setDefaultFetchMode($fetchMode === PDO::FETCH_BOTH ? PDO::FETCH_ASSOC : $fetchMode);
     }
 
     /**
@@ -369,7 +369,7 @@ 
 
         if (!empty($row['enum'])) {
             $enum = explode(',', $brackets);
-            $schema['enum'] = array_map(function ($str) {
+            $schema['enum'] = array_map(function($str) {
                 return trim($str, "'\" \t\n\r\0\x0B");
             }, $enum);
         }
@@ -399,7 +399,7 @@ 
             }
             $dbtype .= ')';
         } elseif (!empty($typeDef['enum'])) {
-            $parts = array_map(function ($str) {
+            $parts = array_map(function($str) {
                 return "'{$str}'";
             }, $typeDef['enum']);
             $dbtype .= '('.implode(',', $parts).')';
@@ -449,7 +449,7 @@ 
         $newColumns = (array)$tableDef['columns'];
 
         $alterDef['add']['columns'] = array_diff_key($newColumns, $curColumns);
-        $alterDef['alter']['columns'] = array_uintersect_assoc($newColumns, $curColumns, function ($new, $curr) {
+        $alterDef['alter']['columns'] = array_uintersect_assoc($newColumns, $curColumns, function($new, $curr) {
             $search = ['dbtype', 'allowNull', 'default'];
             foreach ($search as $key) {
                 if (self::val($key, $curr) !== self::val($key, $new)) {

src/SqliteDb.php

Spacing +1 added lines, -1 removed lines

@@ -445,7 +445,7 @@
         )->fetchAll(PDO::FETCH_COLUMN);
 
         // Remove internal tables.
-        $tables = array_filter($tables, function ($name) {
+        $tables = array_filter($tables, function($name) {
             return substr($name, 0, 7) !== 'sqlite_';
         });