Split mapper and query

.github/workflows/test-deploy.yml

@@ -11,14 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.4
+
+      - uses: actions/checkout@v4
 
       - name: Validate composer.json and composer.lock
         run: composer validate
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -38,7 +43,7 @@ jobs:
         run: vendor/bin/phpunit --testdox --color=always
 
       - name: Mutation tests
-        run: vendor/bin/infection --threads=2 --min-msi=100 --ansi && cat var/log/infection.log
+        run: vendor/bin/infection --threads=2 --min-msi=100 --ansi
 
       - name: Mutation Report
         run: cat var/log/infection.log

.gitignore

@@ -1,4 +1,5 @@
 .phpunit.result.cache
+.phpunit.cache
 config/.phpcs-cache
 config/.phpunit.result.cache
 .idea/

composer.json

@@ -10,16 +10,17 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.4",
     "ext-json": "*",
-    "ext-pdo": "*"
+    "ext-pdo": "*",
+    "tcds-io/php-better-generics": "dev-main"
   },
   "require-dev": {
-    "infection/infection": "^0.26.19",
-    "phpstan/phpstan": "^1.10",
-    "phpunit/phpunit": "^9.5",
-    "slevomat/coding-standard": "^8.9",
-    "symfony/var-dumper": "^5.2"
+    "infection/infection": "^0.29",
+    "phpstan/phpstan": "^2.1",
+    "phpunit/phpunit": "^12.1",
+    "squizlabs/php_codesniffer": "^3.0",
+    "symfony/var-dumper": "^7.2"
   },
   "autoload": {
     "psr-4": {
@@ -28,20 +29,20 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Test\\Tcds\\Io\\Orm\\": "tests/"
+      "Test\\Tcds\\Io\\Orm\\": "tests"
     }
   },
   "scripts": {
-    "cs:check": "vendor/bin/phpcs --colors -ps",
+    "cs:check": "vendor/bin/phpcs -s --colors --runtime-set testVersion 8.4",
     "cs:fix": "vendor/bin/phpcbf --colors -ps",
-    "mutation": "vendor/bin/infection --threads=2 --min-msi=100 --ansi",
+    "test:mutation": "vendor/bin/infection --threads=2 --min-msi=100 --ansi",
     "test:stan": "php -d memory_limit=-1 vendor/bin/phpstan analyse src --level=max --ansi",
     "test:unit": "vendor/bin/phpunit --testdox --color=always",
     "tests": [
       "@cs:check",
       "@test:stan",
       "@test:unit",
-      "@mutation"
+      "@test:mutation"
     ]
   },
   "config": {