Skip to content

Commit

Permalink
Merge pull request #192 from ember-nexus/github-issue/191
Browse files Browse the repository at this point in the history
GitHub issue/191
  • Loading branch information
Syndesi authored Nov 24, 2023
2 parents 2793c65 + bd82b1d commit 47c5abf
Show file tree
Hide file tree
Showing 6 changed files with 352 additions and 342 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE_CHECK_UPSTREAM_DEPENDENCY_PHP.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: update dependency

Open tasks:

- [ ] Compare Dockerfile of [latest PHP alpine CLI](https://github.com/docker-library/php/tree/master/8.2/alpine3.18/cli) with `./docker/Dockerfile` on intermediate build `php_embed`.
- [ ] Compare Dockerfile of [latest PHP alpine CLI](https://github.com/docker-library/php/tree/master/8.3/alpine3.18/cli) with `./docker/Dockerfile` on intermediate build `php_embed`.
- If there are updates:
- [ ] Update local Dockerfile.
- [ ] Add changelog entry.
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: CS Lint
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer cs:list"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && PHP_CS_FIXER_IGNORE_ENV=1 composer cs:list"
psalm:
runs-on: ubuntu-latest
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Psalm
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer psalm"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer psalm"
phpstan:
runs-on: ubuntu-latest
Expand All @@ -101,7 +101,7 @@ jobs:
- name: Phpstan
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer phpstan"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer phpstan"
test-unit:
runs-on: ubuntu-latest
Expand All @@ -118,7 +118,7 @@ jobs:
- name: Unit Test
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer test:unit"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:unit"
test-mutant:
runs-on: ubuntu-latest
Expand All @@ -136,7 +136,7 @@ jobs:
- name: Mutant Test
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer test:mutant"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:mutant"
test-leak:
runs-on: ubuntu-latest
Expand All @@ -154,7 +154,7 @@ jobs:
- name: Leak Test
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer test:leak"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:leak"
test-mess-detector:
runs-on: ubuntu-latest
Expand All @@ -172,7 +172,7 @@ jobs:
- name: Mess Detector
run: |
docker load < /tmp/docker/api-dev-amd.tar.gz
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --quiet && composer mess"
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer mess"
test-feature:
runs-on: buildjet-4vcpu-ubuntu-2204
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
echo "waiting for containers to star tup (10s)"
sleep 10
echo "finished waiting"
docker exec ember-nexus-api bash -c "composer install --quiet && composer test:feature"
docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && composer test:feature"
test-example-generation-controller:
runs-on: buildjet-2vcpu-ubuntu-2204
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
echo "waiting for containers to star tup (10s)"
sleep 10
echo "finished waiting"
docker exec ember-nexus-api bash -c "composer install --quiet && composer test:example-generation-controller"
docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && composer test:example-generation-controller"
test-example-generation-command:
Expand Down Expand Up @@ -281,4 +281,4 @@ jobs:
echo "waiting for containers to star tup (10s)"
sleep 10
echo "finished waiting"
docker exec ember-nexus-api bash -c "composer install --quiet && BACKUP_FOLDER_CAN_BE_RESET=1 composer test:example-generation-command"
docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet && BACKUP_FOLDER_CAN_BE_RESET=1 composer test:example-generation-command"
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- Move code to expire deleted tokens from Redis into separate event listener, closes #111.
- Upgrade PHP to 8.3.0, closes [#191].
- Add parameter `--ignore-platform-req=php` to CI jobs.
- Add env variable `PHP_CS_FIXER_IGNORE_ENV=1` in cs:list CI job.

## 0.0.36 - 2023-10-29
### Added
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.2",
"php": ">=8.3",
"ext-ctype": "*",
"ext-iconv": "*",
"league/flysystem": "^3.0",
Expand Down
Loading

0 comments on commit 47c5abf

Please sign in to comment.