feat: Add strict types, new conditions, and extensive test coverage

.github/workflows/rector.yml

@@ -0,0 +1,27 @@
+name: Rector
+
+on:
+  - pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  pint:
+    name: Rector
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.4"
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Composer install
+        run: composer install --no-interaction --no-ansi --no-progress
+      - name: Run Rector
+        run: ./vendor/bin/rector process --dry-run

composer.json

@@ -5,11 +5,11 @@
     "description": "",
     "scripts": {
         "phpstan": "php ./vendor/bin/phpstan analyse --memory-limit=4G",
-        "pint": "./vendor/bin/pint --test -v",
-        "pint:fix": "./vendor/bin/pint",
-        "test": "./vendor/bin/pest",
-        "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --min=63.2",
-        "test:type-coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --type-coverage --min=99.8"
+        "pint": "./vendor/bin/pint --test -v --parallel",
+        "pint:fix": "./vendor/bin/pint -v --parallel",
+        "test": "./vendor/bin/pest --parallel",
+        "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --parallel --min=84.6",
+        "test:type-coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --type-coverage --min=100"
     },
     "authors": [
         {

pint.json

@@ -18,6 +18,7 @@
     "concat_space": {
       "spacing": "one"
     },
+    "declare_strict_types": true,
     "fully_qualified_strict_types": true,
     "function_to_constant": true,
     "general_phpdoc_annotation_remove": {

rector.php

@@ -5,32 +5,22 @@
 use Rector\Config\RectorConfig;
 
 return RectorConfig::configure()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        earlyReturn: true,
+        strictBooleans: true,
+    )
     ->withPhpSets()
     ->withAttributesSets(phpunit: true)
     ->withRules([
-        Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector::class,
-        Rector\CodeQuality\Rector\NullsafeMethodCall\CleanupUnneededNullsafeOperatorRector::class,
-        Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector::class,
-        Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector::class,
-        Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictFluentReturnRector::class,
-        Rector\Php80\Rector\Class_\StringableForToStringRector::class,
         Rector\CodingStyle\Rector\ArrowFunction\StaticArrowFunctionRector::class,
         Rector\CodingStyle\Rector\Closure\StaticClosureRector::class,
-        Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector::class,
-        Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\BoolReturnTypeFromBooleanStrictReturnsRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictScalarReturnsRector::class,
-        Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector::class,
-        Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector::class,
-        Rector\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector::class,
-        Rector\CodeQuality\Rector\Foreach_\ForeachToInArrayRector::class,
-        Rector\CodeQuality\Rector\BooleanAnd\RemoveUselessIsObjectCheckRector::class,
     ])
     ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
-    ->withTypeCoverageLevel(0);
+    ->withImportNames(removeUnusedImports: true);

src/Attribute/OneToMany.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm\Attribute;
 
 use Attribute;

src/Attribute/TableIndex.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm\Attribute;
 
 use Attribute;

src/Attribute/TablePrimary.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm\Attribute;
 
 use Artemeon\Database\Schema\DataType;

src/Collection.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm;
 
 use Artemeon\Database\ConnectionInterface;
@@ -17,7 +19,7 @@ class Collection extends AbstractLazyCollection
     public function __construct(
         private readonly string $relationTable,
         private readonly string $sourceColumn,
-        private array $type,
+        private readonly array $type,
         private readonly string $primaryValue,
         private readonly ConnectionInterface $connection,
         private readonly FieldMapper $mapper,

src/Comparator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm;
 
 use RuntimeException;

src/Condition.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm;
 
 use Artemeon\Orm\Condition\CompositeCondition;
@@ -47,7 +49,7 @@ public function getWhere(): string
 
     public function isEmpty(): bool
     {
-        return empty($this->where);
+        return $this->where === '' || $this->where === '0';
     }
 
     /**
@@ -56,29 +58,39 @@ public function isEmpty(): bool
     final public static function forValue(mixed $value, string $tableColumn, ?Comparator $comparator = null): ?ConditionInterface
     {
         if (is_string($value)) {
-            if ($comparator === null || $comparator === Comparator::LIKE) {
+            if (!$comparator instanceof Comparator || $comparator === Comparator::LIKE) {
                 return new LikeCondition($tableColumn, '%' . $value . '%');
             }
 
             return new Condition($tableColumn . ' ' . $comparator->toSql() . ' ?', [$value]);
-        } elseif (is_int($value) || is_float($value)) {
-            if ($comparator === null || $comparator === Comparator::EQUAL) {
+        }
+
+        if (is_int($value) || is_float($value)) {
+            if (!$comparator instanceof Comparator || $comparator === Comparator::EQUAL) {
                 return new EqualsCondition($tableColumn, $value);
             }
 
             return new Condition($tableColumn . ' ' . $comparator->toSql() . ' ?', [$value]);
-        } elseif (is_bool($value)) {
-            if ($comparator === null || $comparator === Comparator::EQUAL) {
+        }
+
+        if (is_bool($value)) {
+            if (!$comparator instanceof Comparator || $comparator === Comparator::EQUAL) {
                 return new EqualsCondition($tableColumn, $value ? 1 : 0);
             }
 
             return new Condition($tableColumn . ' ' . $comparator->toSql() . ' ?', [$value]);
-        } elseif (null === $value) {
+        }
+
+        if (null === $value) {
             return new IsNullCondition($tableColumn, $comparator === Comparator::IS_NOT_NULL);
-        } elseif (is_array($value)) {
+        }
+
+        if (is_array($value)) {
             if ($comparator === Comparator::IN_OR_EMPTY) {
                 return new CompositeCondition([new InCondition($tableColumn, $value), new EmptyCondition($tableColumn)], Conjunction::OR);
-            } elseif ($comparator === Comparator::NOT_IN_OR_EMPTY) {
+            }
+
+            if ($comparator === Comparator::NOT_IN_OR_EMPTY) {
                 return new CompositeCondition([new InCondition($tableColumn, $value, true), new EmptyCondition($tableColumn)], Conjunction::OR);
             }
 

src/Condition/CompositeCondition.php

@@ -1,16 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Artemeon\Orm\Condition;
 
 use Artemeon\Orm\ConditionInterface;
 use Artemeon\Orm\Conjunction;
 
 /**
- * A orm condition to store several orm conditions.
- * They will connect via given condition connect.
- * e.g.
- *  ( (<restriction_1>) AND (<restriction_2>) AND (<restriction_3>) )
- *  ( (<restriction_1>) OR (<restriction_2>) OR (<restriction_3>) ).
+ * An orm condition to store several orm conditions.
+ * They will connect via the given conjunction.
  */
 class CompositeCondition implements ConditionInterface
 {
@@ -44,7 +43,7 @@ public function addCondition(ConditionInterface $condition): self
 
     public function hasConditions(): bool
     {
-        return count($this->conditions) > 0;
+        return $this->conditions !== [];
     }
 
     public function getWhere(): string
@@ -58,13 +57,9 @@ public function getWhere(): string
         }
 
         $result = '';
-        if (count($where) > 0) {
+        if ($where !== []) {
             $result = implode(') ' . $this->conjunction->toSql() . ' (', $where);
-            if (count($where) == 1) {
-                $result = '(' . $result . ')';
-            } else {
-                $result = '( (' . $result . ') )';
-            }
+            $result = count($where) === 1 ? '(' . $result . ')' : '( (' . $result . ') )';
         }
 
         return $result;

src/Condition/EmptyCondition.php

@@ -4,27 +4,45 @@
 
 namespace Artemeon\Orm\Condition;
 
+use Artemeon\Orm\Comparator;
 use Artemeon\Orm\ConditionInterface;
+use Artemeon\Orm\Conjunction;
 
 use function sprintf;
 
-class EmptyCondition implements ConditionInterface
+readonly class EmptyCondition implements ConditionInterface
 {
-    public function __construct(private string $columnName, private bool $negated = false)
-    {
+    public function __construct(
+        private string $columnName,
+        private bool $negated = false,
+    ) {
     }
 
     public function getParams(): array
     {
-        return [];
+        return [''];
     }
 
     public function getWhere(): string
     {
         if ($this->negated) {
-            return sprintf('%s IS NOT NULL AND %s != ?', $this->columnName, '');
+            return sprintf(
+                '%s %s %s %s %s ?',
+                $this->columnName,
+                Comparator::IS_NOT_NULL->toSql(),
+                Conjunction::AND->toSql(),
+                $this->columnName,
+                Comparator::NOT_EQUAL->toSql(),
+            );
         }
 
-        return sprintf('%s IS NULL OR %s = ?', $this->columnName, '');
+        return sprintf(
+            '%s %s %s %s %s ?',
+            $this->columnName,
+            Comparator::IS_NULL->toSql(),
+            Conjunction::OR->toSql(),
+            $this->columnName,
+            Comparator::EQUAL->toSql(),
+        );
     }
 }

src/Condition/EqualsCondition.php

@@ -4,14 +4,18 @@
 
 namespace Artemeon\Orm\Condition;
 
+use Artemeon\Orm\Comparator;
 use Artemeon\Orm\ConditionInterface;
 
 use function sprintf;
 
-class EqualsCondition implements ConditionInterface
+readonly class EqualsCondition implements ConditionInterface
 {
-    public function __construct(private readonly string $columnName, private readonly mixed $value, private readonly bool $negated = false)
-    {
+    public function __construct(
+        private string $columnName,
+        private mixed $value,
+        private bool $negated = false,
+    ) {
     }
 
     public function getParams(): array
@@ -22,9 +26,17 @@ public function getParams(): array
     public function getWhere(): string
     {
         if ($this->negated) {
-            return sprintf('%s != ?', $this->columnName);
+            return sprintf(
+                '%s %s ?',
+                $this->columnName,
+                Comparator::NOT_EQUAL->toSql(),
+            );
         }
 
-        return sprintf('%s = ?', $this->columnName);
+        return sprintf(
+            '%s %s ?',
+            $this->columnName,
+            Comparator::EQUAL->toSql(),
+        );
     }
 }

src/Condition/EqualsNotCondition.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Artemeon\Orm\Condition;
+
+readonly class EqualsNotCondition extends EqualsCondition
+{
+    public function __construct(string $columnName, mixed $value)
+    {
+        parent::__construct($columnName, $value, true);
+    }
+}