Skip to content

Commit eb2db84

Browse files
hellofromtonyahellofromtonya
authored
Merge pull request #189 from Yoast/feature/2.x/add-attributes-for-annotations
2.x | Tests: add attributes for annotations
2 parents da0bf11 + 5cecae1 commit eb2db84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+209
-0
lines changed

‎src/TestCases/XTestCase.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\TestCases;
44

5+
use PHPUnit\Framework\Attributes\After;
6+
use PHPUnit\Framework\Attributes\AfterClass;
7+
use PHPUnit\Framework\Attributes\Before;
8+
use PHPUnit\Framework\Attributes\BeforeClass;
59
use PHPUnit\Framework\TestCase as PHPUnit_TestCase;
610
use Yoast\PHPUnitPolyfills\Helpers\AssertAttributeHelper;
711
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
@@ -55,6 +59,7 @@ abstract class XTestCase extends PHPUnit_TestCase {
5559
*
5660
* @return void
5761
*/
62+
#[BeforeClass]
5863
public static function setUpFixturesBeforeClass() {
5964
parent::setUpBeforeClass();
6065
}
@@ -68,6 +73,7 @@ public static function setUpFixturesBeforeClass() {
6873
*
6974
* @return void
7075
*/
76+
#[Before]
7177
protected function setUpFixtures() {
7278
parent::setUp();
7379
}
@@ -81,6 +87,7 @@ protected function setUpFixtures() {
8187
*
8288
* @return void
8389
*/
90+
#[After]
8491
protected function tearDownFixtures() {
8592
parent::tearDown();
8693
}
@@ -94,6 +101,7 @@ protected function tearDownFixtures() {
94101
*
95102
* @return void
96103
*/
104+
#[AfterClass]
97105
public static function tearDownFixturesAfterClass() {
98106
parent::tearDownAfterClass();
99107
}

‎tests/Exceptions/InvalidComparisonMethodExceptionTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Exceptions;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
56
use PHPUnit\Framework\TestCase;
67
use Yoast\PHPUnitPolyfills\Exceptions\InvalidComparisonMethodException;
78

@@ -10,6 +11,7 @@
1011
*
1112
* @covers \Yoast\PHPUnitPolyfills\Exceptions\InvalidComparisonMethodException
1213
*/
14+
#[CoversClass( InvalidComparisonMethodException::class )]
1315
final class InvalidComparisonMethodExceptionTest extends TestCase {
1416

1517
/**

‎tests/Helpers/AssertAttributesHelperTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Helpers;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
56
use ReflectionException;
7+
use Yoast\PHPUnitPolyfills\Helpers\AssertAttributeHelper;
68
use Yoast\PHPUnitPolyfills\TestCases\TestCase;
79
use Yoast\PHPUnitPolyfills\Tests\Helpers\Fixtures\ClassWithProperties;
810

@@ -11,6 +13,7 @@
1113
*
1214
* @covers \Yoast\PHPUnitPolyfills\Helpers\AssertAttributeHelper
1315
*/
16+
#[CoversClass( AssertAttributeHelper::class )]
1417
final class AssertAttributesHelperTest extends TestCase {
1518

1619
/**

‎tests/Polyfills/AssertClosedResourceBzip2Test.php

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
7+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
58
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
69

710
/**
@@ -15,6 +18,9 @@
1518
*
1619
* @requires extension bz2
1720
*/
21+
#[CoversClass( AssertClosedResource::class )]
22+
#[CoversClass( ResourceHelper::class )]
23+
#[RequiresPhpExtension( 'bz2' )]
1824
final class AssertClosedResourceBzip2Test extends AssertClosedResourceTestCase {
1925

2026
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceCurlTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -19,6 +23,10 @@
1923
* @requires extension curl
2024
* @requires PHP < 8.0
2125
*/
26+
#[CoversClass( AssertClosedResource::class )]
27+
#[CoversClass( ResourceHelper::class )]
28+
#[RequiresPhp( '< 8.0' )]
29+
#[RequiresPhpExtension( 'curl' )]
2230
final class AssertClosedResourceCurlTest extends AssertClosedResourceTestCase {
2331

2432
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceDirTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
57
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
68

79
/**
@@ -13,6 +15,8 @@
1315
* @covers \Yoast\PHPUnitPolyfills\Helpers\ResourceHelper
1416
* @covers \Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource
1517
*/
18+
#[CoversClass( AssertClosedResource::class )]
19+
#[CoversClass( ResourceHelper::class )]
1620
final class AssertClosedResourceDirTest extends AssertClosedResourceTestCase {
1721

1822
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceEnchantTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -22,6 +26,10 @@
2226
* @phpcs:disable Generic.PHP.DeprecatedFunctions.Deprecated
2327
* @phpcs:disable PHPCompatibility.FunctionUse.RemovedFunctions.enchant_broker_freeDeprecated
2428
*/
29+
#[CoversClass( AssertClosedResource::class )]
30+
#[CoversClass( ResourceHelper::class )]
31+
#[RequiresPhp( '< 8.0' )]
32+
#[RequiresPhpExtension( 'enchant' )]
2533
final class AssertClosedResourceEnchantTest extends AssertClosedResourceTestCase {
2634

2735
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceFileTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
57
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
68

79
/**
@@ -13,6 +15,8 @@
1315
* @covers \Yoast\PHPUnitPolyfills\Helpers\ResourceHelper
1416
* @covers \Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource
1517
*/
18+
#[CoversClass( AssertClosedResource::class )]
19+
#[CoversClass( ResourceHelper::class )]
1620
final class AssertClosedResourceFileTest extends AssertClosedResourceTestCase {
1721

1822
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceFinfoTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -19,6 +23,10 @@
1923
* @requires extension finfo
2024
* @requires PHP < 8.1
2125
*/
26+
#[CoversClass( AssertClosedResource::class )]
27+
#[CoversClass( ResourceHelper::class )]
28+
#[RequiresPhp( '< 8.1' )]
29+
#[RequiresPhpExtension( 'finfo' )]
2230
final class AssertClosedResourceFinfoTest extends AssertClosedResourceTestCase {
2331

2432
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceGdTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -19,6 +23,10 @@
1923
* @requires extension gd
2024
* @requires PHP < 8.0
2125
*/
26+
#[CoversClass( AssertClosedResource::class )]
27+
#[CoversClass( ResourceHelper::class )]
28+
#[RequiresPhp( '< 8.0' )]
29+
#[RequiresPhpExtension( 'gd' )]
2230
final class AssertClosedResourceGdTest extends AssertClosedResourceTestCase {
2331

2432
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceNotResourceTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

55
use PHPUnit\Framework\AssertionFailedError;
6+
use PHPUnit\Framework\Attributes\CoversClass;
7+
use PHPUnit\Framework\Attributes\DataProvider;
68
use PHPUnit\Framework\TestCase;
79
use PHPUnit_Framework_AssertionFailedError;
810
use stdClass;
11+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
912
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
1013
use Yoast\PHPUnitPolyfills\Polyfills\ExpectExceptionMessageMatches;
1114

@@ -15,6 +18,8 @@
1518
* @covers \Yoast\PHPUnitPolyfills\Helpers\ResourceHelper
1619
* @covers \Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource
1720
*/
21+
#[CoversClass( AssertClosedResource::class )]
22+
#[CoversClass( ResourceHelper::class )]
1823
final class AssertClosedResourceNotResourceTest extends TestCase {
1924

2025
use AssertClosedResource;
@@ -30,6 +35,7 @@ final class AssertClosedResourceNotResourceTest extends TestCase {
3035
*
3136
* @return void
3237
*/
38+
#[DataProvider( 'dataNotResource' )]
3339
public function testAssertIsClosedResource( $value ) {
3440
$pattern = '`^Failed asserting that .+? is of type ["]?resource \(closed\)["]?`s';
3541

@@ -64,6 +70,7 @@ public function testAssertIsClosedResourceFailsWithCustomMessage() {
6470
*
6571
* @return void
6672
*/
73+
#[DataProvider( 'dataNotResource' )]
6774
public function testAssertIsNotClosedResource( $value ) {
6875
self::assertIsNotClosedResource( $value );
6976
}
@@ -95,6 +102,7 @@ public function testAssertIsNotClosedResourceFailsWithCustomMessage() {
95102
*
96103
* @return void
97104
*/
105+
#[DataProvider( 'dataNotResource' )]
98106
public function testShouldClosedResourceAssertionBeSkipped( $value ) {
99107
$this->assertFalse( self::shouldClosedResourceAssertionBeSkipped( $value ) );
100108
}

‎tests/Polyfills/AssertClosedResourceProcessTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
57
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
68

79
/**
@@ -13,6 +15,8 @@
1315
* @covers \Yoast\PHPUnitPolyfills\Helpers\ResourceHelper
1416
* @covers \Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource
1517
*/
18+
#[CoversClass( AssertClosedResource::class )]
19+
#[CoversClass( ResourceHelper::class )]
1620
final class AssertClosedResourceProcessTest extends AssertClosedResourceTestCase {
1721

1822
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceShmopTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\Before;
6+
use PHPUnit\Framework\Attributes\CoversClass;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -24,6 +28,9 @@
2428
* @phpcs:disable Generic.PHP.DeprecatedFunctions.Deprecated
2529
* @phpcs:disable PHPCompatibility.FunctionUse.RemovedFunctions.shmop_closeDeprecated
2630
*/
31+
#[CoversClass( AssertClosedResource::class )]
32+
#[CoversClass( ResourceHelper::class )]
33+
#[RequiresPhpExtension( 'shmop' )]
2734
final class AssertClosedResourceShmopTest extends AssertClosedResourceTestCase {
2835

2936
use AssertClosedResource;
@@ -38,6 +45,7 @@ final class AssertClosedResourceShmopTest extends AssertClosedResourceTestCase {
3845
*
3946
* @return void
4047
*/
48+
#[Before]
4149
protected function skipOnIncompatiblePHP() {
4250
if ( \PHP_VERSION_ID < 70000 || \PHP_VERSION_ID >= 80000 ) {
4351
$this->markTestSkipped( 'This test requires PHP 7.x.' );

‎tests/Polyfills/AssertClosedResourceWddxTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
8+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
59
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
610

711
/**
@@ -22,6 +26,10 @@
2226
* @phpcs:disable PHPCompatibility.FunctionUse.RemovedFunctions.wddx_packet_startRemoved
2327
* @phpcs:disable PHPCompatibility.FunctionUse.RemovedFunctions.wddx_packet_endRemoved
2428
*/
29+
#[CoversClass( AssertClosedResource::class )]
30+
#[CoversClass( ResourceHelper::class )]
31+
#[RequiresPhp( '< 7.4' )]
32+
#[RequiresPhpExtension( 'wddx' )]
2533
final class AssertClosedResourceWddxTest extends AssertClosedResourceTestCase {
2634

2735
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceXmlParserTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhp;
7+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
58
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
69
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
710

@@ -20,6 +23,10 @@
2023
* @requires extension libxml
2124
* @requires PHP < 8.0
2225
*/
26+
#[CoversClass( AssertClosedResource::class )]
27+
#[CoversClass( ResourceHelper::class )]
28+
#[RequiresPhp( '< 8.0' )]
29+
#[RequiresPhpExtension( 'libxml' )]
2330
final class AssertClosedResourceXmlParserTest extends AssertClosedResourceTestCase {
2431

2532
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceZipTest.php

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
7+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
58
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
69

710
/**
@@ -23,6 +26,9 @@
2326
* @phpcs:disable PHPCompatibility.FunctionUse.RemovedFunctions.zip_closeDeprecated
2427
* @phpcs:disable WordPress.PHP.NoSilencedErrors.Discouraged
2528
*/
29+
#[CoversClass( AssertClosedResource::class )]
30+
#[CoversClass( ResourceHelper::class )]
31+
#[RequiresPhpExtension( 'zip' )]
2632
final class AssertClosedResourceZipTest extends AssertClosedResourceTestCase {
2733

2834
use AssertClosedResource;

‎tests/Polyfills/AssertClosedResourceZlibTest.php

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Yoast\PHPUnitPolyfills\Tests\Polyfills;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
6+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
7+
use Yoast\PHPUnitPolyfills\Helpers\ResourceHelper;
58
use Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource;
69

710
/**
@@ -15,6 +18,9 @@
1518
*
1619
* @requires extension zlib
1720
*/
21+
#[CoversClass( AssertClosedResource::class )]
22+
#[CoversClass( ResourceHelper::class )]
23+
#[RequiresPhpExtension( 'zlib' )]
1824
final class AssertClosedResourceZlibTest extends AssertClosedResourceTestCase {
1925

2026
use AssertClosedResource;

0 commit comments

Comments
 (0)