Reformat code

Author: Daniel Opitz

.cs.php

@@ -0,0 +1,41 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    //->setCacheFile(__DIR__ . '/.php_cs.cache')
+    ->setRules([
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@Symfony' => true,
+        'psr4' => true,
+        // custom rules
+        'align_multiline_comment' => true, // psr-5
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'cast_spaces' => ['space' => 'none'],
+        'concat_space' => ['spacing' => 'one'],
+        'compact_nullable_typehint' => true,
+        'declare_equal_normalize' => ['space' => 'single'],
+        'general_phpdoc_annotation_remove' => [
+            'annotations' => [
+                'author',
+                'package',
+            ],
+        ],
+        'increment_style' => ['style' => 'post'],
+        'list_syntax' => ['syntax' => 'short'],
+        'no_short_echo_tag' => true,
+        'phpdoc_add_missing_param_annotation' => ['only_untyped' => false],
+        'phpdoc_align' => false,
+        'phpdoc_no_empty_return' => false,
+        'phpdoc_order' => true, // psr-5
+        'protected_to_private' => false,
+        'yoda_style' => false,
+    ])
+    ->setFinder(PhpCsFixer\Finder::create()
+        ->in(__DIR__ . '/src')
+        ->in(__DIR__ . '/tests')
+        ->name('*.php')
+        ->ignoreDotFiles(true)
+        ->ignoreVCS(true));

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 
@@ -21,8 +20,9 @@ before_script:
   - cd $TRAVIS_BUILD_DIR
 
 script:
+  - ant check-style
   - ant phpstan
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+  - ant phpunit-coverage
 
 #after_success:
 #  - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi

build.xml

@@ -27,20 +27,19 @@
 
     <target name="fix-style" description="Code style fixer">
         <mkdir dir="${basedir}/build"/>
-        <get src="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.2/php-cs-fixer.phar" dest="${basedir}/build/php-cs-fixer.phar" skipexisting="true"/>
-        <exec executable="php" searchpath="true" resolveexecutable="true">
+        <get src="http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar" dest="${basedir}/build/php-cs-fixer.phar" skipexisting="true"/>
+        <exec executable="php" searchpath="true" resolveexecutable="true" failonerror="true">
             <arg value="${basedir}/build/php-cs-fixer.phar"/>
-            <arg value="fix"/>
-            <arg value="--rules=@PSR2"/>
-            <arg value="--using-cache=no"/>
-            <arg path="${basedir}/src"/>
+            <arg line="fix --config=.cs.php"/>
         </exec>
-        <exec executable="php" searchpath="true" resolveexecutable="true">
+    </target>
+
+    <target name="check-style" description="Code style check">
+        <mkdir dir="${basedir}/build"/>
+        <get src="http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar" dest="${basedir}/build/php-cs-fixer.phar" skipexisting="true"/>
+        <exec executable="php" searchpath="true" resolveexecutable="true" failonerror="true">
             <arg value="${basedir}/build/php-cs-fixer.phar"/>
-            <arg value="fix"/>
-            <arg value="--rules=@PSR2"/>
-            <arg value="--using-cache=no"/>
-            <arg path="${basedir}/tests"/>
+            <arg line="fix --dry-run --format=txt --verbose --diff --diff-format=udiff --config=.cs.php"/>
         </exec>
     </target>
 

composer.json

@@ -14,6 +14,9 @@
   "require-dev": {
     "phpunit/phpunit": "^6.0"
   },
+  "require": {
+    "php": ">=7.1"
+  },
   "scripts": {
     "test": "phpunit",
     "test-coverage": "phpunit --coverage-clover build/logs/clover.xml --coverage-html build/coverage",
@@ -22,12 +25,12 @@
   },
   "autoload": {
     "psr-4": {
-      "Odan\\": "src"
+      "Odan\\Database\\": "src/Database"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Odan\\Test\\": "tests"
+      "Odan\\Database\\Test\\": "tests/"
     }
   },
   "config": {

src/Database/Compression.php

@@ -3,11 +3,10 @@
 namespace Odan\Database;
 
 /**
- * Class Compression
+ * Class Compression.
  */
 class Compression
 {
-
     /** @var Connection */
     protected $db = null;
 
@@ -22,9 +21,10 @@ public function __construct(Connection $db)
     }
 
     /**
-     * Compress compatible with MySQL COMPRESS
+     * Compress compatible with MySQL COMPRESS.
      *
      * @param string|mixed $value data to compress
+     *
      * @return string|null compressed data
      */
     public function compress($value)
@@ -37,9 +37,10 @@ public function compress($value)
     }
 
     /**
-     * Uncompress compatible with MySQL UNCOMPRESS
+     * Uncompress compatible with MySQL UNCOMPRESS.
      *
      * @param string|mixed $value
+     *
      * @return string|null
      */
     public function uncompress($value)

src/Database/Condition.php

@@ -6,9 +6,8 @@
 
 class Condition
 {
-
     /**
-     * PDO Connection
+     * PDO Connection.
      *
      * @var Connection
      */
@@ -20,21 +19,21 @@ class Condition
     protected $quoter;
 
     /**
-     * PDO Connection
+     * PDO Connection.
      *
      * @var QueryInterface
      */
     protected $query;
 
     /**
-     * Where clause
+     * Where clause.
      *
      * @var array
      */
     protected $where = [];
 
     /**
-     * Having clause
+     * Having clause.
      *
      * @var array
      */
@@ -57,6 +56,7 @@ public function __construct(Connection $pdo, QueryInterface $query)
      * Get sql.
      *
      * @param array $sql
+     *
      * @return array
      */
     public function getWhereSql(array $sql): array
@@ -70,6 +70,7 @@ public function getWhereSql(array $sql): array
      * @param array $sql
      * @param array $where
      * @param string $conditionType
+     *
      * @return array
      */
     public function getConditionSql(array $sql, array $where, string $conditionType): array
@@ -82,7 +83,7 @@ public function getConditionSql(array $sql, array $where, string $conditionType)
                 $sql[] = $item->getValue();
                 continue;
             }
