reformat code

Author: rez1dent3

src/QueryBuilder/Adapter/MySQL.php

@@ -7,14 +7,6 @@
 class MySQL implements Adapter
 {
 
-    /**
-     * @return \PDO
-     */
-    public function connection()
-    {
-        return null;
-    }
-
     /**
      * @return array
      */
@@ -31,6 +23,14 @@ public function insertId()
         return $this->connection()->lastInsertId();
     }
 
+    /**
+     * @return \PDO
+     */
+    public function connection()
+    {
+        return null;
+    }
+
     /**
      * @return string
      */

src/QueryBuilder/Instruction.php

@@ -30,6 +30,33 @@ public function __construct(QueryBuilder $builder)
         $this->builder = $builder;
     }
 
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        $this->attributes = [];
+        $sql              = [];
+
+        foreach ($this->operators() as $operator => $strict)
+        {
+            $data  = $this->getStorage($operator);
+            $build = $this->build($operator, $data);
+
+            if (!empty($build))
+            {
+                $sql[] = $strict . ' ' . $build;
+            }
+        }
+
+        return implode(' ', $sql);
+    }
+
+    /**
+     * @return array
+     */
+    abstract protected function operators();
+
     /**
      * @param string $name
      *
@@ -55,28 +82,11 @@ public function getStorage($name)
     }
 
     /**
-     * @param array $attributes
-     */
-    protected function push(array $attributes)
-    {
-        $this->attributes = array_merge($this->attributes, $attributes);
-    }
-
-    /**
-     * @param $value
-     * @param $quote
+     * @return array
      */
-    protected function buildRAW(&$value, &$quote)
+    protected function &defaults()
     {
-
-        if ($value instanceof RawQuery || $value instanceof self)
-        {
-            $this->push($value->attributes());
-            $quote = false;
-
-            $value = '(' . (string)$value . ')';
-        }
-
+        return [];
     }
 
     /**
@@ -124,46 +134,36 @@ protected function build($name, $storage)
     }
 
     /**
-     * @return string
+     * @param $value
+     * @param $quote
      */
-    public function __toString()
+    protected function buildRAW(&$value, &$quote)
     {
-        $this->attributes = [];
-        $sql              = [];
 
-        foreach ($this->operators() as $operator => $strict)
+        if ($value instanceof RawQuery || $value instanceof self)
         {
-            $data  = $this->getStorage($operator);
-            $build = $this->build($operator, $data);
+            $this->push($value->attributes());
+            $quote = false;
 
-            if (!empty($build))
-            {
-                $sql[] = $strict . ' ' . $build;
-            }
+            $value = '(' . (string)$value . ')';
         }
 
-        return implode(' ', $sql);
     }
 
     /**
-     * @return array
+     * @param array $attributes
      */
-    public function attributes()
+    protected function push(array $attributes)
     {
-        return $this->attributes;
+        $this->attributes = array_merge($this->attributes, $attributes);
     }
 
     /**
      * @return array
      */
-    protected function &defaults()
+    public function attributes()
     {
-        return [];
+        return $this->attributes;
     }
 
-    /**
-     * @return array
-     */
-    abstract protected function operators();
-
 }

src/QueryBuilder/Instruction/Insert.php

@@ -19,8 +19,8 @@ class Insert extends Instruction
     protected function operators()
     {
         return [
-            'from'       => 'INSERT INTO',
-            'values'     => '',
+            'from'   => 'INSERT INTO',
+            'values' => '',
         ];
     }
 

src/QueryBuilder/Operator/Classes/Join.php

@@ -108,14 +108,6 @@ public function raw($query, array $attributes = [])
         return $this->select;
     }
 
-    /**
-     * @return array
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-
     public function attributes()
     {
         $table = current($this->table);
@@ -143,4 +135,12 @@ public function __toString()
 
     }
 
+    /**
+     * @return array
+     */
+    public function getTable()
+    {
+        return $this->table;
+    }
+
 }

