Adding type hinting for abstract classes

Author: Nil Portugués

src/Builder/Syntax/AbstractBaseWriter.php

@@ -11,6 +11,7 @@
 namespace NilPortugues\SqlQueryBuilder\Builder\Syntax;
 
 use NilPortugues\SqlQueryBuilder\Builder\GenericBuilder;
+use NilPortugues\SqlQueryBuilder\Manipulation\AbstractBaseQuery;
 
 /**
  * Class AbstractBaseWriter
@@ -46,11 +47,11 @@ public function __construct(GenericBuilder $writer, PlaceholderWriter $placehold
     }
 
     /**
-     * @param $class
+     * @param AbstractBaseQuery $class
      *
      * @return string
      */
-    public static function writeQueryComment($class)
+    public static function writeQueryComment(AbstractBaseQuery $class)
     {
         $comment = '';
         if ('' !== $class->getComment()) {
@@ -61,26 +62,33 @@ public static function writeQueryComment($class)
     }
 
     /**
-     * @param                   $class
+     * @param AbstractBaseQuery $class
      * @param                   GenericBuilder $writer
      * @param PlaceholderWriter $placeholderWriter
      * @param array             $parts
      */
-    public static function writeWhereCondition($class, $writer, PlaceholderWriter $placeholderWriter, array &$parts)
-    {
+    public static function writeWhereCondition(
+        AbstractBaseQuery $class,
+        $writer, PlaceholderWriter
+        $placeholderWriter,
+        array &$parts
+    ) {
         if (!is_null($class->getWhere())) {
             $whereWriter = WriterFactory::createWhereWriter($writer, $placeholderWriter);
             $parts[]     = "WHERE {$whereWriter->writeWhere($class->getWhere())}";
         }
     }
 
     /**
-     * @param                   $class
+     * @param AbstractBaseQuery $class
      * @param PlaceholderWriter $placeholderWriter
      * @param array             $parts
      */
-    public static function writeLimitCondition($class, PlaceholderWriter $placeholderWriter, array &$parts)
-    {
+    public static function writeLimitCondition(
+        AbstractBaseQuery $class,
+        PlaceholderWriter $placeholderWriter,
+        array &$parts
+    ) {
         if (!is_null($class->getLimitStart())) {
             $start   = $placeholderWriter->add($class->getLimitStart());
             $parts[] = "LIMIT {$start}";

src/Builder/Syntax/AbstractSetWriter.php

@@ -11,6 +11,7 @@
 namespace NilPortugues\SqlQueryBuilder\Builder\Syntax;
 
 use NilPortugues\SqlQueryBuilder\Builder\GenericBuilder;
+use NilPortugues\SqlQueryBuilder\Syntax\QueryPartInterface;
 
 /**
  * Class AbstractSetWriter
@@ -32,13 +33,13 @@ public function __construct(GenericBuilder $writer)
     }
 
     /**
-     * @param $setClass
+     * @param QueryPartInterface $setClass
      * @param string $setOperation
      * @param $glue
      *
      * @return string
      */
-    protected function abstractWrite($setClass, $setOperation, $glue)
+    protected function abstractWrite(QueryPartInterface $setClass, $setOperation, $glue)
     {
         $selects = [];
 

src/Builder/Syntax/DeleteWriter.php

@@ -55,5 +55,4 @@ public function write(Delete $delete)
 
         return $comment.implode(" ", $parts);
     }
-
 }

src/Builder/Syntax/SelectWriter.php

@@ -89,7 +89,6 @@ protected function writeSelectQuery(Select $select)
     public function writeSelectColumns(Select $select, array &$parts)
     {
         if ($select->isCount() === false) {
-
             $columns = $this->writeColumnAlias(
                 $select->getAllColumns(),
                 $this->columnWriter->writeSelectsAsColumns($select),

src/Builder/Syntax/WhereWriter.php

@@ -85,7 +85,6 @@ protected function writeWhereMatches(Where $where, array &$whereArray)
                 [$columnNames, $columnValues],
                 $this->matchMode[$values['mode']]
             );
-
         }
 
         $whereArray = array_merge($whereArray, $matches);

src/Manipulation/AbstractBaseQuery.php

@@ -14,7 +14,6 @@
 use NilPortugues\SqlQueryBuilder\Syntax\SyntaxFactory;
 use NilPortugues\SqlQueryBuilder\Syntax\Table;
 use NilPortugues\SqlQueryBuilder\Syntax\Where;
-
 // Builder injects itself into query for convestion to SQL string.
 use NilPortugues\SqlQueryBuilder\Builder\BuilderInterface;
 

src/Manipulation/JoinQuery.php

@@ -139,7 +139,7 @@ public function addJoin(Select $select, $selfColumn, $refColumn)
      *
      * @return $this
      */
-    public function isJoin($isJoin = true)
+    public function setJoin($isJoin = true)
     {
         $this->isJoin = $isJoin;
 
@@ -221,7 +221,7 @@ public function isJoinSelect()
     /**
      * @return boolean
      */
-    public function getIsJoin()
+    public function isJoin()
     {
         return $this->isJoin;
     }

src/Manipulation/Select.php

@@ -161,7 +161,7 @@ public function addJoin(Select $select, $selfColumn, $refColumn)
      */
     public function isJoin($isJoin = true)
     {
-        return $this->joinQuery->isJoin($isJoin);
+        return $this->joinQuery->setJoin($isJoin);
     }
 
     /**
@@ -219,7 +219,7 @@ public function on()
      */
     public function isJoinSelect()
     {
-        return $this->joinQuery->getIsJoin();
+        return $this->joinQuery->isJoin();
     }
 
     /**

src/Manipulation/UnionAll.php

@@ -25,5 +25,4 @@ public function partName()
     {
         return 'UNION ALL';
     }
-
 }