Skip to content

Commit

Permalink
[update] allow php version 8.4 (#85)
Browse files Browse the repository at this point in the history
* [update] allow php version 8.4

* [update] use PHP_CS_FIXER_IGNORE_ENV to ignore php version
  • Loading branch information
lukadschaak authored Dec 3, 2024
1 parent a6d9c2c commit c9d85ad
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4

- name: Validate composer.json
run: composer validate --ansi --strict
Expand All @@ -34,7 +34,7 @@ jobs:
run: composer normalize --ansi --dry-run

- name: Check CS-Fixer
run: composer cs:check
run: PHP_CS_FIXER_IGNORE_ENV="true" composer cs:check

- name: Check PHPStan
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
dependencies: "highest"
- php-version: "8.3"
dependencies: "highest"
- php-version: "8.4"
dependencies: "highest"

steps:
- name: Git Checkout
Expand Down
8 changes: 4 additions & 4 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
database:
image: mariadb:10.11.4
image: mariadb:10.11.10
command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci" ]
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
Expand All @@ -16,11 +16,11 @@ services:
timeout: 10s

php:
image: pimcore/pimcore:php8.2-debug-latest
image: composer:latest
volumes:
- ./:/var/www/html/
- ./:/app/
environment:
MYSQL_SERVER_VERSION: mariadb-10.11.4
MYSQL_SERVER_VERSION: 10.11.10-MariaDB
depends_on:
database:
condition: service_healthy
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"symfony/config": "^5.4 || ^6.2 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
Expand Down
4 changes: 3 additions & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ parameters:
paths:
- src

checkGenericClassInNonGenericObjectType: false
ignoreErrors:
-
identifier: missingType.generics

0 comments on commit c9d85ad

Please sign in to comment.