Skip to content

Commit 34dd355

Browse files
xabbuhxabbuh
committed
replace PHPUnit annotations with attributes
1 parent 9bd0bb8 commit 34dd355

File tree

4 files changed

+36
-92
lines changed

4 files changed

+36
-92
lines changed

‎Tests/PropertyAccessorArrayAccessTestCase.php‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\PropertyAccess\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
1617
use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -43,9 +44,7 @@ public static function getInvalidPropertyPaths(): array
4344
];
4445
}
4546

46-
/**
47-
* @dataProvider getValidPropertyPaths
48-
*/
47+
#[DataProvider('getValidPropertyPaths')]
4948
public function testGetValue($collection, $path, $value)
5049
{
5150
$this->assertSame($value, $this->propertyAccessor->getValue($collection, $path));
@@ -64,35 +63,27 @@ public function testGetValueFailsIfNoSuchIndex()
6463
$this->propertyAccessor->getValue($object, '[lastName]');
6564
}
6665

67-
/**
68-
* @dataProvider getValidPropertyPaths
69-
*/
66+
#[DataProvider('getValidPropertyPaths')]
7067
public function testSetValue($collection, $path)
7168
{
7269
$this->propertyAccessor->setValue($collection, $path, 'Updated');
7370

7471
$this->assertSame('Updated', $this->propertyAccessor->getValue($collection, $path));
7572
}
7673

77-
/**
78-
* @dataProvider getValidPropertyPaths
79-
*/
74+
#[DataProvider('getValidPropertyPaths')]
8075
public function testIsReadable($collection, $path)
8176
{
8277
$this->assertTrue($this->propertyAccessor->isReadable($collection, $path));
8378
}
8479

85-
/**
86-
* @dataProvider getValidPropertyPaths
87-
*/
80+
#[DataProvider('getValidPropertyPaths')]
8881
public function testIsWritable($collection, $path)
8982
{
9083
$this->assertTrue($this->propertyAccessor->isWritable($collection, $path));
9184
}
9285

93-
/**
94-
* @dataProvider getInvalidPropertyPaths
95-
*/
86+
#[DataProvider('getInvalidPropertyPaths')]
9687
public function testIsNotWritable($collection, $path)
9788
{
9889
$this->assertFalse($this->propertyAccessor->isWritable($collection, $path));

‎Tests/PropertyAccessorTest.php‎

Lines changed: 26 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\PropertyAccess\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\RequiresPhp;
1416
use PHPUnit\Framework\TestCase;
1517
use Symfony\Component\Cache\Adapter\ArrayAdapter;
1618
use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
@@ -83,44 +85,34 @@ public static function getPathsWithMissingIndex()
8385
];
8486
}
8587

86-
/**
87-
* @dataProvider getValidReadPropertyPaths
88-
*/
88+
#[DataProvider('getValidReadPropertyPaths')]
8989
public function testGetValue(array|object $objectOrArray, string $path, ?string $value)
9090
{
9191
$this->assertSame($value, $this->propertyAccessor->getValue($objectOrArray, $path));
9292
}
9393

94-
/**
95-
* @dataProvider getPathsWithMissingProperty
96-
*/
94+
#[DataProvider('getPathsWithMissingProperty')]
9795
public function testGetValueThrowsExceptionIfPropertyNotFound(array|object $objectOrArray, string $path)
9896
{
9997
$this->expectException(NoSuchPropertyException::class);
10098
$this->propertyAccessor->getValue($objectOrArray, $path);
10199
}
102100

103-
/**
104-
* @dataProvider getPathsWithMissingProperty
105-
*/
101+
#[DataProvider('getPathsWithMissingProperty')]
106102
public function testGetValueReturnsNullIfPropertyNotFoundAndExceptionIsDisabled(array|object $objectOrArray, string $path)
107103
{
108104
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::MAGIC_GET | PropertyAccessor::MAGIC_SET, PropertyAccessor::DO_NOT_THROW);
109105

110106
$this->assertNull($this->propertyAccessor->getValue($objectOrArray, $path), $path);
111107
}
112108

113-
/**
114-
* @dataProvider getPathsWithMissingIndex
115-
*/
109+
#[DataProvider('getPathsWithMissingIndex')]
116110
public function testGetValueThrowsNoExceptionIfIndexNotFound(array|object $objectOrArray, string $path)
117111
{
118112
$this->assertNull($this->propertyAccessor->getValue($objectOrArray, $path));
119113
}
120114

121-
/**
122-
* @dataProvider getPathsWithMissingIndex
123-
*/
115+
#[DataProvider('getPathsWithMissingIndex')]
124116
public function testGetValueThrowsExceptionIfIndexNotFoundAndIndexExceptionsEnabled(array|object $objectOrArray, string $path)
125117
{
126118
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::DISALLOW_MAGIC_METHODS, PropertyAccessor::THROW_ON_INVALID_INDEX | PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH);
@@ -315,38 +307,30 @@ public function testGetValueReadsMagicCallThatReturnsConstant()
315307
$this->assertSame('constant value', $this->propertyAccessor->getValue(new TestClassMagicCall('Bernhard'), 'constantMagicCallProperty'));
316308
}
317309

