Merge branch 'develop'

Tharos · Nov 28, 2023 · bc18e0f · bc18e0f
2 parents a2c4a73 + 48ad18e
commit bc18e0f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -15,7 +15,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
             fail-fast: false
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
             fail-fast: false
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		"classmap": ["tests/phpstan/DibiFluentDynamicReturnTypeExtension.php"]
 	},
 	"require": {
-		"php": ">= 7.2",
+		"php": "7.2 - 8.3",
 		"dibi/dibi": "^4.0 || ^5.0"
 	},
 	"require-dev": {
@@ -40,8 +40,8 @@
 	},
 	"scripts": {
 		"coverage": "tester -C -d zend_extension=xdebug --coverage tests/coverage.html --coverage-src src tests",
-		"phpstan": "phpstan analyse --configuration tests/phpstan.neon",
-		"tests": "tester -C -p php8.3 tests"
+		"phpstan": "phpstan analyse --configuration phpstan.neon",
+		"tests": "tester -C tests"
 	},
 	"extra": {
 		"branch-alias": {

diff --git a/contributing.md b/contributing.md
@@ -42,7 +42,13 @@ You need to install [Nette Tester](https://tester.nette.org/). The easiest way i
 Now you should be able to run tests. On unix-like systems run following command in your terminal:
 
 ```
-vendor/bin/tester -p php -c tests/php-unix.ini
+vendor/bin/tester -C tests
+```
+
+or use Composer script:
+
+```
+composer tests
 ```
 
 **Note:** the tests require these PHP extensions:

diff --git a/tests/phpstan.neon → phpstan.neon b/tests/phpstan.neon → phpstan.neon
@@ -2,7 +2,7 @@ parameters:
     level: 7
 
     paths:
-        - ../src
+        - src
 
     treatPhpDocTypesAsCertain: false
 

diff --git a/tests/php-unix.ini b/tests/php-unix.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ parameters: @@
         level: 7
         paths:
-            - ../src
+            - src
         treatPhpDocTypesAsCertain: false
@@ Expand Down @@