src/QueryBuilder/Operator/Having.php

@@ -2,8 +2,6 @@
 
 namespace Deimos\QueryBuilder\Operator;
 
-use Deimos\QueryBuilder\RawQuery;
-
 /**
  * Class Having
  *

src/QueryBuilder/Operator/Limit.php

@@ -22,14 +22,6 @@ public function limit($value)
         return $this;
     }
 
-    /**
-     * @return int
-     */
-    protected function storageLimit()
-    {
-        return $this->storageLimit;
-    }
-
     protected function buildLimit($limit)
     {
         if (method_exists($this, 'storageOffset'))
@@ -52,4 +44,12 @@ protected function buildLimit($limit)
         return $this->storageLimit();
     }
 
+    /**
+     * @return int
+     */
+    protected function storageLimit()
+    {
+        return $this->storageLimit;
+    }
+
 }

src/QueryBuilder/Operator/Where.php

@@ -13,13 +13,12 @@
 trait Where
 {
 
+    protected $allowOperator;
     /**
      * @var array
      */
     private $storageWhere = [];
 
-    protected $allowOperator;
-
     /**
      * @param array ...$fields
      *
@@ -123,40 +122,24 @@ protected function buildWhereOne(...$args)
         return implode(' ', $list);
     }
 
-    /**
-     * @param array  $storage
-     * @param string $toStorage
-     */
-    protected function buildIf2String(array $storage, &$toStorage)
+    protected function buildWhere($storage)
     {
-        $toStorage .= '(';
-        $lastOperator = '';
+        /**
+         * @var array $where
+         */
+        $where = $this->buildWhereOperator($storage);
 
-        foreach ($storage as $key => $value)
+        // fixme: $where = [$where];
+        if (!is_array($where[0]))
         {
-            if (is_string($value[0]))
-            {
-                $this->allowOperator = true;
-                $lastOperator        = $value[0];
-                if ($key)
-                {
-                    $toStorage .= ' ' . $lastOperator . ' ';
-                }
-
-                $toStorage .= ' (' . $value[1] . ') ';
-            }
-            else
-            {
-                if ($this->allowOperator)
-                {
-                    $toStorage .= ' ' . $lastOperator . ' ';
-                }
-
-                $this->buildIf2String($value, $toStorage);
-            }
+            $where = [$where];
         }
 
-        $toStorage .= ')';
+        $sql                 = '';
+        $this->allowOperator = false;
+        $this->buildIf2String($where, $sql);
+
+        return $sql;
     }
 
     /**
@@ -195,24 +178,40 @@ protected function buildWhereOperator(array $args, $defaultOperator = 'AND')
         return $storage;
     }
 
-    protected function buildWhere($storage)
+    /**
+     * @param array  $storage
+     * @param string $toStorage
+     */
+    protected function buildIf2String(array $storage, &$toStorage)
     {
-        /**
-         * @var array $where
-         */
-        $where = $this->buildWhereOperator($storage);
+        $toStorage .= '(';
+        $lastOperator = '';
 
-        // fixme: $where = [$where];
-        if (!is_array($where[0]))
+        foreach ($storage as $key => $value)
         {
-            $where = [$where];
-        }
+            if (is_string($value[0]))
+            {
+                $this->allowOperator = true;
+                $lastOperator        = $value[0];
+                if ($key)
+                {
+                    $toStorage .= ' ' . $lastOperator . ' ';
+                }
 
-        $sql                 = '';
-        $this->allowOperator = false;
-        $this->buildIf2String($where, $sql);
+                $toStorage .= ' (' . $value[1] . ') ';
+            }
+            else
+            {
+                if ($this->allowOperator)
+                {
+                    $toStorage .= ' ' . $lastOperator . ' ';
+                }
 
-        return $sql;
+                $this->buildIf2String($value, $toStorage);
+            }
+        }
+
+        $toStorage .= ')';
     }
 
 }