fix cs (#83)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

.php-cs-fixer.dist.php

@@ -7,6 +7,7 @@
     ])
     ->append([
         __FILE__,
+        __DIR__.'/bootstrap.php',
     ])
 ;
 

bootstrap.php

@@ -1,13 +1,13 @@
 <?php
 
-use staabm\PHPStanDba\QueryReflection\RuntimeConfiguration;
 use staabm\PHPStanDba\QueryReflection\MysqliQueryReflector;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
 use staabm\PHPStanDba\QueryReflection\RecordingQueryReflector;
-use staabm\PHPStanDba\QueryReflection\ReplayQueryReflector;
 use staabm\PHPStanDba\QueryReflection\ReflectionCache;
+use staabm\PHPStanDba\QueryReflection\ReplayQueryReflector;
+use staabm\PHPStanDba\QueryReflection\RuntimeConfiguration;
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 // we need to record the reflection information in both, phpunit and phpstan since we are replaying it in both CI jobs.
 // in a regular application you will use phpstan-dba only within your phpstan CI job, therefore you only need 1 cache-file.
@@ -18,36 +18,35 @@
 }
 
 try {
-	if (false !== getenv('GITHUB_ACTION')) {
-		$mysqli = @new mysqli('127.0.0.1', 'root', 'root', 'phpstan_dba');
-	} else {
-		$mysqli = new mysqli('mysql80.ab', 'testuser', 'test', 'phpstan_dba');
-	}
+    if (false !== getenv('GITHUB_ACTION')) {
+        $mysqli = @new mysqli('127.0.0.1', 'root', 'root', 'phpstan_dba');
+    } else {
+        $mysqli = new mysqli('mysql80.ab', 'testuser', 'test', 'phpstan_dba');
+    }
 
-	$reflector = new MysqliQueryReflector($mysqli);
+    $reflector = new MysqliQueryReflector($mysqli);
     $reflector = new RecordingQueryReflector(
         ReflectionCache::create(
             $cacheFile
         ),
         $reflector
     );
-
 } catch (mysqli_sql_exception $e) {
-	if ($e->getCode() !== MysqliQueryReflector::MYSQL_HOST_NOT_FOUND) {
-		throw $e;
-	}
-
-	echo "\nWARN: Could not connect to MySQL.\nUsing cached reflection.\n";
-
-	// when we can't connect to the database, we rely on replaying pre-recorded db-reflection information
-	$reflector = new ReplayQueryReflector(
-		ReflectionCache::load(
-			$cacheFile
-		)
-	);
+    if (MysqliQueryReflector::MYSQL_HOST_NOT_FOUND !== $e->getCode()) {
+        throw $e;
+    }
+
+    echo "\nWARN: Could not connect to MySQL.\nUsing cached reflection.\n";
+
+    // when we can't connect to the database, we rely on replaying pre-recorded db-reflection information
+    $reflector = new ReplayQueryReflector(
+        ReflectionCache::load(
+            $cacheFile
+        )
+    );
 }
 
 QueryReflection::setupReflector(
-	$reflector,
-	RuntimeConfiguration::create()->errorMode(RuntimeConfiguration::ERROR_MODE_EXCEPTION)
+    $reflector,
+    RuntimeConfiguration::create()->errorMode(RuntimeConfiguration::ERROR_MODE_EXCEPTION)
 );

src/PdoReflection/PdoStatementReflection.php

@@ -17,20 +17,19 @@
 final class PdoStatementReflection
 {
     /**
-     * Do not change, part of internal PHPStan naming
+     * Do not change, part of internal PHPStan naming.
      *
      * @var string
      */
     private const PREVIOUS = 'previous';
 
     /**
-     * Convention key name in php-parser and PHPStan for parent node
+     * Convention key name in php-parser and PHPStan for parent node.
      *
      * @var string
      */
     private const PARENT = 'parent';
 
-
     private NodeFinder $nodeFinder;
 
     public function __construct()

src/Rules/SyntaxErrorInPreparedStatementMethodRule.php

@@ -4,16 +4,12 @@
 
 namespace staabm\PHPStanDba\Rules;
 
-use PDOStatement;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\MethodReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\ShouldNotHappenException;
-use staabm\PHPStanDba\PdoReflection\PdoStatementReflection;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
 
 /**
@@ -76,7 +72,7 @@ private function checkErrors(MethodCall $methodCall, Scope $scope): array
     {
         $args = $methodCall->getArgs();
 
-        if (count($args) < 2) {
+        if (\count($args) < 2) {
             return [];
         }
 
@@ -92,7 +88,7 @@ private function checkErrors(MethodCall $methodCall, Scope $scope): array
         $error = $queryReflection->validateQueryString($queryString);
         if (null !== $error) {
             return [
-                RuleErrorBuilder::message('Query error: ' . $error->getMessage() . ' (' . $error->getCode() . ').')->line($methodCall->getLine())->build()
+                RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($methodCall->getLine())->build(),
             ];
         }
 

src/Rules/SyntaxErrorInQueryFunctionRule.php

@@ -81,7 +81,7 @@ public function processNode(Node $node, Scope $scope): array
         $error = $queryReflection->validateQueryString($queryString);
         if (null !== $error) {
             return [
-                RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build()
+                RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build(),
             ];
         }
 

src/Rules/SyntaxErrorInQueryMethodRule.php

@@ -73,9 +73,8 @@ public function processNode(Node $node, Scope $scope): array
         $error = $queryReflection->validateQueryString($queryString);
         if (null !== $error) {
             return [
-                RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build()
+                RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build(),
             ];
-
         }
 
         return [];

tests/SyntaxErrorInPreparedStatementMethodRuleTest.php

@@ -4,7 +4,6 @@
 
 use PHPStan\Rules\Rule;
 use staabm\PHPStanDba\Rules\SyntaxErrorInPreparedStatementMethodRule;
-use staabm\PHPStanDba\Rules\SyntaxErrorInQueryFunctionRule;
 use Symplify\PHPStanExtensions\Testing\AbstractServiceAwareRuleTestCase;
 
 /**