Skip to content

Commit d6fdeb7

Browse files
authored
Merge pull request #424 from ember-nexus/feature/gh-422-replace-nginx-unit-with-franken-php
Replace NGINX Unit with FrankenPHP, closes #422
2 parents a940c55 + 7f105a3 commit d6fdeb7

File tree

171 files changed

+803
-1683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+803
-1683
lines changed

.github/ISSUE_TEMPLATE_CHECK_UPSTREAM_DEPENDENCY_NGINX_UNIT.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/ISSUE_TEMPLATE_POST_RELEASE_TASK.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/ci-check-upstream-dependency-nginx-unit.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/ci-release-package.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -373,22 +373,22 @@ jobs:
373373
/tmp/docker/docker-image-ember-nexus-api-${{ env.NEW_VERSION }}-amd.tar.gz
374374
/tmp/docker/docker-image-ember-nexus-api-${{ env.NEW_VERSION }}-arm.tar.gz
375375
376-
- name: Initiate Originstamp certificate
377-
run: |
378-
curl -X POST "http://api.originstamp.com/v4/timestamp/create" \
379-
-H "Content-Type: application/json" \
380-
-H "Authorization: ${{ secrets.ORIGINSTAMP_AUTH_TOKEN }}" \
381-
-d \
382-
"{
383-
\"comment\": \"Release ${{ env.NEW_VERSION }} of ember-nexus/api\",
384-
\"hash\": \"${{ env.SHA }}\"
385-
}"
386-
env:
387-
SHA: ${{ github.sha }}
388-
389-
- uses: JasonEtco/create-an-issue@v2
390-
env:
391-
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
392-
NEW_VERSION: ${{ env.NEW_VERSION }}
393-
with:
394-
filename: .github/ISSUE_TEMPLATE_POST_RELEASE_TASK.md
376+
# - name: Initiate Originstamp certificate
377+
# run: |
378+
# curl -X POST "http://api.originstamp.com/v4/timestamp/create" \
379+
# -H "Content-Type: application/json" \
380+
# -H "Authorization: ${{ secrets.ORIGINSTAMP_AUTH_TOKEN }}" \
381+
# -d \
382+
# "{
383+
# \"comment\": \"Release ${{ env.NEW_VERSION }} of ember-nexus/api\",
384+
# \"hash\": \"${{ env.SHA }}\"
385+
# }"
386+
# env:
387+
# SHA: ${{ github.sha }}
388+
#
389+
# - uses: JasonEtco/create-an-issue@v2
390+
# env:
391+
# GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
392+
# NEW_VERSION: ${{ env.NEW_VERSION }}
393+
# with:
394+
# filename: .github/ISSUE_TEMPLATE_POST_RELEASE_TASK.md

