Merge pull request #69 from samsonasik/update-to-latest-phpunit-10

Update to use PHPUnit 10 syntax
laminas · Nov 5, 2024 · 83f8dad · 83f8dad
2 parents f313c82 + 8af33ba
commit 83f8dad
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 124 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -314,6 +314,9 @@
     <MixedAssignment>
       <code><![CDATA[$plugin]]></code>
     </MixedAssignment>
+    <PossiblyUnusedMethod>
+      <code><![CDATA[pluginProvider]]></code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="test/PaginatorTest.php">
     <ArgumentTypeCoercion>

diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
@@ -6,15 +6,13 @@
 
 use Laminas\Paginator\Adapter;
 use Laminas\Paginator\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function assert;
 use function range;
 
-/**
- * @group      Laminas_Paginator
- * @covers  Laminas\Paginator\Adapter\ArrayAdapter<extended>
- */
+#[Group('Laminas_Paginator')]
 class ArrayTest extends TestCase
 {
     private ?ArrayAdapter $adapter;
@@ -64,9 +62,7 @@ public function testReturnsCorrectCount(): void
         $this->assertEquals(101, $this->adapter->count());
     }
 
-    /**
-     * @group Laminas-4151
-     */
+    #[Group('Laminas-4151')]
     public function testEmptySet(): void
     {
         $this->adapter = new Adapter\ArrayAdapter([]);

diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
@@ -13,6 +13,7 @@
 use Laminas\Db\Sql\Sql;
 use Laminas\Paginator\Adapter\DbSelect;
 use Laminas\Paginator\Adapter\Exception\MissingRowCountColumnException;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -62,7 +63,7 @@ public function setUp(): void
         $mockPlatform->expects($this->any())->method('getName')->will($this->returnValue('platform'));
 
         $this->mockSql = $this->getMockBuilder(Sql::class)
-            ->setMethods(['prepareStatementForSqlObject', 'execute'])
+            ->onlyMethods(['prepareStatementForSqlObject', 'execute'])
             ->setConstructorArgs(
                 [
                     $this->getMockForAbstractClass(
@@ -137,10 +138,8 @@ public function testCustomCount(): void
         $this->assertEquals(7, $count);
     }
 
-    /**
-     * @group 6817
-     * @group 6812
-     */
+    #[Group('6817')]
+    #[Group('6812')]
     public function testReturnValueIsArray(): void
     {
         $this->assertIsArray($this->dbSelect->getItems(0, 10));

diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php
@@ -10,6 +10,7 @@
 use Laminas\Paginator\Paginator;
 use Laminas\Paginator\SerializableLimitIterator;
 use LimitIterator;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Traversable;
 
@@ -19,10 +20,7 @@
 use function serialize;
 use function unserialize;
 
-/**
- * @group      Laminas_Paginator
- * @covers  Laminas\Paginator\Adapter\Iterator<extended>
- */
+#[Group('Laminas_Paginator')]
 class IteratorTest extends TestCase
 {
     private ?Adapter\Iterator $adapter;
@@ -90,9 +88,7 @@ public function testThrowsExceptionIfNotCountable(): void
         new Adapter\Iterator($iterator);
     }
 
-    /**
-     * @group Laminas-4151
-     */
+    #[Group('Laminas-4151')]
     public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty(): void
     {
         $paginator = new Paginator(new Adapter\Iterator(new ArrayIterator([])));
@@ -103,9 +99,7 @@ public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty(): void
         self::assertSame([], $items);
     }
 
-    /**
-     * @group Laminas-8084
-     */
+    #[Group('Laminas-8084')]
     public function testGetItemsSerializable(): void
     {
         assert($this->adapter instanceof Adapter\Iterator);
@@ -121,9 +115,7 @@ public function testGetItemsSerializable(): void
         );
     }
 
-    /**
-     * @group Laminas-4151
-     */
+    #[Group('Laminas-4151')]
     public function testEmptySet(): void
     {
         $iterator      = new ArrayIterator([]);

diff --git a/test/Adapter/NullFillTest.php b/test/Adapter/NullFillTest.php
@@ -6,15 +6,13 @@
 
 use Laminas\Paginator;
 use Laminas\Paginator\Adapter;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function array_fill;
 use function assert;
 
-/**
- * @group      Laminas_Paginator
- * @covers  Laminas\Paginator\Adapter\NullFill<extended>
- */
+#[Group('Laminas_Paginator')]
 class NullFillTest extends TestCase
 {
     private ?Adapter\NullFill $adapter;
@@ -52,9 +50,7 @@ public function testReturnsCorrectCount(): void
         $this->assertEquals(101, $this->adapter->count());
     }
 
-    /**
-     * @group Laminas-3873
-     */
+    #[Group('Laminas-3873')]
     public function testAdapterReturnsCorrectValues(): void
     {
         $paginator = new Paginator\Paginator(new Adapter\NullFill(2));
@@ -76,9 +72,7 @@ public function testAdapterReturnsCorrectValues(): void
         $this->assertEquals(19, $pages->lastItemNumber);
     }
 
-    /**
-     * @group Laminas-4151
-     */
+    #[Group('Laminas-4151')]
     public function testEmptySet(): void
     {
         $this->adapter = new Adapter\NullFill(0);

diff --git a/test/AdapterPluginManagerFactoryTest.php b/test/AdapterPluginManagerFactoryTest.php
@@ -8,6 +8,7 @@
 use Laminas\Paginator\AdapterPluginManager;
 use Laminas\Paginator\AdapterPluginManagerFactory;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
@@ -32,9 +33,7 @@ public function testFactoryReturnsPluginManager(): void
         $this->assertInstanceOf(AdapterPluginManager::class, $adapters);
     }
 
-    /**
-     * @depends testFactoryReturnsPluginManager
-     */
+    #[Depends('testFactoryReturnsPluginManager')]
     public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
     {
         $container = $this->createMock(ContainerInterface::class);
@@ -58,9 +57,7 @@ public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
         $this->assertSame($adapter, $adapters->get('test'));
     }
 
-    /**
-     * @depends testFactoryReturnsPluginManager
-     */
+    #[Depends('testFactoryReturnsPluginManager')]
     public function testFactoryConfiguresPluginManagerUnderServiceManagerV2(): void
     {
         $container = $this->createMock(ServiceLocatorInterface::class);

diff --git a/test/AdapterPluginManagerTest.php b/test/AdapterPluginManagerTest.php
@@ -7,14 +7,14 @@
 use ArrayIterator;
 use Laminas\Paginator\Adapter;
 use Laminas\Paginator\AdapterPluginManager;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 use function range;
 
-/**
- * @covers \Laminas\Paginator\AdapterPluginManager
- */
+#[CoversClass(AdapterPluginManager::class)]
 class AdapterPluginManagerTest extends TestCase
 {
     /** @var AdapterPluginManager */
@@ -48,9 +48,9 @@ public static function pluginProvider(): iterable
     }
 
     /**
-     * @dataProvider pluginProvider
      * @psalm-param class-string $expectedType
      */
+    #[DataProvider('pluginProvider')]
     public function testCanRetrieveAdapterPlugin(string $pluginName, array $options, string $expectedType): void
     {
         $plugin = $this->adapterPluginManager->get($pluginName, $options);

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -12,15 +12,13 @@
 use Laminas\Paginator\Adapter\Iterator;
 use Laminas\Paginator\Exception\InvalidArgumentException;
 use LaminasTest\Paginator\TestAsset\TestArrayAggregate;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
 use function sprintf;
 
-/**
- * @group      Laminas_Paginator
- * @covers  Laminas\Paginator\Factory<extended>
- */
+#[Group('Laminas_Paginator')]
 class FactoryTest extends TestCase
 {
     public function testCanFactoryPaginatorWithStringAdapterObject(): void