Skip to content

Commit 89ea7d3

Browse files
danielmorelldanielmorell
committed
Updated Composer and NPM dependencies and updated PHP test annotations.
1 parent cbcddc3 commit 89ea7d3

7 files changed

Lines changed: 1215 additions & 1151 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"require-dev": {
1010
"yoast/phpunit-polyfills": "^4.0",
11-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
11+
"dealerdirect/phpcodesniffer-composer-installer": "^1.2.1",
1212
"squizlabs/php_codesniffer": "^3.5",
1313
"phpcompatibility/php-compatibility": "^9.3",
1414
"wp-coding-standards/wpcs": "^2.2",

‎composer.lock‎

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

‎package-lock.json‎

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

‎phpunit.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<directory suffix="Test.php">./tests/</directory>
1212
<exclude>./tests/bootstrap.php</exclude>
1313
<exclude>./tests/BaseTestCase.php</exclude>
14+
<exclude>./tests/conflict</exclude>
1415
</testsuite>
1516
</testsuites>
1617
<filter>

‎tests/PluginTest.php‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Rollbar\WordPress\Tests;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
6+
use PHPUnit\Framework\Attributes\PreserveGlobalState;
7+
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
58
use Rollbar\Payload\Level;
69
use Rollbar\Rollbar;
710
use Rollbar\WordPress\Plugin;
@@ -53,32 +56,26 @@ public function testConfigure(): void
5356
self::assertEquals($expected, $output->getEnvironment());
5457
}
5558

56-
/**
57-
* @runInSeparateProcess
58-
* @preserveGlobalState disabled
59-
*/
59+
#[RunInSeparateProcess]
60+
#[PreserveGlobalState(false)]
6061
public function testDisableAdmin(): void
6162
{
6263
self::assertFalse(Plugin::disabledAdmin());
6364
define('ROLLBAR_DISABLE_ADMIN', true);
6465
self::assertTrue(Plugin::disabledAdmin());
6566
}
6667

67-
/**
68-
* @runInSeparateProcess
69-
* @preserveGlobalState disabled
70-
*/
68+
#[RunInSeparateProcess]
69+
#[PreserveGlobalState(false)]
7170
public function testDisableAdmin2(): void
7271
{
7372
self::assertFalse(Plugin::disabledAdmin());
7473
define('ROLLBAR_DISABLE_ADMIN', false);
7574
self::assertFalse(Plugin::disabledAdmin());
7675
}
7776

78-
/**
79-
* @runInSeparateProcess
80-
* @preserveGlobalState disabled
81-
*/
77+
#[RunInSeparateProcess]
78+
#[PreserveGlobalState(false)]
8279
public function testHideAdmin(): void
8380
{
8481
add_action('rollbar_user_can_view_admin', '__return_false');
@@ -92,9 +89,7 @@ public function testGetAssetUrl(): void
9289
self::assertStringEndsWith('/wp-content/plugins/rollbar/test.js', Plugin::getAssetUrl('test.js'));
9390
}
9491

95-
/**
96-
* @dataProvider loggingLevelTestDataProvider
97-
*/
92+
#[DataProvider('loggingLevelTestDataProvider')]
9893
public function testIncludedErrno(
9994
$loggingLevel,
10095
$errorLevel,

‎tests/SettingsTest.php‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Rollbar\WordPress\Tests;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
6+
use PHPUnit\Framework\Attributes\PreserveGlobalState;
7+
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
58
use Rollbar\WordPress\Lib\AbstractSingleton;
69
use Rollbar\WordPress\Settings;
710
use Rollbar\WordPress\Settings\SettingType;
@@ -56,9 +59,7 @@ public function testGetDefaultSetting(): void
5659
self::assertTrue($settings->getDefaultOption('capture_error_stacktraces'));
5760
}
5861

59-
/**
60-
* @dataProvider preUpdateProvider
61-
*/
62+
#[DataProvider('preUpdateProvider')]
6263
public function testPreUpdate($expected, $data): void
6364
{
6465
self::assertEquals(
@@ -76,42 +77,32 @@ public function testSet(): void
7677
self::assertSame('bar', $settings->get('foo'));
7778
}
7879

79-
/**
80-
* @dataProvider toBooleanProvider
81-
*/
80+
#[DataProvider('toBooleanProvider')]
8281
public function testToBoolean(mixed $value, bool $expected): void
8382
{
8483
self::assertSame($expected, Settings::toBoolean($value));
8584
}
8685

87-
/**
88-
* @dataProvider toIntegerProvider
89-
*/
86+
#[DataProvider('toIntegerProvider')]
9087
public function testToInteger(mixed $value, int $expected): void
9188
{
9289
self::assertSame($expected, Settings::toInteger($value));
9390
}
9491

95-
/**
96-
* @dataProvider toStringProvider
97-
*/
92+
#[DataProvider('toStringProvider')]
9893
public function testToString(mixed $value, string $expected): void
9994
{
10095
self::assertSame($expected, Settings::toString($value));
10196
}
10297

103-
/**
104-
* @dataProvider toArrayStringProvider
105-
*/
98+
#[DataProvider('toArrayStringProvider')]
10699
public function testToStringArray(mixed $value, array $expected): void
107100
{
108101
self::assertSame($expected, Settings::toStringArray($value));
109102
}
110103

111-
/**
112-
* @runInSeparateProcess
113-
* @preserveGlobalState disabled
114-
*/
104+
#[RunInSeparateProcess]
105+
#[PreserveGlobalState(false)]
115106
public function testRollbarSettingsConstant(): void
116107
{
117108
define('ROLLBAR_SETTINGS', [
@@ -125,10 +116,8 @@ public function testRollbarSettingsConstant(): void
125116
self::assertSame(['bar'], Settings::getInstance()->get('scrub_fields'));
126117
}
127118

128-
/**
129-
* @runInSeparateProcess
130-
* @preserveGlobalState disabled
131-
*/
119+
#[RunInSeparateProcess]
120+
#[PreserveGlobalState(false)]
132121
public function testRollbarSettingsConstantPriority(): void
133122
{
134123
define('ROLLBAR_SETTINGS', [

‎tests/Telemetry/ListenerTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Rollbar\WordPress\Tests\Telemetry;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Rollbar\Rollbar;
67
use Rollbar\Telemetry\EventLevel;
78
use Rollbar\Telemetry\EventType;
@@ -59,9 +60,7 @@ public function testInstrumentAction(): void
5960
self::assertTrue(has_action('delete_user'));
6061
}
6162

62-
/**
63-
* @dataProvider dataProviderConcatExtraArgs
64-
*/
63+
#[DataProvider('dataProviderConcatExtraArgs')]
6564
public function testConcatExtraArgs(string $action, array $args, string $expected): void
6665
{
6766
self::assertSame($expected, Listener::concatExtraArgs($action, ...$args));

0 commit comments

Comments
 (0)