.github/workflows/ci-test.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: CS Lint
9494
run: |
9595
docker load < /tmp/docker/api-dev-amd.tar.gz
96-
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"
96+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && PHP_CS_FIXER_IGNORE_ENV=1 composer cs:list"
9797
9898
psalm:
9999
runs-on: ubuntu-latest
@@ -111,7 +111,7 @@ jobs:
111111
- name: Psalm
112112
run: |
113113
docker load < /tmp/docker/api-dev-amd.tar.gz
114-
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer psalm"
114+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer psalm"
115115
116116
phpstan:
117117
runs-on: ubuntu-latest
@@ -129,7 +129,7 @@ jobs:
129129
- name: Phpstan
130130
run: |
131131
docker load < /tmp/docker/api-dev-amd.tar.gz
132-
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer phpstan"
132+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer phpstan"
133133
134134
test-unit:
135135
runs-on: ubuntu-latest
@@ -147,7 +147,7 @@ jobs:
147147
- name: Unit Test
148148
run: |
149149
docker load < /tmp/docker/api-dev-amd.tar.gz
150-
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:unit"
150+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:unit"
151151
152152
test-mutant:
153153
runs-on: buildjet-4vcpu-ubuntu-2204
@@ -166,7 +166,7 @@ jobs:
166166
- name: Mutant Test
167167
run: |
168168
docker load < /tmp/docker/api-dev-amd.tar.gz
169-
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:mutant"
169+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer test:mutant"
170170
171171
test-mess-detector:
172172
runs-on: ubuntu-latest
@@ -185,7 +185,7 @@ jobs:
185185
- name: Mess Detector
186186
run: |
187187
docker load < /tmp/docker/api-dev-amd.tar.gz
188-
docker run -v $(pwd):/var/www/html api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer mess"
188+
docker run -v $(pwd):/var/www/html --user "$(id -u):$(id -g)" api:dev-amd sh -c "composer install --ignore-platform-req=php --quiet && composer mess"
189189
190190
test-feature:
191191
runs-on: buildjet-4vcpu-ubuntu-2204
@@ -230,11 +230,11 @@ jobs:
230230
sleep 10
231231
echo "finished waiting"
232232
docker compose -f ./tests/FeatureTests/docker-compose-${{ matrix.dockerCompose }}.yml ps
233-
docker exec ember-nexus-api-dev bash -c "composer install --ignore-platform-req=php --quiet"
234-
docker exec ember-nexus-api-dev bash -c "php bin/console healthcheck"
233+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "composer install --ignore-platform-req=php --quiet"
234+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "php bin/console healthcheck"
235235
- name: Feature Test
236236
run: |
237-
docker exec ember-nexus-api-dev bash -c "export API_DOMAIN=\"http://ember-nexus-api-prod\" && echo \$API_DOMAIN && composer test:feature && composer test:feature:deprecated"
237+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "export API_DOMAIN=\"http://ember-nexus-api-prod\" && echo \$API_DOMAIN && composer test:feature && composer test:feature:deprecated"
238238
239239
test-example-generation-controller:
240240
runs-on: buildjet-2vcpu-ubuntu-2204
@@ -273,11 +273,11 @@ jobs:
273273
sleep 10
274274
echo "finished waiting"
275275
docker compose -f ./tests/ExampleGenerationController/docker-compose.yml ps
276-
docker exec ember-nexus-api-dev bash -c "composer install --ignore-platform-req=php --quiet"
277-
docker exec ember-nexus-api-dev bash -c "php bin/console healthcheck"
276+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "composer install --ignore-platform-req=php --quiet"
277+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "php bin/console healthcheck"
278278
- name: Controller Example Generation Test
279279
run: |
280-
docker exec ember-nexus-api-dev bash -c "export API_DOMAIN=\"http://ember-nexus-api\" && echo \$API_DOMAIN && composer test:example-generation-controller && composer test:example-generation-controller:deprecated"
280+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api-dev bash -c "export API_DOMAIN=\"http://ember-nexus-api\" && echo \$API_DOMAIN && composer test:example-generation-controller && composer test:example-generation-controller:deprecated"
281281
282282
283283
test-example-generation-command:
@@ -312,8 +312,8 @@ jobs:
312312
sleep 10
313313
echo "finished waiting"
314314
docker compose -f ./tests/ExampleGenerationCommand/docker-compose.yml ps
315-
docker exec ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet"
316-
docker exec ember-nexus-api bash -c "php bin/console healthcheck"
315+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api bash -c "composer install --ignore-platform-req=php --quiet"
316+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api bash -c "php bin/console healthcheck"
317317
- name: Command Example Generation Test
318318
run: |
319-
docker exec ember-nexus-api bash -c "BACKUP_FOLDER_CAN_BE_RESET=1 composer test:example-generation-command"
319+
docker exec --user "$(id -u):$(id -g)" ember-nexus-api bash -c "BACKUP_FOLDER_CAN_BE_RESET=1 composer test:example-generation-command"

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## Unreleased
8+
### Changed
9+
- Replace NGINX Unit with FrankenPHP, closes #422.
10+
- Upgrade PHP to 8.5.1, closes #419 and #423.
11+
- Upgrade to Alpine 3.23, closes #420.
12+
- Command `backup:list` sorts backups by creation date, desc.
13+
### Added
14+
- Add favicon files.
15+
### Fixed
16+
- Redis cache is cleared after backup load, closes #339.
817

918
## 0.1.26 - 2025-11-17
1019
### Changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"league/flysystem": "^3.23",
1515
"league/flysystem-bundle": "^3.3",
1616
"league/flysystem-ziparchive": "^3.23",
17-
"mongodb/mongodb": "^1.17",
17+
"mongodb/mongodb": "^2.1",
1818
"php-amqplib/php-amqplib": "^3.6",
19-
"predis/predis": "^2.2",
19+
"predis/predis": "^3.3",
2020
"ramsey/uuid": "^4.7",
2121
"symfony/asset": "7.3.*",
2222
"symfony/console": "7.3.*",
@@ -33,7 +33,7 @@
3333
"symfony/yaml": "7.3.*",
3434
"syndesi/cypher-entity-manager": "^0.2.0",
3535
"syndesi/elastic-entity-manager": "^0.1.0",
36-
"syndesi/mongo-entity-manager": "^0.1.0",
36+
"syndesi/mongo-entity-manager": "^0.2.0",
3737
"thecodingmachine/safe": "^v3.3",
3838
"tuupola/base58": "^2.1"
3939
},

0 commit comments

Comments
 (0)