Skip to content

Commit

Permalink
[TASK] Upgrade to phpunit/phpunit ^11.2.1
Browse files Browse the repository at this point in the history
The nightly CI run recently revealed a regression
within phpunit [1] which has been fixed meanwhile
upstream [2] by Sebastian Bergmann.

This change raises phpunit to the bugfix version
and the conflict is removed.

Used command(s):

  composer require --dev "phpunit/phpunit":"^11.2.1"

[1] sebastianbergmann/phpunit#5857
[2] https://github.com/sebastianbergmann/phpunit/releases/tag/11.2.1

Resolves: #104036
Releases: main
Change-Id: I8f83ca4b574d174dc0f13bb4a59ad5f35a905204
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84595
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Garvin Hicking <gh@faktor-e.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
  • Loading branch information
sbuerk committed Jun 11, 2024
1 parent 338b61e commit 21ae27f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"phpstan/phpdoc-parser": "^1.29.0",
"phpstan/phpstan": "^1.11.3",
"phpstan/phpstan-phpunit": "^1.4.0",
"phpunit/phpunit": "^11.0.3",
"phpunit/phpunit": "^11.2.1",
"sokil/php-isocodes-db-i18n": "^4.0.22",
"symfony/translation": "^7.0",
"typo3/testing-framework": "dev-main",
Expand Down Expand Up @@ -330,8 +330,5 @@
"TYPO3Tests\\ViewhelperLibrary\\": "typo3/sysext/fluid/Tests/Functional/Fixtures/Libraries/viewhelper_library/src/",
"TYPO3\\CMS\\PHPStan\\": "Build/phpstan/src/"
}
},
"conflict": {
"phpunit/phpunit": "11.2.0"
}
}
18 changes: 9 additions & 9 deletions composer.lock

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

0 comments on commit 21ae27f

Please sign in to comment.