318-
/**
319-
* @dataProvider getValidWritePropertyPaths
320-
*/
310+
#[DataProvider('getValidWritePropertyPaths')]
321311
public function testSetValue(array|object $objectOrArray, string $path)
322312
{
323313
$this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');
324314

325315
$this->assertSame('Updated', $this->propertyAccessor->getValue($objectOrArray, $path));
326316
}
327317

328-
/**
329-
* @dataProvider getPathsWithMissingProperty
330-
*/
318+
#[DataProvider('getPathsWithMissingProperty')]
331319
public function testSetValueThrowsExceptionIfPropertyNotFound(array|object $objectOrArray, string $path)
332320
{
333321
$this->expectException(NoSuchPropertyException::class);
334322
$this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');
335323
}
336324

337-
/**
338-
* @dataProvider getPathsWithMissingIndex
339-
*/
325+
#[DataProvider('getPathsWithMissingIndex')]
340326
public function testSetValueThrowsNoExceptionIfIndexNotFound(array|object $objectOrArray, string $path)
341327
{
342328
$this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');
343329

344330
$this->assertSame('Updated', $this->propertyAccessor->getValue($objectOrArray, $path));
345331
}
346332

347-
/**
348-
* @dataProvider getPathsWithMissingIndex
349-
*/
333+
#[DataProvider('getPathsWithMissingIndex')]
350334
public function testSetValueThrowsNoExceptionIfIndexNotFoundAndIndexExceptionsEnabled(array|object $objectOrArray, string $path)
351335
{
352336
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::DISALLOW_MAGIC_METHODS, PropertyAccessor::THROW_ON_INVALID_INDEX | PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH);
@@ -419,34 +403,26 @@ public function testGetValueWhenArrayValueIsNull()
419403
$this->assertNull($this->propertyAccessor->getValue(['index' => ['nullable' => null]], '[index][nullable]'));
420404
}
421405

422-
/**
423-
* @dataProvider getValidReadPropertyPaths
424-
*/
406+
#[DataProvider('getValidReadPropertyPaths')]
425407
public function testIsReadable(array|object $objectOrArray, string $path)
426408
{
427409
$this->assertTrue($this->propertyAccessor->isReadable($objectOrArray, $path));
428410
}
429411

430-
/**
431-
* @dataProvider getPathsWithMissingProperty
432-
*/
412+
#[DataProvider('getPathsWithMissingProperty')]
433413
public function testIsReadableReturnsFalseIfPropertyNotFound(array|object $objectOrArray, string $path)
434414
{
435415
$this->assertFalse($this->propertyAccessor->isReadable($objectOrArray, $path));
436416
}
437417

438-
/**
439-
* @dataProvider getPathsWithMissingIndex
440-
*/
418+
#[DataProvider('getPathsWithMissingIndex')]
441419
public function testIsReadableReturnsTrueIfIndexNotFound(array|object $objectOrArray, string $path)
442420
{
443421
// Non-existing indices can be read. In this case, null is returned
444422
$this->assertTrue($this->propertyAccessor->isReadable($objectOrArray, $path));
445423
}
446424

447-
/**
448-
* @dataProvider getPathsWithMissingIndex
449-
*/
425+
#[DataProvider('getPathsWithMissingIndex')]
450426
public function testIsReadableReturnsFalseIfIndexNotFoundAndIndexExceptionsEnabled(array|object $objectOrArray, string $path)
451427
{
452428
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::DISALLOW_MAGIC_METHODS, PropertyAccessor::THROW_ON_INVALID_INDEX | PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH);
@@ -472,34 +448,26 @@ public function testIsReadableRecognizesMagicCallIfEnabled()
472448
$this->assertTrue($this->propertyAccessor->isReadable(new TestClassMagicCall('Bernhard'), 'magicCallProperty'));
473449
}
474450

475-
/**
476-
* @dataProvider getValidWritePropertyPaths
477-
*/
451+
#[DataProvider('getValidWritePropertyPaths')]
478452
public function testIsWritable(array|object $objectOrArray, string $path)
479453
{
480454
$this->assertTrue($this->propertyAccessor->isWritable($objectOrArray, $path));
481455
}
482456

483-
/**
484-
* @dataProvider getPathsWithMissingProperty
485-
*/
457+
#[DataProvider('getPathsWithMissingProperty')]
486458
public function testIsWritableReturnsFalseIfPropertyNotFound(array|object $objectOrArray, string $path)
487459
{
488460
$this->assertFalse($this->propertyAccessor->isWritable($objectOrArray, $path));
489461
}
490462

491-
/**
492-
* @dataProvider getPathsWithMissingIndex
493-
*/
463+
#[DataProvider('getPathsWithMissingIndex')]
494464
public function testIsWritableReturnsTrueIfIndexNotFound(array|object $objectOrArray, string $path)
495465
{
496466
// Non-existing indices can be written. Arrays are created on-demand.
497467
$this->assertTrue($this->propertyAccessor->isWritable($objectOrArray, $path));
498468
}
499469

