Skip to content

Commit

Permalink
[TASK] Raise typo3/testing-framework
Browse files Browse the repository at this point in the history
typo3/testing-framework:dev-main now got
the most important patches for phpunit 10
compatibility. This needs to be raised.

> composer u typo3/testing-framework

Resolves: #100512
Related: #100249
Releases: main
Change-Id: Ib737de1d1f5c9c9fb5f135054338ea573bbbc9fe
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78520
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
  • Loading branch information
lolli42 committed Apr 6, 2023
1 parent 15e19a1 commit 3dd59ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
4 changes: 0 additions & 4 deletions Build/testing-docker/local/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,6 @@ services:
fi
php -v | grep '^PHP'
composer req --dev --no-progress --no-interaction phpunit/phpunit:^10 -w
composer req --dev --no-progress --no-interaction typo3/testing-framework:dev-lolli-1
if [ ${CHUNKS} -gt 0 ]; then
echo \"Running chunk ${THISCHUNK}\"
COMMAND=\"vendor/phpunit/phpunit/phpunit -c Build/phpunit/FunctionalTests-Job-${THISCHUNK}.xml ${EXTRA_TEST_OPTIONS} --exclude-group not-sqlite ${TEST_FILE}\"
Expand Down Expand Up @@ -1224,7 +1223,6 @@ services:
fi
php -v | grep '^PHP'
composer req --dev --no-progress --no-interaction phpunit/phpunit:^10 -w
composer req --dev --no-progress --no-interaction typo3/testing-framework:dev-lolli-1
COMMAND=\"vendor/phpunit/phpunit/phpunit -c Build/phpunit/FunctionalTestsDeprecated-10.xml ${EXTRA_TEST_OPTIONS} --exclude-group not-sqlite ${TEST_FILE}\"
if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
XDEBUG_MODE=\"off\" $${COMMAND};
Expand Down Expand Up @@ -1393,7 +1391,6 @@ services:
fi
php -v | grep '^PHP'
composer req --dev --no-progress --no-interaction phpunit/phpunit:^10 -w
composer req --dev --no-progress --no-interaction typo3/testing-framework:dev-lolli-1
if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
XDEBUG_MODE=\"off\" \
vendor/phpunit/phpunit/phpunit -c Build/phpunit/UnitTests-10.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
Expand Down Expand Up @@ -1447,7 +1444,6 @@ services:
fi
php -v | grep '^PHP'
composer req --dev --no-progress --no-interaction phpunit/phpunit:^10 -w
composer req --dev --no-progress --no-interaction typo3/testing-framework:dev-lolli-1
if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
XDEBUG_MODE=\"off\" \
vendor/phpunit/phpunit/phpunit -c Build/phpunit/UnitTestsDeprecated-10.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3dd59ee

Please sign in to comment.