-            list($type, $conditions) = $item;
+            [$type, $conditions] = $item;
             if (!$index) {
                 $whereType = $conditionType;
             } else {
@@ -92,9 +93,9 @@ public function getConditionSql(array $sql, array $where, string $conditionType)
                 $sql[] = $whereType . ' ' . $conditions[0]->getValue();
                 continue;
             }
-            list($leftField, $operator, $rightField) = $conditions;
+            [$leftField, $operator, $rightField] = $conditions;
             $leftField = $this->quoter->quoteName($leftField);
-            list($rightField, $operator) = $this->getRightFieldValue($rightField, $operator);
+            [$rightField, $operator] = $this->getRightFieldValue($rightField, $operator);
 
             $sql[] = sprintf('%s %s %s %s', $whereType, $leftField, $operator, $rightField);
         }
@@ -103,12 +104,13 @@ public function getConditionSql(array $sql, array $where, string $conditionType)
     }
 
     /**
-     * Comparison Functions and Operators
+     * Comparison Functions and Operators.
      *
      * https://dev.mysql.com/doc/refman/5.7/en/comparison-operators.html
      *
      * @param mixed $rightField
      * @param mixed $comparison
+     *
      * @return array
      */
     protected function getRightFieldValue($rightField, $comparison): array
@@ -141,6 +143,7 @@ protected function getRightFieldValue($rightField, $comparison): array
      * Get sql.
      *
      * @param array $sql
+     *
      * @return array
      */
     public function getHavingSql(array $sql): array
@@ -154,6 +157,7 @@ public function getHavingSql(array $sql): array
      * @param array ...$conditions (field, comparison, value)
      * or (field, comparison, new RawExp('table.field'))
      * or new RawExp('...')
+     *
      * @return self
      */
     public function where($conditions): self
@@ -171,9 +175,10 @@ public function where($conditions): self
     /**
      * Adds to a clause through a closure, enclosing within parentheses.
      *
-     * @param string $clause The clause to work with, typically 'where' or 'having'.
-     * @param string $andor Add the condition using this operator, typically 'AND' or 'OR'.
-     * @param callable $closure The closure that adds to the clause.
+     * @param string $clause the clause to work with, typically 'where' or 'having'
+     * @param string $andor add the condition using this operator, typically 'AND' or 'OR'
+     * @param callable $closure the closure that adds to the clause
+     *
      * @return void
      */
     protected function addClauseCondClosure($clause, $andor, $closure)
@@ -196,9 +201,9 @@ protected function addClauseCondClosure($clause, $andor, $closure)
         // append an opening parenthesis to the prior set of conditions,
         // with AND/OR as needed ...
         if ($set) {
-            $set[] = new RawExp(strtoupper($andor) . " (");
+            $set[] = new RawExp(strtoupper($andor) . ' (');
         } else {
-            $set[] = new RawExp("(");
+            $set[] = new RawExp('(');
         }
 
         // append the new conditions to the set, with indenting
@@ -207,7 +212,7 @@ protected function addClauseCondClosure($clause, $andor, $closure)
         foreach ($sql as $cond) {
             $set[] = new RawExp($cond);
         }
-        $set[] = new RawExp(")");
+        $set[] = new RawExp(')');
 
         // ... then put the full set of conditions back into $this->$clause
         $this->$clause = $set;
@@ -221,6 +226,7 @@ protected function addClauseCondClosure($clause, $andor, $closure)
      * @param array ...$conditions (field, comparison, value)
      * or (field, comparison, new RawExp('table.field'))
      * or new RawExp('...')
+     *
      * @return self
      */
     public function orWhere($conditions): self
@@ -241,6 +247,7 @@ public function orWhere($conditions): self
      * @param array ...$conditions (field, comparison, value)
      * or (field, comparison, new RawExp('table.field'))
      * or new RawExp('...')
+     *
      * @return self
      */
     public function having($conditions): self
@@ -261,6 +268,7 @@ public function having($conditions): self
      * @param array ...$conditions (field, comparison, value)
      * or (field, comparison, new RawExp('table.field'))
      * or new RawExp('...')
+     *
      * @return self
      */
     public function orHaving($conditions): self

src/Database/Connection.php

@@ -58,13 +58,14 @@ public function getQuoter()
     }
 
     /**
-     * Retrieving a list of column values
+     * Retrieving a list of column values.
      *
      * sample:
      * $lists = $db->queryValues('SELECT id FROM table;', 'id');
      *
      * @param string $sql
      * @param string $key
+     *
      * @return array
      */
     public function queryValues(string $sql, string $key): array
@@ -79,11 +80,12 @@ public function queryValues(string $sql, string $key): array
     }
 
     /**
-     * Retrieve only the given column of the first result row
+     * Retrieve only the given column of the first result row.
      *
      * @param string $sql
      * @param string $column
      * @param mixed $default
+     *
      * @return mixed|null
      */
     public function queryValue(string $sql, string $column, $default = null)
@@ -97,14 +99,15 @@ public function queryValue(string $sql, string $column, $default = null)
     }
 
     /**
-     * Map query result by column as new index
+     * Map query result by column as new index.
      *
      * <code>
      * $rows = $db->queryMapColumn('SELECT * FROM table;', 'id');
      * </code>
      *
      * @param string $sql
      * @param string $key Column name to map as index
+     *
      * @return array
      */
     public function queryMapColumn(string $sql, string $key): array