Skip to content
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.

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

[MAINTENANCE] Run tests for all supported PHP versions and update dependencies #1455

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
variants: [ {typo3: 11.5, php: 7.4}, {typo3: 12.4, php: 8.1} ]
variants: [ {typo3: 11.5, php: 8.1}, {typo3: 12.4, php: 8.1}, {typo3: 12.4, php: 8.3} ]
sebastian-meyer marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
11 changes: 5 additions & 6 deletions Build/Test/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ a recent docker compose (tested >=2.27.1) is needed.

Usage: $0 [options] [file]

No arguments: Run all unit tests with PHP 7.4
No arguments: Run all unit tests with PHP 8.1

Options:
-s <...>
Expand Down Expand Up @@ -113,13 +113,12 @@ Options:
- 5.7
- 8.0 (default)

-p <7.4|8.0|8.1|8.2|8.3>
-p <8.1|8.2|8.3|8.4>
Specifies the PHP minor version to be used
- 7.4: use PHP 7.4
- 8.0: use PHP 8.0
- 8.1: use PHP 8.1 (default)
- 8.2: use PHP 8.2
- 8.3: use PHP 8.3
- 8.4: use PHP 8.4

-e "<phpunit options>"
Only with -s functional|functionalDeprecated|unit|unitDeprecated|unitRandom|acceptance
Expand Down Expand Up @@ -220,7 +219,7 @@ while getopts ":a:s:t:d:i:j:p:e:xy:whuv" OPT; do
;;
p)
PHP_VERSION=${OPTARG}
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3)$ ]]; then
if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3|8.4)$ ]]; then
INVALID_OPTIONS+=("${OPTARG}")
fi
;;
Expand Down Expand Up @@ -266,7 +265,7 @@ if [ ${#INVALID_OPTIONS[@]} -ne 0 ]; then
exit 1
fi

# Move "7.4" to "php74", the latter is the docker container name
# Move "8.x" to "php8x", the latter is the docker container name
DOCKER_PHP_IMAGE=$(echo "php${PHP_VERSION}" | sed -e 's/\.//')

# Set $1 to first mass argument, this is the optional test file or test directory to execute
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Before running any of the tests, please install the project dependencies. Choose which version of TYPO3 you would like to test against.

```bash
# If you use PHP 7.4 (supported by Kitodo)
# If you use PHP 8.1 (supported by Kitodo)
composer update --with=typo3/cms-core:^11.5

# If you use PHP 8
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"docs": "https://docs.typo3.org/p/kitodo/presentation/main/en-us/"
},
"require": {
"php": "7.4 - 8.3",
"php": "8.1 - 8.4",
sebastian-meyer marked this conversation as resolved.
Show resolved Hide resolved
"ext-curl": "*",
"ext-dom": "*",
"ext-json": "*",
Expand Down
Loading