preparing php7 upgrade

.gitignore

@@ -1,3 +1,4 @@
+.idea
 build/
 vendor/
 bin/

composer.json

@@ -20,6 +20,10 @@
             "role":"Contributor"
         }
     ],
+    "scripts": {
+        "test": "php vendor/pestphp/pest/bin/pest",
+        "rector": "php vendor/rector/rector/bin/rector"
+    },
     "autoload":{
         "psr-4":{
             "NilPortugues\\Sql\\QueryBuilder\\":"src/"
@@ -32,19 +36,21 @@
     },
     "require":
     {
-        "php": ">=5.5",
+        "php": ">=7",
         "nilportugues/sql-query-formatter": "~1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.*",
-        "fabpot/php-cs-fixer": "~1.9",
-        "nilportugues/php_backslasher": "~0.2"
+        "phpunit/phpunit": "^9.0",
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "pestphp/pest": "^0.1.5",
+        "rector/rector": "^0.7.26"
     },
     "config":
     {
         "bin-dir": "bin"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"

rector.yaml

@@ -0,0 +1,25 @@
+imports:
+    - { resource: "create-rector.yaml", ignore_errors: 'not_found' }
+
+parameters:
+    # bleeding edge feature
+    # is_cache_enabled: true
+
+    auto_import_names: true
+
+    sets:
+        # - solid
+        - 'dead-code'
+
+    paths:
+        - src
+        - tests
+
+    exclude_paths:
+        - "/vendor/"
+
+    php_version_features: '7.4'
+
+services:
+    Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateConstantRector: null
+    Rector\SOLID\Rector\Class_\RepeatedLiteralToClassConstantRector: null

src/Builder/BuilderException.php

@@ -10,9 +10,10 @@
 
 namespace NilPortugues\Sql\QueryBuilder\Builder;
 
+use Exception;
 /**
  * Class BuilderException.
  */
-final class BuilderException extends \Exception
+final class BuilderException extends Exception
 {
 }

src/Builder/GenericBuilder.php

@@ -10,6 +10,16 @@
 
 namespace NilPortugues\Sql\QueryBuilder\Builder;
 
+use NilPortugues\Sql\QueryBuilder\Builder\Syntax\PlaceholderWriter;
+use NilPortugues\Sql\QueryBuilder\Builder\Syntax\WhereWriter;
+use NilPortugues\Sql\QueryFormatter\Formatter;
+use NilPortugues\Sql\QueryBuilder\Manipulation\Delete;
+use NilPortugues\Sql\QueryBuilder\Manipulation\Intersect;
+use NilPortugues\Sql\QueryBuilder\Manipulation\Union;
+use NilPortugues\Sql\QueryBuilder\Manipulation\UnionAll;
+use NilPortugues\Sql\QueryBuilder\Manipulation\Minus;
+use ReflectionClass;
+use RuntimeException;
 use NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory;
 use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery;
 use NilPortugues\Sql\QueryBuilder\Manipulation\QueryInterface;
@@ -26,21 +36,21 @@ class GenericBuilder implements BuilderInterface
     /**
      * The placeholder parameter bag.
      *
-     * @var \NilPortugues\Sql\QueryBuilder\Builder\Syntax\PlaceholderWriter
+     * @var PlaceholderWriter
      */
     protected $placeholderWriter;
 
     /**
      * The Where writer.
      *
-     * @var \NilPortugues\Sql\QueryBuilder\Builder\Syntax\WhereWriter
+     * @var WhereWriter
      */
     protected $whereWriter;
 
     /**
      * The SQL formatter.
      *
-     * @var \NilPortugues\Sql\QueryFormatter\Formatter
+     * @var Formatter
      */
     protected $sqlFormatter;
 
@@ -139,31 +149,31 @@ public function update($table = null, array $values = null)
     /**
      * @param string $table
      *
-     * @return \NilPortugues\Sql\QueryBuilder\Manipulation\Delete
+     * @return Delete
      */
     public function delete($table = null)
     {
         return $this->injectBuilder(QueryFactory::createDelete($table));
     }
 
     /**
-     * @return \NilPortugues\Sql\QueryBuilder\Manipulation\Intersect
+     * @return Intersect
      */
     public function intersect()
     {
         return QueryFactory::createIntersect();
     }
 
     /**
-     * @return \NilPortugues\Sql\QueryBuilder\Manipulation\Union
+     * @return Union
      */
     public function union()
     {
         return QueryFactory::createUnion();
     }
 
     /**
-     * @return \NilPortugues\Sql\QueryBuilder\Manipulation\UnionAll
+     * @return UnionAll
      */
     public function unionAll()
     {
@@ -174,7 +184,7 @@ public function unionAll()
      * @param \NilPortugues\Sql\QueryBuilder\Manipulation\Select $first
      * @param \NilPortugues\Sql\QueryBuilder\Manipulation\Select $second
      *
-     * @return \NilPortugues\Sql\QueryBuilder\Manipulation\Minus
+     * @return Minus
      */
     public function minus(Select $first, Select $second)
     {
@@ -199,7 +209,7 @@ public function getValues()
     public function writeFormatted(QueryInterface $query)
     {
         if (null === $this->sqlFormatter) {
-            $this->sqlFormatter = (new \ReflectionClass($this->sqlFormatterClass))->newInstance();
+            $this->sqlFormatter = (new ReflectionClass($this->sqlFormatterClass))->newInstance();
         }
 
         return $this->sqlFormatter->format($this->write($query));
@@ -211,7 +221,7 @@ public function writeFormatted(QueryInterface $query)
      *
      * @return string
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function write(QueryInterface $query, $resetPlaceholders = true)
     {
@@ -227,7 +237,7 @@ public function write(QueryInterface $query, $resetPlaceholders = true)
             return $this->queryWriterInstances[$queryPart]->write($query);
         }
 
-        throw new \RuntimeException('Query builder part not defined.');
+        throw new RuntimeException('Query builder part not defined.');
     }
 
     /**

src/Builder/Syntax/ColumnWriter.php

@@ -95,13 +95,11 @@ public function writeValueAsColumns(Select $select)
         $valueAsColumns = $select->getColumnValues();
         $newColumns = [];
 
-        if (!empty($valueAsColumns)) {
-            foreach ($valueAsColumns as $alias => $value) {
-                $value = $this->writer->writePlaceholderValue($value);
-                $newValueColumn = array($alias => $value);
+        foreach ($valueAsColumns as $alias => $value) {
+            $value = $this->writer->writePlaceholderValue($value);
+            $newValueColumn = array($alias => $value);
 
-                $newColumns[] = SyntaxFactory::createColumn($newValueColumn, null);
-            }
+            $newColumns[] = SyntaxFactory::createColumn($newValueColumn, null);
         }
 
         return $newColumns;
@@ -117,14 +115,12 @@ public function writeFuncAsColumns(Select $select)
         $funcAsColumns = $select->getColumnFuncs();
         $newColumns = [];
 
-        if (!empty($funcAsColumns)) {
-            foreach ($funcAsColumns as $alias => $value) {
-                $funcName = $value['func'];
-                $funcArgs = (!empty($value['args'])) ? '('.implode(', ', $value['args']).')' : '';
+        foreach ($funcAsColumns as $alias => $value) {
+            $funcName = $value['func'];
+            $funcArgs = (!empty($value['args'])) ? '('.implode(', ', $value['args']).')' : '';
 
-                $newFuncColumn = array($alias => $funcName.$funcArgs);
-                $newColumns[] = SyntaxFactory::createColumn($newFuncColumn, null);
-            }
+            $newFuncColumn = array($alias => $funcName.$funcArgs);
+            $newColumns[] = SyntaxFactory::createColumn($newFuncColumn, null);
         }
 
         return $newColumns;
@@ -155,8 +151,7 @@ public function writeColumn(Column $column)
         $table = ($alias) ? $this->writer->writeTableAlias($alias) : $this->writer->writeTable($column->getTable());
 
         $columnString = (empty($table)) ? '' : "{$table}.";
-        $columnString .= $this->writer->writeColumnName($column);
 
-        return $columnString;
+        return $columnString . $this->writer->writeColumnName($column);
     }
 }

src/Builder/Syntax/PlaceholderWriter.php

@@ -68,9 +68,8 @@ protected function setValidSqlValue($value)
     {
         $value = $this->writeNullSqlString($value);
         $value = $this->writeStringAsSqlString($value);
-        $value = $this->writeBooleanSqlString($value);
 
-        return $value;
+        return $this->writeBooleanSqlString($value);
     }
 
     /**

src/Builder/Syntax/WhereWriter.php

@@ -12,6 +12,8 @@
  */
 class WhereWriter extends AbstractBaseWriter
 {
+    private const SUBJECT = 'subject';
+
     /**
      * @var array
      */
@@ -172,7 +174,7 @@ protected function writeWhereBetweens(Where $where, array &$whereArray)
             function (&$between) {
 
                 $between = '('
-                    .$this->columnWriter->writeColumn($between['subject'])
+                    .$this->columnWriter->writeColumn($between[self::SUBJECT])
                     .' BETWEEN '
                     .$this->writer->writePlaceholderValue($between['a'])
                     .' AND '
@@ -198,7 +200,7 @@ protected function writeWhereNotBetweens(Where $where, array &$whereArray)
             function (&$between) {
 
                 $between = '('
-                    .$this->columnWriter->writeColumn($between['subject'])
+                    .$this->columnWriter->writeColumn($between[self::SUBJECT])
                     .' NOT BETWEEN '
                     .$this->writer->writePlaceholderValue($between['a'])
                     .' AND '
@@ -227,7 +229,7 @@ function (&$comparison) {
                     return;
                 }
 
-                $str = $this->writeWherePartialCondition($comparison['subject']);
+                $str = $this->writeWherePartialCondition($comparison[self::SUBJECT]);
                 $str .= $this->writer->writeConjunction($comparison['conjunction']);
                 $str .= $this->writeWherePartialCondition($comparison['target']);
 
@@ -286,7 +288,7 @@ protected function writeWhereIsNullable(Where $where, $getMethod, $writeMethod)
             $collection,
             function (&$collection) use ($writeMethod) {
                 $collection =
-                    '('.$this->columnWriter->writeColumn($collection['subject'])
+                    '('.$this->columnWriter->writeColumn($collection[self::SUBJECT])
                     .$this->writer->$writeMethod().')';
             }
         );
@@ -322,7 +324,7 @@ protected function writeWhereBooleans(Where $where, array &$whereArray)
         \array_walk(
             $booleans,
             function (&$boolean) use (&$placeholderWriter) {
-                $column = $this->columnWriter->writeColumn($boolean['subject']);
+                $column = $this->columnWriter->writeColumn($boolean[self::SUBJECT]);
                 $value = $this->placeholderWriter->add($boolean['value']);
 
                 $boolean = '(ISNULL('.$column.', 0) = '.$value.')';

src/Manipulation/AbstractBaseQuery.php

@@ -10,6 +10,8 @@
 
 namespace NilPortugues\Sql\QueryBuilder\Manipulation;
 
+use RuntimeException;
+use Exception;
 use NilPortugues\Sql\QueryBuilder\Syntax\OrderBy;
 use NilPortugues\Sql\QueryBuilder\Syntax\QueryPartInterface;
 use NilPortugues\Sql\QueryBuilder\Syntax\SyntaxFactory;
@@ -97,12 +99,12 @@ final public function setBuilder(BuilderInterface $builder)
     /**
      * @return BuilderInterface
      *
-     * @throws \RuntimeException when builder has not been injected
+     * @throws RuntimeException when builder has not been injected
      */
     final public function getBuilder()
     {
         if (!$this->builder) {
-            throw new \RuntimeException('Query builder has not been injected with setBuilder');
+            throw new RuntimeException('Query builder has not been injected with setBuilder');
         }
 
         return $this->builder;
@@ -117,7 +119,7 @@ public function __toString()
     {
         try {
             return $this->getSql();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return \sprintf('[%s] %s', \get_class($e), $e->getMessage());
         }
     }

src/Manipulation/AbstractSetQuery.php

@@ -10,6 +10,8 @@
 
 namespace NilPortugues\Sql\QueryBuilder\Manipulation;
 
+use NilPortugues\Sql\QueryBuilder\Syntax\Table;
+use NilPortugues\Sql\QueryBuilder\Syntax\Where;
 use NilPortugues\Sql\QueryBuilder\Syntax\QueryPartInterface;
 
 /**
@@ -45,7 +47,7 @@ public function getUnions()
     /**
      * @throws QueryException
      *
-     * @return \NilPortugues\Sql\QueryBuilder\Syntax\Table
+     * @return Table
      */
     public function getTable()
     {
@@ -57,7 +59,7 @@ public function getTable()
     /**
      * @throws QueryException
      *
-     * @return \NilPortugues\Sql\QueryBuilder\Syntax\Where
+     * @return Where
      */
     public function getWhere()
     {
@@ -69,7 +71,7 @@ public function getWhere()
     /**
      * @throws QueryException
      *
-     * @return \NilPortugues\Sql\QueryBuilder\Syntax\Where
+     * @return Where
      */
     public function where()
     {