Migrate to PHPUnit 10

brick · May 2, 2024 · 0437dca · 0437dca
1 parent b638587
commit 0437dca
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 173 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /vendor
 /composer.lock
-/.phpunit.result.cache
+/.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   },
   "require-dev": {
     "ext-pdo": "*",
-    "phpunit/phpunit": "^9.0",
+    "phpunit/phpunit": "^10.1",
     "vimeo/psalm": "5.24.0"
   },
   "autoload": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="ORM tests">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-  <coverage processUncoveredFiles="true">
+  <source>
     <include>
       <directory suffix=".php">src</directory>
     </include>
-  </coverage>
+  </source>
 </phpunit>
diff --git a/tests/GatewayTest.php b/tests/GatewayTest.php
@@ -10,6 +10,8 @@
 use Brick\ORM\Tests\Resources\Models\GeoAddress;
 use Brick\ORM\Tests\Resources\Models\User;
 use Brick\ORM\Tests\Resources\Objects\Geometry;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 
 class GatewayTest extends AbstractTestCase
 {
@@ -30,9 +32,7 @@ public function testAddCountry() : void
         $this->assertDebugStatement(0, 'INSERT INTO Country (code, name) VALUES (?, ?)', 'GB', 'United Kingdom');
     }
 
-    /**
-     * @depends testAddCountry
-     */
+    #[Depends('testAddCountry')]
     public function testLoadUnknownCountry() : void
     {
         $this->assertNull(self::$countryRepository->load('XX'));
@@ -41,11 +41,7 @@ public function testLoadUnknownCountry() : void
         $this->assertDebugStatement(0, 'SELECT a.code, a.name FROM Country AS a WHERE a.code = ?', 'XX');
     }
 
-    /**
-     * @depends testLoadUnknownCountry
-     *
-     * @return Country
-     */
+    #[Depends('testLoadUnknownCountry')]
     public function testLoadCountry() : Country
     {
         $country = self::$countryRepository->load('GB');
@@ -59,13 +55,7 @@ public function testLoadCountry() : Country
         return $country;
     }
 
-    /**
-     * @depends testLoadCountry
-     *
-     * @param Country $country
-     *
-     * @return User
-     */
+    #[Depends('testLoadCountry')]
     public function testAddUser(Country $country) : User
     {
         $user = new User('John Smith');
@@ -92,13 +82,7 @@ public function testAddUser(Country $country) : User
         return $user;
     }
 
-    /**
-     * @depends testAddUser
-     *
-     * @param User $user
-     *
-     * @return int
-     */
+    #[Depends('testAddUser')]
     public function testUpdateUser(User $user) : int
     {
         $address = $user->getBillingAddress();
@@ -124,13 +108,7 @@ public function testUpdateUser(User $user) : int
         return $user->getId();
     }
 
-    /**
-     * @depends testUpdateUser
-     *
-     * @param int $userId
-     *
-     * @return int
-     */
+    #[Depends('testUpdateUser')]
     public function testLoadPartialUser(int $userId) : int
     {
         $user = self::$userRepository->load($userId, 0, 'name');
@@ -156,13 +134,7 @@ public function testLoadPartialUser(int $userId) : int
         return $userId;
     }
 
-    /**
-     * @depends testLoadPartialUser
-     *
-     * @param int $userId
-     *
-     * @return User
-     */
+    #[Depends('testLoadPartialUser')]
     public function testLoadUser(int $userId) : User
     {
         $user = self::$userRepository->load($userId);
@@ -194,13 +166,7 @@ public function testLoadUser(int $userId) : User
         return $user;
     }
 
-    /**
-     * @depends testLoadUser
-     *
-     * @param User $user
-     *
-     * @return int
-     */
+    #[Depends('testLoadUser')]
     public function testRemoveUser(User $user) : int
     {
         self::$userRepository->remove($user);
@@ -211,13 +177,7 @@ public function testRemoveUser(User $user) : int
         return $user->getId();
     }
 
-    /**
-     * @depends testRemoveUser
-     *
-     * @param int $userId
-     *
-     * @return void
-     */
+    #[Depends('testRemoveUser')]
     public function testLoadRemovedUser(int $userId) : void
     {
         $user = self::$userRepository->load($userId);
@@ -236,13 +196,12 @@ public function testLoadRemovedUser(int $userId) : void
     }
 
     /**
-     * @dataProvider providerLoadWithLock
-     *
      * @param int    $options
      * @param string $sqlSuffix
      *
      * @return void
      */
+    #[DataProvider('providerLoadWithLock')]
     public function testLoadWithLock(int $options, string $sqlSuffix) : void
     {
         self::$countryRepository->load('XX', $options);
@@ -251,10 +210,7 @@ public function testLoadWithLock(int $options, string $sqlSuffix) : void
         $this->assertDebugStatement(0, 'SELECT a.code, a.name FROM Country AS a WHERE a.code = ? ' . $sqlSuffix, 'XX');
     }
 
-    /**
-     * @return array
-     */
-    public function providerLoadWithLock() : array
+    public static function providerLoadWithLock() : array
     {
         return [
             [Options::LOCK_READ, 'FOR SHARE'],