Skip to content

Commit 186634a

Browse files
anomiexmatticbot
authored andcommitted
phpunit: Remove unnecessary uses of @before, @after, etc (#42706)
Back when we still supported PHP <=7.1, we had to add these in a lot of places to work around the fact that PHPUnit 8 started declaring a `void` return type on `setUp()`, `tearDown()`, and so on, which 7.1 and earler don't support. But we've since dropped support for PHP <7.2, so we can swtich back to the normal functions. It's more straightforward to do that than to start adding attributes (`#[Before]` and such) for PHPUnit 11+ where the annotations are deprecated. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/14085626545 Upstream-Ref: Automattic/jetpack@617a716
1 parent 78d7736 commit 186634a

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"require-dev": {
1010
"yoast/phpunit-polyfills": "^3.0.0",
11-
"automattic/jetpack-changelogger": "^6.0.2",
12-
"automattic/phpunit-select-config": "^1.0.1"
11+
"automattic/jetpack-changelogger": "^6.0.3-alpha",
12+
"automattic/phpunit-select-config": "^1.0.2-alpha"
1313
},
1414
"autoload": {
1515
"classmap": [

composer.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/automattic/jetpack-device-detection/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"require-dev": {
1010
"yoast/phpunit-polyfills": "^3.0.0",
11-
"automattic/jetpack-changelogger": "^6.0.2",
12-
"automattic/phpunit-select-config": "^1.0.1"
11+
"automattic/jetpack-changelogger": "^6.0.3-alpha",
12+
"automattic/phpunit-select-config": "^1.0.2-alpha"
1313
},
1414
"suggest": {
1515
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

vendor/composer/installed.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
10-
"reference": "d77d52c19e341901cd1741da3b4102f686da73c3"
10+
"reference": "e025a924ee64dc71de069473482bd169252f364c"
1111
},
1212
"require": {
1313
"php": ">=7.2"
1414
},
1515
"require-dev": {
16-
"automattic/jetpack-changelogger": "^6.0.2",
17-
"automattic/phpunit-select-config": "^1.0.1",
16+
"automattic/jetpack-changelogger": "^6.0.3-alpha",
17+
"automattic/phpunit-select-config": "^1.0.2-alpha",
1818
"yoast/phpunit-polyfills": "^3.0.0"
1919
},
2020
"suggest": {

vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'automattic/jetpack-device-detection' => array(
1414
'pretty_version' => '3.0.5',
1515
'version' => '3.0.5.0',
16-
'reference' => 'd77d52c19e341901cd1741da3b4102f686da73c3',
16+
'reference' => 'e025a924ee64dc71de069473482bd169252f364c',
1717
'type' => 'jetpack-library',
1818
'install_path' => __DIR__ . '/../automattic/jetpack-device-detection',
1919
'aliases' => array(),

0 commit comments

Comments
 (0)