500-
/**
501-
* @dataProvider getPathsWithMissingIndex
502-
*/
470+
#[DataProvider('getPathsWithMissingIndex')]
503471
public function testIsWritableReturnsTrueIfIndexNotFoundAndIndexExceptionsEnabled(array|object $objectOrArray, string $path)
504472
{
505473
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::DISALLOW_MAGIC_METHODS, PropertyAccessor::THROW_ON_INVALID_INDEX | PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH);
@@ -596,9 +564,7 @@ public static function getNullSafeIndexPaths(): iterable
596564
yield [['foo' => ['firstName' => 'Bernhard']], '[foo][bar?][baz?]', null];
597565
}
598566

599-
/**
600-
* @dataProvider getNullSafeIndexPaths
601-
*/
567+
#[DataProvider('getNullSafeIndexPaths')]
602568
public function testNullSafeIndexWithThrowOnInvalidIndex(array|object $objectOrArray, string $path, ?string $value)
603569
{
604570
$this->propertyAccessor = new PropertyAccessor(PropertyAccessor::DISALLOW_MAGIC_METHODS, PropertyAccessor::THROW_ON_INVALID_INDEX | PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH);
@@ -634,9 +600,7 @@ public static function getReferenceChainObjectsForSetValue()
634600
];
635601
}
636602

637-
/**
638-
* @dataProvider getReferenceChainObjectsForSetValue
639-
*/
603+
#[DataProvider('getReferenceChainObjectsForSetValue')]
640604
public function testSetValueForReferenceChainIssue($object, $path, $value)
641605
{
642606
$this->propertyAccessor->setValue($object, $path, $value);
@@ -653,9 +617,7 @@ public static function getReferenceChainObjectsForIsWritable()
653617
];
654618
}
655619

656-
/**
657-
* @dataProvider getReferenceChainObjectsForIsWritable
658-
*/
620+
#[DataProvider('getReferenceChainObjectsForIsWritable')]
659621
public function testIsWritableForReferenceChainIssue($object, $path, $value)
660622
{
661623
$this->assertEquals($value, $this->propertyAccessor->isWritable($object, $path));
@@ -1052,9 +1014,7 @@ private function createUninitializedObjectPropertyGhost(): UninitializedObjectPr
10521014
return (new \ReflectionClass(UninitializedObjectProperty::class))->newLazyGhost(fn () => null);
10531015
}
10541016

1055-
/**
1056-
* @requires PHP 8.4
1057-
*/
1017+
#[RequiresPhp('8.4')]
10581018
public function testIsWritableWithAsymmetricVisibility()
10591019
{
10601020
$object = new AsymmetricVisibility();
@@ -1066,9 +1026,7 @@ public function testIsWritableWithAsymmetricVisibility()
10661026
$this->assertFalse($this->propertyAccessor->isWritable($object, 'virtualNoSetHook'));
10671027
}
10681028

1069-
/**
1070-
* @requires PHP 8.4
1071-
*/
1029+
#[RequiresPhp('8.4')]
10721030
public function testIsReadableWithAsymmetricVisibility()
10731031
{
10741032
$object = new AsymmetricVisibility();
@@ -1080,11 +1038,8 @@ public function testIsReadableWithAsymmetricVisibility()
10801038
$this->assertTrue($this->propertyAccessor->isReadable($object, 'virtualNoSetHook'));
10811039
}
10821040

1083-
/**
1084-
* @requires PHP 8.4
1085-
*
1086-
* @dataProvider setValueWithAsymmetricVisibilityDataProvider
1087-
*/
1041+
#[RequiresPhp('8.4')]
1042+
#[DataProvider('setValueWithAsymmetricVisibilityDataProvider')]
10881043
public function testSetValueWithAsymmetricVisibility(string $propertyPath, ?string $expectedException)
10891044
{
10901045
$object = new AsymmetricVisibility();

‎Tests/PropertyPathBuilderTest.php‎

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

1212
namespace Symfony\Component\PropertyAccess\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\PropertyAccess\PropertyPath;
1617
use Symfony\Component\PropertyAccess\PropertyPathBuilder;
@@ -182,9 +183,7 @@ public function testReplaceNegative()
182183
$this->assertEquals($path, $this->builder->getPropertyPath());
183184
}
184185

185-
/**
186-
* @dataProvider provideInvalidOffsets
187-
*/
186+
#[DataProvider('provideInvalidOffsets')]
188187
public function testReplaceDoesNotAllowInvalidOffsets(int $offset)
189188
{
190189
$this->expectException(\OutOfBoundsException::class);

‎Tests/PropertyPathTest.php‎

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

1212
namespace Symfony\Component\PropertyAccess\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
1617
use Symfony\Component\PropertyAccess\PropertyPath;
@@ -49,9 +50,7 @@ public static function providePathsContainingUnexpectedCharacters()
4950
];
5051
}
5152

52-
/**
53-
* @dataProvider providePathsContainingUnexpectedCharacters
54-
*/
53+
#[DataProvider('providePathsContainingUnexpectedCharacters')]
5554
public function testUnexpectedCharacters(string $path)
5655
{
5756
$this->expectException(InvalidPropertyPathException::class);

0 commit comments

Comments
 (0)