Merge pull request #46 from wgevaert/add-php-cs-fixer

Add php-cs-fixer to github actions, jeej!

Author: wgevaert

.github/workflows/main.yml

@@ -55,8 +55,13 @@ jobs:
       - name: Install dependencies
         run: composer update --working-dir ${{ env.INSTALL_PATH }}
 
+      - name: Run php-cs-fixer
+        run: |
+            composer php-cs-fixer --working-dir ${{ env.INSTALL_PATH }} -- --dry-run ./src
+            composer php-cs-fixer --working-dir ${{ env.INSTALL_PATH }} -- --dry-run ./tests
+
       - name: Run unit tests
         run: composer test --working-dir ${{ env.INSTALL_PATH }}
 
       - name: Run mutation tests
-        run: composer infect --working-dir ${{ env.INSTALL_PATH }}
+        run: composer infect --working-dir ${{ env.INSTALL_PATH }}

composer.json

@@ -40,7 +40,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": "~9.0",
-    "infection/infection": "^0.25.5"
+    "infection/infection": "^0.25.5",
+    "friendsofphp/php-cs-fixer": "^3.0"
   },
   "autoload": {
     "psr-4": {
@@ -54,7 +55,9 @@
   },
   "scripts": {
     "test": "phpunit tests/",
-    "infect": "XDEBUG_MODE=coverage infection --show-mutations"
+    "infect": "XDEBUG_MODE=coverage infection --show-mutations",
+    "php-cs-fixer":
+       "php-cs-fixer fix --verbose --rules=@PSR12,align_multiline_comment,array_indentation,blank_line_before_statement,no_unused_imports,no_useless_else,no_useless_return,ordered_imports,phpdoc_scalar,return_assignment,simplified_if_return,trailing_comma_in_multiline"
   },
   "minimum-stability": "stable",
   "prefer-stable": true

src/Clauses/CallClause.php

@@ -60,4 +60,4 @@ protected function getClause(): string
     {
         return 'CALL';
     }
-}
+}

src/Clauses/UnionClause.php

@@ -79,4 +79,4 @@ protected function getClause(): string
     {
         return 'UNION';
     }
-}
+}

src/Query.php

@@ -21,8 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use Closure;
-use Prophecy\Call\Call;
+use function is_callable;
 use WikibaseSolutions\CypherDSL\Clauses\CallClause;
 use WikibaseSolutions\CypherDSL\Clauses\CallProcedureClause;
 use WikibaseSolutions\CypherDSL\Clauses\Clause;
@@ -58,7 +57,6 @@
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
-use function is_callable;
 
 /**
  * Builder class for building complex Cypher queries.

tests/Unit/Clauses/CallClauseTest.php

@@ -27,4 +27,4 @@ public function testCallClauseFilled(): void
         $this->assertEquals('CALL { MATCH (x:X) RETURN * }', $clause->toQuery());
         $this->assertEquals($query, $clause->getSubQuery());
     }
-}
+}

tests/Unit/Clauses/UnionClauseTest.php

@@ -51,4 +51,4 @@ public function testUnionFactoryAll(): void
 
         $this->assertEquals('MATCH (x:X) RETURN x UNION ALL MATCH (y:Y) RETURN y', $query->toQuery());
     }
-}
+}

tests/Unit/QueryTest.php

@@ -27,7 +27,6 @@
 use WikibaseSolutions\CypherDSL\Assignment;
 use WikibaseSolutions\CypherDSL\Clauses\Clause;
 use WikibaseSolutions\CypherDSL\Clauses\MatchClause;
-use WikibaseSolutions\CypherDSL\Clauses\UnionClause;
 use WikibaseSolutions\CypherDSL\Exists;
 use WikibaseSolutions\CypherDSL\ExpressionList;
 use WikibaseSolutions\CypherDSL\Literals\Boolean;
@@ -1122,8 +1121,8 @@ public function testCallCallable(): void
         $this->assertEquals("MATCH (y:X) CALL { WITH y WHERE y.z = 'foo' RETURN y.z AS foo } RETURN foo", $query->toQuery());
     }
 
-    public function testCallClause(): void {
-
+    public function testCallClause(): void
+    {
         $node = Query::node('X')->named('y');
 
         $sub = Query::new()->with($node->getVariable())