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/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/Clause/Join.php

Indentation -1 removed lines

@@ -8,7 +8,6 @@
  * LEFT JOIN, two ways
  * (new Join('cbx_order', 'Orders'))->on('user_id', 'User', 'id')->type('LEFT');
  * (new Join('cbx_order', 'Orders'))->on('user_id', 'User', 'id')->left();
-
  * INNER JOIN, with helper, before on
  * (new Join('cbx_order', 'Orders'))->inner()->on('user_id', 'User', 'id');
  */

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/Relation/DatabaseRelations.php

Spacing +11 added lines, -11 removed lines

@@ -27,24 +27,24 @@ 
     public function listRelations(): array
     {
         $relations = [];
-        foreach($this->connection->schema()->foreignKeysFor() as $table => $join){
+        foreach ($this->connection->schema()->foreignKeysFor() as $table => $join) {
 
-            if(count($join) == 1){
-                $res = new HasOne($table, $join,$this->connection);
+            if (count($join) == 1) {
+                $res = new HasOne($table, $join, $this->connection);
                 $relations["$res"] = $res;
             }
-            else if(count($join) == 2){
-                $res = new OneToMany($table, $join,$this->connection);
+            else if (count($join) == 2) {
+                $res = new OneToMany($table, $join, $this->connection);
                 $relations["$res"] = $res;
 
-                $res = new OneToMany($table, array_reverse($join),$this->connection);
+                $res = new OneToMany($table, array_reverse($join), $this->connection);
                 $relations["$res"] = $res;
             }
-            else if(count($join) == 3){
-                $res = new OneToManyQualified($table, $join,$this->connection);
+            else if (count($join) == 3) {
+                $res = new OneToManyQualified($table, $join, $this->connection);
                 $relations["$res"] = $res;
 
-                $res = new OneToManyQualified($table, array_reverse($join),$this->connection);
+                $res = new OneToManyQualified($table, array_reverse($join), $this->connection);
                 $relations["$res"] = $res;
             }
             else
@@ -66,8 +66,8 @@ 
     {
         $ret = [];
 
-        foreach($this->relations as $urn => $relation){
-            if($relation->source() === $source){
+        foreach ($this->relations as $urn => $relation) {
+            if ($relation->source() === $source) {
                 $ret[$urn] = $relation;
             }
         }

Braces +3 added lines, -6 removed lines

@@ -32,22 +32,19 @@
             if(count($join) == 1){
                 $res = new HasOne($table, $join,$this->connection);
                 $relations["$res"] = $res;
-            }
-            else if(count($join) == 2){
+            } else if(count($join) == 2){
                 $res = new OneToMany($table, $join,$this->connection);
                 $relations["$res"] = $res;
 
                 $res = new OneToMany($table, array_reverse($join),$this->connection);
                 $relations["$res"] = $res;
-            }
-            else if(count($join) == 3){
+            } else if(count($join) == 3){
                 $res = new OneToManyQualified($table, $join,$this->connection);
                 $relations["$res"] = $res;
 
                 $res = new OneToManyQualified($table, array_reverse($join),$this->connection);
                 $relations["$res"] = $res;
-            }
-            else
+            } else
             {
                 vd($join, 'skipping '.$table);
             }

src/Relation/AbstractRelation.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     protected $secondary_table;
     protected $secondary_col;
 
-    public const NAME='ABSTRACT_RELATION';
+    public const NAME = 'ABSTRACT_RELATION';
 
     
     public function __debugInfo()
@@ -46,11 +46,11 @@ 
         $this->connection = $c;
     }
 
-    public function source(){
+    public function source() {
         return $this->primary_table;
     }
 
-    public function target(){
+    public function target() {
         return $this->secondary_table;
     }
 

src/Relation/OneToManyQualified.php

Spacing +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 
 class OneToManyQualified extends OneToMany
 {
-    private $pivot_qualified;   // FK to the table storing the qualifiers
+    private $pivot_qualified; // FK to the table storing the qualifiers
 
-    private $qualified_table;   // table storing the qualifiers (tags)
-    private $qualified_col;     // PK of the table storing the qualifiers
+    private $qualified_table; // table storing the qualifiers (tags)
+    private $qualified_col; // PK of the table storing the qualifiers
 
     public const NAME = 'hasAndBelongsToManyQualified';
 
@@ -25,7 +25,7 @@ 
 
     public function __toString()
     {
-        return $this->primary_table . '-hasAndBelongsToManyQualified-' . $this->secondary_table;
+        return $this->primary_table.'-hasAndBelongsToManyQualified-'.$this->secondary_table;
     }
 
     // what a mess...
@@ -55,7 +55,7 @@ 
 
     public function getTargets(int $source): array
     {
-        $table =$this->connection->schema()->table($this->secondary_table);
+        $table = $this->connection->schema()->table($this->secondary_table);
         $select = $table->select()
             ->join([$this->pivot_table], [[$this->secondary_table, $this->secondary_col, $this->pivot_table, $this->pivot_secondary]], 'INNER')
             ->whereEQ($this->pivot_primary, $source, $this->pivot_table);
@@ -80,11 +80,11 @@ 
     private function query(int $source, array $targetWithQualifier, string $method): array
     {
         
-        if($source < 1) {
+        if ($source < 1) {
             throw new \InvalidArgumentException('MISSING_PARENT_ID');
         }
 
-        if($method !== 'insert' && $method !== 'delete') {
+        if ($method !== 'insert' && $method !== 'delete') {
             throw new \InvalidArgumentException('INVALID_METHOD');
         }
 
@@ -92,7 +92,7 @@ 
 
         try {
             vd($targetWithQualifier, $this->pivot_table);
-            $pivot_table =$this->connection->schema()->table($this->pivot_table);
+            $pivot_table = $this->connection->schema()->table($this->pivot_table);
 
             foreach ($targetWithQualifier as [$qualified_id, $qualifier_id]) {