HexMakina / Crudites

src/CruditesExceptionFactory.php

Spacing +9 added lines, -9 removed lines

@@ -55,17 +55,17 @@ 
         list($state, $code, $message) = $errorInfo;
         $functs = [
             // violation: column cannot be null
-            1048 => function ($message) {
+            1048 => function($message) {
                 preg_match("#Column '(.+)' cannot be null#", $message, $m);
                 return ['FIELD_REQUIRED', $m[1]];
             },
 
-            1054 => function ($message) {
+            1054 => function($message) {
                 return ['COLUMN_DOES_NOT_EXIST', $message];
             },
 
             // violation: duplicate key
-            1062 => function ($message) {
+            1062 => function($message) {
                 if (preg_match("#'([^']+)' for key '([^']+)'#", $message, $m)) {
                     $entry = $m[1];
                     $key = $m[2];
@@ -79,25 +79,25 @@ 
                 return ["DUPLICATE_KEY:".$m[1]];
             },
 
-            1064 => function ($message) {
+            1064 => function($message) {
                 preg_match("#right syntax to use near '(.+)'#", $message, $m);
                 return ['SYNTAX_ERROR', $m[1]];
             },
 
-            1146 => function ($message) {
+            1146 => function($message) {
                 return ['TABLE_DOES_NOT_EXIST', $message];
             },
 
-            1264 => function ($message) {
+            1264 => function($message) {
                 preg_match("#for column '(.+)'#", $message, $m);
                 return ['VALUE_OUT_OF_RANGE', $m[1]];
             },
 
-            1364 => function ($message) {
+            1364 => function($message) {
                 return ['FIELD_REQUIRED', $message];
             },
 
-            1451 => function ($message) {
+            1451 => function($message) {
                 preg_match("#CONSTRAINT `(.+)` FOREIGN#", $message, $m);
                 return ['RELATIONAL_INTEGRITY', $m[1]];
             },
@@ -106,6 +106,6 @@ 
         if (isset($functs[$code]))
             return [call_user_func($functs[$code], $message), $code];
 
-        return ['FUBAR #' . $state . '-' . $code . '-' . $message, $code];
+        return ['FUBAR #'.$state.'-'.$code.'-'.$message, $code];
     }
 }

Braces +14 added lines, -10 removed lines

@@ -20,19 +20,22 @@ 
     {
         $errorInfo = null;
 
-        if (!$query->isSuccess())
-            $errorInfo = $query->errorInfo();
-        elseif ($exception !== null)
-            $errorInfo = $exception->errorInfo;
+        if (!$query->isSuccess()) {
+                    $errorInfo = $query->errorInfo();
+        } elseif ($exception !== null) {
+                    $errorInfo = $exception->errorInfo;
+        }
 
-        if (!is_array($errorInfo))
-            return new CruditesException('ERROR_INFO_UNAVAILABLE', 0, $exception);
+        if (!is_array($errorInfo)) {
+                    return new CruditesException('ERROR_INFO_UNAVAILABLE', 0, $exception);
+        }
 
         list($message, $code) = self::transcript($errorInfo);
 
         // TODO: losing the parsing work from transcript. IMPROVE
-        if (is_array($message))
-            $message = array_shift($message);
+        if (is_array($message)) {
+                    $message = array_shift($message);
+        }
 
         return new CruditesException($message, $code, null); // exception could reveal database credentials
     }
@@ -103,8 +106,9 @@ 
             },
 
         ];
-        if (isset($functs[$code]))
-            return [call_user_func($functs[$code], $message), $code];
+        if (isset($functs[$code])) {
+                    return [call_user_func($functs[$code], $message), $code];
+        }
 
         return ['FUBAR #' . $state . '-' . $code . '-' . $message, $code];
     }

src/Errors/CruditesError.php

Spacing +5 added lines, -5 removed lines

@@ -16,12 +16,12 @@ 
         $this->message = $message;
     }
 
-    public function __toString(){
+    public function __toString() {
         $ret = $this->message;
         
-        if(!empty($this->table))
+        if (!empty($this->table))
             $ret .= sprintf(' on table "%s"', $this->table);
-        if(!empty($this->columns))
+        if (!empty($this->columns))
             $ret .= sprintf(' on column(s) "%s"', implode('", "', $this->columns));
 
         return $ret;
@@ -31,9 +31,9 @@ 
     {
         $errorInfo = null;
 
-        if(method_exists($something_PDO, 'errorInfo'))
+        if (method_exists($something_PDO, 'errorInfo'))
             $errorInfo = $something_PDO->errorInfo();
-        elseif(property_exists($something_PDO, 'errorInfo'))
+        elseif (property_exists($something_PDO, 'errorInfo'))
             $errorInfo = $something_PDO->errorInfo;
         else
             throw new \InvalidArgumentException('INVALID_PDO_CLASS');

Braces +13 added lines, -10 removed lines

@@ -19,10 +19,12 @@ 
     public function __toString(){
         $ret = $this->message;
         
-        if(!empty($this->table))
-            $ret .= sprintf(' on table "%s"', $this->table);
-        if(!empty($this->columns))
-            $ret .= sprintf(' on column(s) "%s"', implode('", "', $this->columns));
+        if(!empty($this->table)) {
+                    $ret .= sprintf(' on table "%s"', $this->table);
+        }
+        if(!empty($this->columns)) {
+                    $ret .= sprintf(' on column(s) "%s"', implode('", "', $this->columns));
+        }
 
         return $ret;
     }
@@ -31,12 +33,13 @@ 
     {
         $errorInfo = null;
 
-        if(method_exists($something_PDO, 'errorInfo'))
-            $errorInfo = $something_PDO->errorInfo();
-        elseif(property_exists($something_PDO, 'errorInfo'))
-            $errorInfo = $something_PDO->errorInfo;
-        else
-            throw new \InvalidArgumentException('INVALID_PDO_CLASS');
+        if(method_exists($something_PDO, 'errorInfo')) {
+                    $errorInfo = $something_PDO->errorInfo();
+        } elseif(property_exists($something_PDO, 'errorInfo')) {
+                    $errorInfo = $something_PDO->errorInfo;
+        } else {
+                    throw new \InvalidArgumentException('INVALID_PDO_CLASS');
+        }
 
         // 0: the SQLSTATE associated with the last operation on the database handle
         $this->setState($errorInfo[0] ?? null);

src/Crudites.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
         $select->selectAlso(['count' => ['COUNT(*)']]);
         $res = $select->retCol();
         if (is_array($res)) {
-            return (int) current($res);
+            return (int)current($res);
         }
 
         return null;
@@ -96,7 +96,7 @@ 
             $res->execute($dat_ass);
         }
         
-        return $res instanceof \PDOStatement? $res : null;
+        return $res instanceof \PDOStatement ? $res : null;
     }
 
     public static function distinctFor(string $table, string $column_name, string $filter_by_value = null)

src/Grammar/ClauseWhere.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
         $this->where ??= [];
         $this->where[] = sprintf('(%s)', $where_condition);
 
-        if(!empty($bindings)){
+        if (!empty($bindings)) {
             $this->bindings = array_merge($this->bindings, $bindings);
         }
 
@@ -117,7 +117,7 @@ 
         return $this->wherePredicate($p);
     }
 
-    private function predicateColumn($column, $table=null): array
+    private function predicateColumn($column, $table = null): array
     {
         return [$this->tableLabel($table), $column];
     }
@@ -221,7 +221,7 @@ 
     protected function generateWhere()
     {
         if (!empty($this->where)) {
-            return PHP_EOL . ' WHERE ' . implode(PHP_EOL . ' AND ', $this->where);
+            return PHP_EOL.' WHERE '.implode(PHP_EOL.' AND ', $this->where);
         }
     }
 }

src/Grammar/ClauseJoin.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@ 
      */
     public function addJoinedTable($join_table_name, $join_table_alias)
     {
-        if(!isset($this->joined_tables[$join_table_alias])){
+        if (!isset($this->joined_tables[$join_table_alias])) {
             $this->joined_tables[$join_table_alias] = $join_table_name;
         }
-        elseif ($this->joined_tables[$join_table_alias] !== $join_table_name){
+        elseif ($this->joined_tables[$join_table_alias] !== $join_table_name) {
             throw new \InvalidArgumentException(sprintf(__FUNCTION__.'(): ALIAS `%s` ALREADY ALLOCATED FOR TABLE  `%s`', $join_table_alias, $join_table_name));
         }
     }
@@ -35,7 +35,7 @@ 
 
     public function join($table_names, $joins, $join_type = '')
     {
-        list($join_table_name,$join_table_alias) = self::processParamTableNames($table_names);
+        list($join_table_name, $join_table_alias) = self::processParamTableNames($table_names);
 
         if (preg_match('#^(INNER|LEFT|RIGHT|FULL)(\sOUTER)?#i', $join_type) !== 1) {
             $join_type = '';
@@ -73,7 +73,7 @@ 
 
             } 
             // 3 join params -> t.f = v
-            else{ 
+            else { 
                 $value = $join_field[0];
                 // join bind label
 

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
     {
         if(!isset($this->joined_tables[$join_table_alias])){
             $this->joined_tables[$join_table_alias] = $join_table_name;
-        }
-        elseif ($this->joined_tables[$join_table_alias] !== $join_table_name){
+        } elseif ($this->joined_tables[$join_table_alias] !== $join_table_name){
             throw new \InvalidArgumentException(sprintf(__FUNCTION__.'(): ALIAS `%s` ALREADY ALLOCATED FOR TABLE  `%s`', $join_table_alias, $join_table_name));
         }
     }

src/Grammar/Query/Query.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
         
         if (empty($this->bindings)) {
             unset($dbg['bindings']);
-        }
-        else{
+        } else{
             $dbg['bindings'] = json_encode($dbg['bindings']);
         }
 

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
         if (empty($this->bindings)) {
             unset($dbg['bindings']);
         }
-        else{
+        else {
             $dbg['bindings'] = json_encode($dbg['bindings']);
         }
 
@@ -99,11 +99,11 @@ 
 
     public function bindings(): array
     {
-        if(empty($this->clauses)){
+        if (empty($this->clauses)) {
             return $this->bindings;
         }
 
-        return array_merge($this->bindings, array_reduce($this->clauses, function ($carry, $clause) {
+        return array_merge($this->bindings, array_reduce($this->clauses, function($carry, $clause) {
             return array_merge($carry, $clause->bindings());
         }, []));
     }
@@ -119,7 +119,7 @@ 
 
     public function bindLabel($field, $table_name = null): string
     {
-        return ':' . $this->tableLabel($table_name) . '_' . $field;
+        return ':'.$this->tableLabel($table_name).'_'.$field;
     }
 
     public function addBindings($assoc_data): array

src/Grammar/AutoJoin.php

Spacing +2 added lines, -2 removed lines

@@ -119,13 +119,13 @@
                     continue; // dont load the log information
                 } else {
                     $m = [];
-                    if (preg_match('/(.+)_(' . $fk_column->foreignColumnName() . ')$/', $fk_column->name(), $m)) {
+                    if (preg_match('/(.+)_('.$fk_column->foreignColumnName().')$/', $fk_column->name(), $m)) {
                         $foreign_table_alias = $m[1];
                     } else {
                         $foreign_table_alias = $foreign_table_name;
                     }
 
-                    $foreign_table_alias = $single_fk ? $foreign_table_alias : $foreign_table_alias . '_' . $fk_column->name();
+                    $foreign_table_alias = $single_fk ? $foreign_table_alias : $foreign_table_alias.'_'.$fk_column->name();
 
                     // auto select non nullable columns
                 }

src/Connection.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
     private static function options(array $provided = []): array
     {
         if (isset($provided[\PDO::ATTR_ERRMODE])) {
-            unset($provided[\PDO::ATTR_ERRMODE]);          // the one option you cannot change
+            unset($provided[\PDO::ATTR_ERRMODE]); // the one option you cannot change
         }
 
         return array_merge(

src/Result.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
             throw new CruditesException('RUN_OR_PREPARE_QUERY_BEFORE_CALLING_METHOD');
 
         if (!method_exists($pdo_statement, $method))
-            throw new \BadMethodCallException(__FUNCTION__ . " method $method() does not exist in PDOStatement class");
+            throw new \BadMethodCallException(__FUNCTION__." method $method() does not exist in PDOStatement class");
 
 
         return call_user_func_array([$pdo_statement, $method], $args);
@@ -102,7 +102,7 @@ 
             throw new CruditesException('PDO_PREPARE_STRING');
             
         } catch (\PDOException $e) {
-            throw new CruditesException('PDO_EXCEPTION: ' . $e->getMessage(), $e->getCode(), $e);
+            throw new CruditesException('PDO_EXCEPTION: '.$e->getMessage(), $e->getCode(), $e);
         }
 
         return $this;

Braces +15 added lines, -10 removed lines

@@ -31,8 +31,9 @@ 
         $this->statement = $statement;
         $this->bindings = $bindings;
 
-        if ($statement instanceof \PDOStatement)
-            $this->prepared = $statement;
+        if ($statement instanceof \PDOStatement) {
+                    $this->prepared = $statement;
+        }
 
         $this->run($bindings);
     }
@@ -46,11 +47,13 @@ 
     {
         $pdo_statement = $this->executed ?? $this->prepared;
 
-        if ($pdo_statement === null)
-            throw new CruditesException('RUN_OR_PREPARE_QUERY_BEFORE_CALLING_METHOD');
+        if ($pdo_statement === null) {
+                    throw new CruditesException('RUN_OR_PREPARE_QUERY_BEFORE_CALLING_METHOD');
+        }
 
-        if (!method_exists($pdo_statement, $method))
-            throw new \BadMethodCallException(__FUNCTION__ . " method $method() does not exist in PDOStatement class");
+        if (!method_exists($pdo_statement, $method)) {
+                    throw new \BadMethodCallException(__FUNCTION__ . " method $method() does not exist in PDOStatement class");
+        }
 
 
         return call_user_func_array([$pdo_statement, $method], $args);
@@ -173,11 +176,13 @@ 
      */
     public function errorInfo(): array
     {
-        if ($this->executed !== null)
-            return $this->executed->errorInfo();
+        if ($this->executed !== null) {
+                    return $this->executed->errorInfo();
+        }
 
-        if ($this->prepared !== null)
-            return $this->prepared->errorInfo();
+        if ($this->prepared !== null) {
+                    return $this->prepared->errorInfo();
+        }
 
         return $this->pdo->errorInfo();
     }