Merge pull request #240 from milan-miscevic/php82

Add 8.2, remove 7.4

Author: milan-miscevic

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
 
     steps:
       - uses: "shivammathur/setup-php@2.9.0"
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
 
     steps:
       - uses: "shivammathur/setup-php@2.9.0"
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
 
     steps:
       - uses: "shivammathur/setup-php@2.9.0"
@@ -69,7 +69,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
 
     steps:
       - uses: "shivammathur/setup-php@2.9.0"
@@ -78,6 +78,8 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "php-actions/composer@v1"
       - run: "vendor/bin/php-cs-fixer fix --dry-run -v"
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: 1
 
   unit:
     name: "PHPUnit unit tests"
@@ -87,9 +89,9 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
 
     steps:
       - uses: "shivammathur/setup-php@2.9.0"

Makefile

@@ -1,6 +1,8 @@
 DOCKER=docker-compose -f ./docker/docker-compose.yml
 # #todo change to cli if needed
-PHP=php81-fpm
+PHP=php82-fpm
+
+build: install
 
 coverage:
 	$(DOCKER) run --rm $(PHP) php -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text
@@ -26,14 +28,14 @@ psalm:
 	$(DOCKER) run --rm $(PHP) ./vendor/bin/psalm --show-info=true
 
 standards:
-	$(DOCKER) run --rm $(PHP) ./vendor/bin/php-cs-fixer fix --dry-run -v
+	$(DOCKER) run -e PHP_CS_FIXER_IGNORE_ENV=1 --rm $(PHP) ./vendor/bin/php-cs-fixer fix --dry-run -v
 
 test: standards unit phpstan psalm mutation
 
 # #todo remove unused commands in project
 unit:
-	$(DOCKER) run --rm php74-cli ./vendor/bin/phpunit
 	$(DOCKER) run --rm php80-cli ./vendor/bin/phpunit
+	$(DOCKER) run --rm php81-cli ./vendor/bin/phpunit
 	$(DOCKER) run --rm $(PHP) ./vendor/bin/phpunit
 
 # #todo remove this rule if not needed

composer.json

@@ -18,15 +18,15 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8"
+        "php": "^8"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.11.0",
-        "infection/infection": "^0.26.13",
-        "phpstan/phpstan": "^1.8.8",
+        "friendsofphp/php-cs-fixer": "^3.13.0",
+        "infection/infection": "^0.26.16",
+        "phpstan/phpstan": "^1.9.2",
         "phpstan/phpstan-strict-rules": "^1.4.4",
-        "phpunit/phpunit": "^9.5.25",
-        "vimeo/psalm": "^4.28.0"
+        "phpunit/phpunit": "^9.5.27",
+        "vimeo/psalm": "^5.1.0"
     },
     "autoload": {
         "psr-4": {