Re-introduce @covers annotations as attributes

Signed-off-by: George Steel <[email protected]>
laminas · May 19, 2023 · 0872752 · 0872752
1 parent 4d95f68
commit 0872752
Show file tree

Hide file tree

Showing 45 changed files with 94 additions and 8 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -375,6 +375,7 @@
   </file>
   <file src="test/ArraySerializableTest.php">
     <DeprecatedClass>
+      <code>ArraySerializable::class</code>
       <code>new ArraySerializable()</code>
     </DeprecatedClass>
   </file>
@@ -388,6 +389,7 @@
   </file>
   <file src="test/ClassMethodsTest.php">
     <DeprecatedClass>
+      <code>ClassMethods::class</code>
       <code>new ClassMethods()</code>
     </DeprecatedClass>
   </file>
@@ -595,6 +597,7 @@
   </file>
   <file src="test/ObjectPropertyTest.php">
     <DeprecatedClass>
+      <code>ObjectProperty::class</code>
       <code>new ObjectProperty()</code>
     </DeprecatedClass>
   </file>
@@ -606,6 +609,7 @@
   </file>
   <file src="test/ReflectionTest.php">
     <DeprecatedClass>
+      <code>Reflection::class</code>
       <code>new Reflection()</code>
     </DeprecatedClass>
   </file>

