Merge branch 'master' into git-history

Author: cevro

.github/workflows/php-psr.yml

@@ -0,0 +1,34 @@
+name: PSR12 (PHP codesniffer)
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    name: deafult with ${{ matrix.php }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.3' ]
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+        with:
+          submodules: recursive
+      - uses: shivammathur/setup-php@v2
+        name: Setup PHP
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, mysql, soap, xml
+          tools: composer
+          ini-values: session.gc_probability=0, date.timezone="Europe/Prague", display_startup_errors = Off
+      - name: Composer install
+        run: composer install --no-progress --prefer-dist
+      - run: composer run-script testPSR
+        name: Test
+      - if: failure()
+        name: Failure output
+        uses: actions/upload-artifact@v4
+        with:
+          name: output ${{ matrix.php }} with ${{ matrix.database }}
+          path: tests/**/*.actual

.github/workflows/php-stan.yml

@@ -0,0 +1,30 @@
+name: PHPStan
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: PHP ${{ matrix.php }} with ${{ matrix.database }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.3' ]
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+        with:
+          submodules: recursive
+      - uses: shivammathur/setup-php@v2
+        name: Setup PHP
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, mysql, soap, xml
+          tools: composer
+          ini-values: session.gc_probability=0, date.timezone="Europe/Prague", display_startup_errors = Off
+      - name: Composer install
+        run: composer install --no-progress --prefer-dist
+      - uses: php-actions/phpstan@v3
+        with:
+          level: 6
+          path: src/ tests/

.github/workflows/php.yml

@@ -5,11 +5,11 @@ on: [push, pull_request]
 jobs:
   test:
     name: PHP ${{ matrix.php }} with ${{ matrix.database }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0']
+        php: [ '8.3' ]
         database: [ 'mysql' ]
     steps:
       # MariaDB container has to be started in advance to initialize itself before using it.
@@ -35,15 +35,15 @@ jobs:
       - run: composer run-script initTestDatabase
         name: Init test database
       - run: composer run-script testCoverage
-        name: Test 
+        name: Test
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: code-coverage-report
+          name: code-coverage-report ${{ matrix.php }} with ${{ matrix.database }}
           path: coverage.html
       - if: failure()
         name: Failure output
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: output
+          name: output ${{ matrix.php }} with ${{ matrix.database }}
           path: tests/**/*.actual

.gitignore

@@ -2,4 +2,6 @@
 /tests/config.local.neon
 /tests/temp/*
 !/tests/temp/.gitignore
+tests/**/*.actual
+tests/**/*.expected
 coverage.html

README.md

@@ -1,7 +1,7 @@
 # Nette ORM
 
 ![GitHub branch checks state](https://img.shields.io/github/checks-status/fykosak/nette-orm/master)
-<img src="https://img.shields.io/badge/coverage-99%25-green" />
+<img src="https://img.shields.io/badge/coverage-83%25-green" />
 
 ## install
 

composer.json

@@ -4,14 +4,16 @@
   "type": "library",
   "license": "GPL-3.0-or-later",
   "require": {
-    "php": ">=7.4 <8.1",
-    "nette/di": "^3.0",
-    "nette/database": "^3.1",
+    "php": ">=8.3",
+    "nette/di": "v3.*",
+    "nette/database": "v3.*",
     "ext-pdo": "*",
     "ext-gettext": "*"
   },
   "require-dev": {
-    "nette/tester": "^2.4.0"
+    "nette/tester": "^2.4.0",
+    "squizlabs/php_codesniffer": "3.6.0",
+    "phpstan/phpstan": "2.1.21"
   },
   "authors": [
     {
@@ -34,6 +36,7 @@
     }
   },
   "scripts": {
+    "testPSR": "php -e vendor/squizlabs/php_codesniffer/bin/phpcs --standard=PSR12 src/",
     "initTestDatabase": [
       "mysql < tests/resource/schema.sql "
     ],
@@ -45,6 +48,9 @@
     ],
     "testCoverage": [
       "vendor/bin/tester tests -p php --coverage coverage.html --coverage-src src/ -s -c tests/php.ini -j 1"
+    ],
+    "testPHPStan": [
+      "vendor/bin/phpstan analyse --level 6 src/ tests/"
     ]
   }
 }