Merge pull request #1 from andanteproject/develop

bug fix

Author: cristoforocervino

.php-cs-fixer.dist.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *     Dariusz Rumiński <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRules([
+        '@PhpCsFixer:risky' => true,
+        '@PSR2' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_unused_imports' => true,
+        'whitespace_after_comma_in_array' => true,
+        'method_argument_space' => [
+            'keep_multiple_spaces_after_comma' => true,
+            'on_multiline' => 'ignore'
+        ],
+        'return_type_declaration' => [
+            'space_before' => 'none'
+        ],
+        // only converts simple strings in double quotes to single quotes
+        // ignores strings using variables, escape characters or single quotes inside
+        'single_quote' => true,
+        // there should be a single space b/w the cast and it's operand
+        'cast_spaces' => ['space' => 'single'],
+        // there shouldn't be any trailing whitespace at the end of a non-blank line
+        'no_trailing_whitespace' => true,
+        // there shouldn't be any trailing whitespace at the end of a blank line
+        'no_whitespace_in_blank_line' => true,
+        // there should be a space around binary operators like (=, => etc)
+        'binary_operator_spaces' => ['default' => 'single_space'],
+        // deals with rogue empty blank lines
+        'no_extra_blank_lines' => ['tokens' => ['extra']],
+        // reduces multi blank lines b/w phpdoc description and @param to a single line
+        // NOTE: Doesn't add a blank line if none exist
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'native_function_invocation' => false,
+        'phpdoc_add_missing_param_annotation' => ['only_untyped' => false],
+        'phpdoc_align' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_types_order' => ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
+        'phpdoc_to_comment' => false,
+        'phpdoc_var_without_name' => false,
+
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    );
+
+return $config;

.php_cs.dist

@@ -31,12 +31,13 @@
         "phpunit/phpunit": "^9.5",
         "symfony/framework-bundle": "^4.4 | ^5.0",
         "symfony/yaml": "^5.2",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "phpstan/phpstan": "^0.12.78",
-        "phpstan/phpstan-phpunit": "^0.12.17",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-symfony": "^0.12.20",
-        "ext-json": "*"
+        "ext-json": "*",
+        "friendsofphp/php-cs-fixer": "^3.35",
+        "doctrine/annotations": "^2.0",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan-symfony": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -53,7 +54,12 @@
         "phpunit-base": "phpunit tests/",
         "phpunit": "@phpunit-base --testdox",
         "phpunit-coverage-text": "@phpunit-base --coverage-text --colors=never",
-        "cs-check": "mkdir -p var/cache && php-cs-fixer fix --dry-run --diff --cache-file=var/cache/.php_cs.cache --config=.php_cs.dist",
-        "cs-fix": "mkdir -p var/cache && php-cs-fixer fix --diff --cache-file=var/cache/.php_cs.cache --config=.php_cs.dist"
+        "cs-check": "mkdir -p var/cache && php-cs-fixer fix --dry-run --diff --cache-file=var/cache/.php_cs.cache --config=.php-cs-fixer.dist.php --allow-risky=yes",
+        "cs-fix": "mkdir -p var/cache && php-cs-fixer fix --diff --cache-file=var/cache/.php_cs.cache --config=.php-cs-fixer.dist.php --allow-risky=yes"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }

composer.json

@@ -1,3 +1,4 @@
 parameters:
     level: 8
     checkMissingIterableValueType: false
+    treatPhpDocTypesAsCertain: false

phpstan.neon

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
 use Doctrine\ORM\Query;

src/Exception/CannotOverrideImmutableParameterException.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
 class CannotOverrideParametersException extends ImmutableParameterException

src/Exception/CannotOverrideParametersException.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
 class DqlErrorException extends LogicException

src/Exception/DqlErrorException.php

@@ -2,11 +2,8 @@
 
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
-use Throwable;
-
 class ImmutableParameterException extends LogicException
 {
 }

src/Exception/ImmutableParameterException.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements SharedQueryBuilderException

src/Exception/InvalidArgumentException.php

@@ -1,7 +1,6 @@
 <?php
 declare(strict_types=1);
 
-
 namespace Andante\Doctrine\ORM\Exception;
 
 interface SharedQueryBuilderException