diff --git a/test/Aggregate/AggregateHydratorFunctionalTest.php b/test/Aggregate/AggregateHydratorFunctionalTest.php
@@ -12,13 +12,12 @@
 use Laminas\Hydrator\ClassMethodsHydrator;
 use Laminas\Hydrator\HydratorInterface;
 use LaminasTest\Hydrator\TestAsset\AggregateObject;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-/**
- * Integration tests {@see AggregateHydrator}
- */
+#[CoversClass(AggregateHydrator::class)]
 class AggregateHydratorFunctionalTest extends TestCase
 {
     protected AggregateHydrator $hydrator;

diff --git a/test/Aggregate/AggregateHydratorTest.php b/test/Aggregate/AggregateHydratorTest.php
@@ -9,13 +9,12 @@
 use Laminas\Hydrator\Aggregate\ExtractEvent;
 use Laminas\Hydrator\Aggregate\HydrateEvent;
 use Laminas\Hydrator\HydratorInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-/**
- * Unit tests for {@see AggregateHydrator}
- */
+#[CoversClass(AggregateHydrator::class)]
 class AggregateHydratorTest extends TestCase
 {
     protected AggregateHydrator $hydrator;

diff --git a/test/Aggregate/ExtractEventTest.php b/test/Aggregate/ExtractEventTest.php
@@ -5,9 +5,11 @@
 namespace LaminasTest\Hydrator\Aggregate;
 
 use Laminas\Hydrator\Aggregate\ExtractEvent;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
+#[CoversClass(ExtractEvent::class)]
 class ExtractEventTest extends TestCase
 {
     public function testEvent(): void

diff --git a/test/Aggregate/HydrateEventTest.php b/test/Aggregate/HydrateEventTest.php
@@ -5,9 +5,11 @@
 namespace LaminasTest\Hydrator\Aggregate;
 
 use Laminas\Hydrator\Aggregate\HydrateEvent;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
+#[CoversClass(HydrateEvent::class)]
 class HydrateEventTest extends TestCase
 {
     public function testEvent(): void

diff --git a/test/Aggregate/HydratorListenerTest.php b/test/Aggregate/HydratorListenerTest.php
@@ -9,10 +9,12 @@
 use Laminas\Hydrator\Aggregate\HydrateEvent;
 use Laminas\Hydrator\Aggregate\HydratorListener;
 use Laminas\Hydrator\HydratorInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
+#[CoversClass(HydratorListener::class)]
 class HydratorListenerTest extends TestCase
 {
     private HydratorInterface&MockObject $hydrator;

diff --git a/test/ArraySerializableHydratorTest.php b/test/ArraySerializableHydratorTest.php
@@ -8,13 +8,15 @@
 use Laminas\Hydrator\ArraySerializableHydrator;
 use LaminasTest\Hydrator\TestAsset\ArraySerializable as ArraySerializableAsset;
 use LaminasTest\Hydrator\TestAsset\ArraySerializableNoGetArrayCopy;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use TypeError;
 
 use function array_merge;
 
+#[CoversClass(ArraySerializableHydrator::class)]
 class ArraySerializableHydratorTest extends TestCase
 {
     use HydratorTestTrait;

diff --git a/test/ArraySerializableTest.php b/test/ArraySerializableTest.php
@@ -6,13 +6,15 @@
 
 use Laminas\Hydrator\ArraySerializable;
 use Laminas\Hydrator\ArraySerializableHydrator;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
 use function restore_error_handler;
 use function set_error_handler;
 
 use const E_USER_DEPRECATED;
 
+#[CoversClass(ArraySerializable::class)]
 class ArraySerializableTest extends TestCase
 {
     public function testTriggerUserDeprecatedError(): void

diff --git a/test/ClassMethodsHydratorTest.php b/test/ClassMethodsHydratorTest.php
@@ -10,9 +10,11 @@
 use LaminasTest\Hydrator\TestAsset\ClassMethodsCamelCase;
 use LaminasTest\Hydrator\TestAsset\ClassMethodsCamelCaseMissing;
 use LaminasTest\Hydrator\TestAsset\ClassMethodsOptionalParameters;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use TypeError;
 
+#[CoversClass(ClassMethodsHydrator::class)]
 class ClassMethodsHydratorTest extends TestCase
 {
     use HydratorTestTrait;

diff --git a/test/ClassMethodsTest.php b/test/ClassMethodsTest.php
@@ -6,13 +6,15 @@
 
 use Laminas\Hydrator\ClassMethods;
 use Laminas\Hydrator\ClassMethodsHydrator;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
 use function restore_error_handler;
 use function set_error_handler;
 
 use const E_USER_DEPRECATED;
 
+#[CoversClass(ClassMethods::class)]
 class ClassMethodsTest extends TestCase
 {
     public function testTriggerUserDeprecatedError(): void

diff --git a/test/DelegatingHydratorFactoryTest.php b/test/DelegatingHydratorFactoryTest.php
@@ -8,10 +8,12 @@
 use Laminas\Hydrator\DelegatingHydratorFactory;
 use Laminas\Hydrator\HydratorPluginManager;
 use LaminasTest\Hydrator\TestAsset\InMemoryContainer;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use ReflectionProperty;
 
+#[CoversClass(DelegatingHydratorFactory::class)]
 class DelegatingHydratorFactoryTest extends TestCase
 {
     public function testFactoryUsesContainerToSeedDelegatingHydratorWhenItIsAHydratorPluginManager(): void

diff --git a/test/DelegatingHydratorTest.php b/test/DelegatingHydratorTest.php
@@ -7,10 +7,12 @@
 use ArrayObject;
 use Laminas\Hydrator\DelegatingHydrator;
 use Laminas\Hydrator\HydratorInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
+#[CoversClass(DelegatingHydrator::class)]
 class DelegatingHydratorTest extends TestCase
 {
     /** @var DelegatingHydrator */

diff --git a/test/Filter/FilterCompositeTest.php b/test/Filter/FilterCompositeTest.php
@@ -12,12 +12,14 @@
 use Laminas\Hydrator\Filter\HasFilter;
 use Laminas\Hydrator\Filter\IsFilter;
 use Laminas\Hydrator\Filter\NumberOfParameterFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function array_keys;
 use function sprintf;
 
+#[CoversClass(FilterComposite::class)]
 class FilterCompositeTest extends TestCase
 {
     #[DataProvider('validFiltersProvider')]

diff --git a/test/Filter/MethodMatchFilterTest.php b/test/Filter/MethodMatchFilterTest.php
@@ -5,9 +5,11 @@
 namespace LaminasTest\Hydrator\Filter;
 
 use Laminas\Hydrator\Filter\MethodMatchFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(MethodMatchFilter::class)]
 class MethodMatchFilterTest extends TestCase
 {
     /**

diff --git a/test/Filter/NumberOfParameterFilterTest.php b/test/Filter/NumberOfParameterFilterTest.php
@@ -6,9 +6,11 @@
 
 use Laminas\Hydrator\Exception\InvalidArgumentException;
 use Laminas\Hydrator\Filter\NumberOfParameterFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(NumberOfParameterFilter::class)]
 class NumberOfParameterFilterTest extends TestCase
 {
     #[Group('6083')]

diff --git a/test/Filter/OptionalParametersFilterTest.php b/test/Filter/OptionalParametersFilterTest.php
@@ -6,9 +6,11 @@
 
 use InvalidArgumentException;
 use Laminas\Hydrator\Filter\OptionalParametersFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(OptionalParametersFilter::class)]
 class OptionalParametersFilterTest extends TestCase
 {
     /** @var OptionalParametersFilter */

diff --git a/test/HydratorClosureStrategyTest.php b/test/HydratorClosureStrategyTest.php
@@ -7,10 +7,12 @@
 use Laminas\Hydrator\HydratorInterface;
 use Laminas\Hydrator\ObjectPropertyHydrator;
 use Laminas\Hydrator\Strategy\ClosureStrategy;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
 use function sprintf;
 
+#[CoversClass(ClosureStrategy::class)]
 class HydratorClosureStrategyTest extends TestCase
 {
     /**

diff --git a/test/HydratorObjectPropertyTest.php b/test/HydratorObjectPropertyTest.php
@@ -5,8 +5,10 @@
 namespace LaminasTest\Hydrator;
 
 use Laminas\Hydrator\ObjectPropertyHydrator;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(ObjectPropertyHydrator::class)]
 class HydratorObjectPropertyTest extends TestCase
 {
     private ObjectPropertyHydrator $hydrator;

diff --git a/test/HydratorPluginManagerCompatibilityTest.php b/test/HydratorPluginManagerCompatibilityTest.php
@@ -8,8 +8,10 @@
 use Laminas\Hydrator\HydratorPluginManager;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\ServiceManager\Test\CommonPluginManagerTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(HydratorPluginManager::class)]
 class HydratorPluginManagerCompatibilityTest extends TestCase
 {
     use CommonPluginManagerTrait;

diff --git a/test/HydratorPluginManagerFactoryTest.php b/test/HydratorPluginManagerFactoryTest.php
@@ -9,10 +9,12 @@
 use Laminas\Hydrator\HydratorPluginManagerFactory;
 use Laminas\Hydrator\ReflectionHydrator;
 use LaminasTest\Hydrator\TestAsset\InMemoryContainer;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
+#[CoversClass(HydratorPluginManagerFactory::class)]
 class HydratorPluginManagerFactoryTest extends TestCase
 {
     public function testFactoryReturnsPluginManager(): void

diff --git a/test/Iterator/HydratingArrayIteratorTest.php b/test/Iterator/HydratingArrayIteratorTest.php
@@ -8,8 +8,10 @@
 use Laminas\Hydrator\ArraySerializableHydrator;
 use Laminas\Hydrator\Exception\InvalidArgumentException;
 use Laminas\Hydrator\Iterator\HydratingArrayIterator;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(HydratingArrayIterator::class)]
 class HydratingArrayIteratorTest extends TestCase
 {
     public function testHydratesObjectAndClonesOnCurrent(): void

diff --git a/test/Iterator/HydratingIteratorIteratorTest.php b/test/Iterator/HydratingIteratorIteratorTest.php
@@ -9,8 +9,10 @@
 use Laminas\Hydrator\ArraySerializableHydrator;
 use Laminas\Hydrator\Exception\InvalidArgumentException;
 use Laminas\Hydrator\Iterator\HydratingIteratorIterator;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(HydratingIteratorIterator::class)]
 class HydratingIteratorIteratorTest extends TestCase
 {
     public function testHydratesObjectAndClonesOnCurrent(): void

diff --git a/test/NamingStrategy/CompositeNamingStrategyTest.php b/test/NamingStrategy/CompositeNamingStrategyTest.php
@@ -6,9 +6,11 @@
 
 use Laminas\Hydrator\NamingStrategy\CompositeNamingStrategy;
 use Laminas\Hydrator\NamingStrategy\NamingStrategyInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(CompositeNamingStrategy::class)]
 class CompositeNamingStrategyTest extends TestCase
 {
     public function testGetSameNameWhenNoNamingStrategyExistsForTheName(): void

diff --git a/test/NamingStrategy/IdentityNamingStrategyTest.php b/test/NamingStrategy/IdentityNamingStrategyTest.php
@@ -5,9 +5,11 @@
 namespace LaminasTest\Hydrator\NamingStrategy;
 
 use Laminas\Hydrator\NamingStrategy\IdentityNamingStrategy;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(IdentityNamingStrategy::class)]
 class IdentityNamingStrategyTest extends TestCase
 {
     /**

diff --git a/test/NamingStrategy/MapNamingStrategyTest.php b/test/NamingStrategy/MapNamingStrategyTest.php
@@ -7,9 +7,11 @@
 use Generator;
 use Laminas\Hydrator\Exception;
 use Laminas\Hydrator\NamingStrategy\MapNamingStrategy;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(MapNamingStrategy::class)]
 class MapNamingStrategyTest extends TestCase
 {
     /** @return Generator<string, list<mixed>> */

diff --git a/test/NamingStrategy/UnderscoreNamingStrategy/CamelCaseToUnderscoreFilterTest.php b/test/NamingStrategy/UnderscoreNamingStrategy/CamelCaseToUnderscoreFilterTest.php
@@ -5,12 +5,14 @@
 namespace LaminasTest\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
 
 use Laminas\Hydrator\NamingStrategy\UnderscoreNamingStrategy\CamelCaseToUnderscoreFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
 use function extension_loaded;
 
+#[CoversClass(CamelCaseToUnderscoreFilter::class)]
 class CamelCaseToUnderscoreFilterTest extends TestCase
 {
     /**

diff --git a/test/NamingStrategy/UnderscoreNamingStrategy/UnderscoreToCamelCaseFilterTest.php b/test/NamingStrategy/UnderscoreNamingStrategy/UnderscoreToCamelCaseFilterTest.php
@@ -5,12 +5,14 @@
 namespace LaminasTest\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
 
 use Laminas\Hydrator\NamingStrategy\UnderscoreNamingStrategy\UnderscoreToCamelCaseFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
 use function extension_loaded;
 
+#[CoversClass(UnderscoreToCamelCaseFilter::class)]
 class UnderscoreToCamelCaseFilterTest extends TestCase
 {
     /**

diff --git a/test/NamingStrategy/UnderscoreNamingStrategyTest.php b/test/NamingStrategy/UnderscoreNamingStrategyTest.php
@@ -5,9 +5,11 @@
 namespace LaminasTest\Hydrator\NamingStrategy;
 
 use Laminas\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
+#[CoversClass(UnderscoreNamingStrategy::class)]
 class UnderscoreNamingStrategyTest extends TestCase
 {
     public function testNameHydratesToCamelCase(): void

diff --git a/test/ObjectPropertyHydratorTest.php b/test/ObjectPropertyHydratorTest.php
@@ -7,10 +7,12 @@
 use Laminas\Hydrator\ObjectPropertyHydrator;
 use LaminasTest\Hydrator\TestAsset\ClassWithPublicStaticProperties;
 use LaminasTest\Hydrator\TestAsset\ObjectProperty as ObjectPropertyTestAsset;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use TypeError;
 
+#[CoversClass(ObjectPropertyHydrator::class)]
 class ObjectPropertyHydratorTest extends TestCase
 {
     use HydratorTestTrait;