Add phpstan and fix errors

Author: nicholasruunu

composer.json

@@ -26,7 +26,8 @@
   "require-dev": {
     "phpspec/phpspec": "^7.5",
     "rector/rector": "^1.1",
-    "friendsofphp/php-cs-fixer": "^3.59"
+    "friendsofphp/php-cs-fixer": "^3.59",
+    "phpstan/phpstan": "^1.11"
   },
   "extra": {
     "branch-alias": {

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Result/ModifierCollection.php
+
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Specification.php

phpstan.neon

@@ -0,0 +1,7 @@
+parameters:
+    level: max
+    paths:
+        - src
+
+includes:
+    - phpstan-baseline.neon

src/Condition/Between.php

@@ -7,7 +7,7 @@
 
 class Between extends AbstractSpecification
 {
-    public function __construct(string $field, protected $from, protected $to, ?string $dqlAlias = null)
+    public function __construct(string $field, protected mixed $from, protected mixed $to, ?string $dqlAlias = null)
     {
         parent::__construct($field, $dqlAlias);
     }

src/Query/Having.php

@@ -15,6 +15,9 @@ class Having implements SpecificationInterface
     public const string AND_HAVING = 'andHaving';
     public const string OR_HAVING = 'orHaving';
 
+    /**
+     * @var array<string>
+     */
     protected static array $types = [self::HAVING, self::AND_HAVING, self::OR_HAVING];
     protected string $type;
 

src/Query/IndexBy.php

@@ -18,7 +18,7 @@ class IndexBy extends AbstractSpecification
     public function modify(QueryBuilder $queryBuilder, ?string $dqlAlias = null): ?string
     {
         $queryBuilder->indexBy(
-            $this->dqlAlias ?? $dqlAlias,
+            $this->dqlAlias ?? $dqlAlias ?? '',
             $this->createPropertyWithAlias($dqlAlias),
         );
 

src/Query/Join.php

@@ -10,19 +10,17 @@
 class Join extends AbstractSpecification
 {
     public const string JOIN = 'join';
-
     public const string LEFT_JOIN = 'leftJoin';
-
     public const string INNER_JOIN = 'innerJoin';
 
+    /**
+     * @var array<string>
+     */
     protected static array $types = [self::JOIN, self::LEFT_JOIN, self::INNER_JOIN];
 
     private ?string $conditionType = null;
-
     private string|SpecificationInterface|null $condition = null;
-
     private ?string $indexedBy = null;
-
     private string $type = self::JOIN;
 
     public function __construct(string $field, private readonly string $newAlias, ?string $dqlAlias = null)

src/Query/OrderBy.php

@@ -8,12 +8,12 @@
 
 class OrderBy extends AbstractSpecification
 {
-    public const ASC = 'ASC';
-
-    public const DESC = 'DESC';
-
+    public const string ASC = 'ASC';
+    public const string DESC = 'DESC';
     protected ?string $order;
-
+    /**
+     * @var array<string>
+     */
     private static array $validOrder = [self::ASC, self::DESC];
 
     /**

src/Query/Select.php

@@ -12,14 +12,16 @@
 class Select implements SpecificationInterface
 {
     public const string SELECT = 'select';
-
     public const string ADD_SELECT = 'addSelect';
-
+    /**
+     * @var array<string>
+     */
     protected static array $types = [self::SELECT, self::ADD_SELECT];
-
     protected string $type;
 
     /**
+     * @param string|array<string> $select
+     *
      * @throws InvalidArgumentException
      */
     public function __construct(protected string|array $select, string $type = self::ADD_SELECT)

src/Result/ModifierCollection.php

@@ -8,17 +8,25 @@
 
 /**
  * CollectionResultModifierInterface allows to compose one/more ResultModifier classes.
+ *
+ * @extends ArrayCollection<int, ModifierInterface>
  */
 class ModifierCollection extends ArrayCollection implements ModifierInterface
 {
     /**
      * Compose one or more ResultModifier and evaluate as a single modifier.
+     *
+     * @param ModifierInterface ...$modifiers
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(mixed ...$modifiers)
     {
         parent::__construct();
 
-        array_map($this->add(...), $modifiers);
+        foreach ($modifiers as $modifier) {
+            $this->add($modifier);
+        }
     }
 
     /**
@@ -38,8 +46,6 @@ public function add(mixed $value): void
 
     /**
      * Modify the query (e.g. select more fields/relations).
-     *
-     * @throws InvalidArgumentException
      */
     #[\Override]
     public function modify(AbstractQuery $query): void