Skip to content

Various fixes #1805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
+57 −461
Draft

Various fixes #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb4d6b5
Various fixes
uuf6429 Oct 17, 2025
91dee1c
Fix typo; remove confusing and unused env var
uuf6429 Oct 17, 2025
2420347
Fix env var; tweak workflow
uuf6429 Oct 17, 2025
858039e
Minor change
uuf6429 Oct 18, 2025
f745811
Separate docker build from composer install
uuf6429 Oct 18, 2025
1bb87a6
Build one service only
uuf6429 Oct 18, 2025
b98444c
Avoid hiding potentially useful docker output
uuf6429 Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
uses: actions/checkout@v4

- name: Build Docker Container
run: docker compose -f docker-compose.yml build >/dev/null
run: docker compose -f docker-compose.yml build
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why we would want to hide the build output - this could be very useful to debug build failures.

env:
PHP_VERSION: ${{matrix.php}}

- name: Composer Install
run: docker compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} test_runner composer install --no-progress
Copy link
Contributor Author

@uuf6429 uuf6429 Oct 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The php version variable isn't relevant at this point - we're never installing composer packages for old php versions.

run: docker compose -f docker-compose.yml run test_runner composer install --no-progress --ansi
env:
PHP_VERSION: ${{matrix.php}}

- name: Dump Reflection To File
run: docker compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
run: docker compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.dat
env:
PHP_VERSION: ${{matrix.php}}

Expand All @@ -40,8 +40,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Build Docker Container
run: docker compose -f docker-compose.yml build test_runner
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prebuilds the docker image, to avoid polluting the "composer install" step.

Side note: we could also move a couple of (build) steps to an earlier job that uploads the built image as an artifact and which both of the current jobs could depend on. But that's a story for another PR. :)


- name: Composer Install
run: docker compose -f docker-compose.yml run test_runner composer install --no-progress
run: docker compose -f docker-compose.yml run test_runner composer install --no-progress --ansi

- name: Test PhpDoc
run: docker compose -f docker-compose.yml run test_runner vendor/bin/phpunit --no-progress --testsuite PhpDoc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testPeclExtensions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: docker compose -f docker-compose.yml run pecl_extensions /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionDataPecl.json

- name: Dump Reflection Without Pecl To File
run: docker compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
run: docker compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.dat

- name: Build Reflection Data With Pecl Only
run: docker compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-pecl-to-file.php
Expand Down
11 changes: 4 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# Editor
.idea/

# Datasource local storage ignored files
.idea/dataSources
dataSources.local.xml

# Editor-based HTTP Client requests
http-client.private.env.json
.idea/httpRequests
rest-client.private.env.json

# Default ignored files
.idea/workspace.xml
.idea/shelf

# PHPUnit
phpunit.xml

Expand All @@ -20,4 +17,4 @@ vendor
.php_cs.cache
.phpunit.result.cache

ReflectionData.json
ReflectionData.dat
6 changes: 0 additions & 6 deletions .idea/encodings.xml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions .idea/php-docker-settings.xml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/php-test-framework.xml
View file
Open in desktop

This file was deleted.

Loading