Merge pull request #3 from yokai-php/php8

Switched minimum PHP version to 8.0

Author: yann-eugone

.github/workflows/tests.yml

@@ -14,7 +14,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
+          - php-version: 8.0
+          - php-version: 8.2
 
     steps:
       - name: "Checkout"
@@ -40,7 +41,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
+          - php-version: 8.2
 
     steps:
       - name: "Checkout"
@@ -66,8 +67,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
-            symfony-version: 5.1.*
+          - php-version: 8.2
 
     steps:
       - name: "Checkout"
@@ -93,7 +93,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
+          - php-version: 8.2
 
     steps:
       - name: "Checkout"

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^7.4|^8.0",
+    "php": "^8.0",
     "doctrine/orm": "^2.7",
     "webmozart/assert": "^1.9"
   },
@@ -22,7 +22,8 @@
   "require-dev": {
     "phpunit/phpunit": "^9.4",
     "phpstan/phpstan": "^0.12.76",
-    "squizlabs/php_codesniffer": "^3.5"
+    "squizlabs/php_codesniffer": "^3.5",
+    "symfony/cache": "^5.4|^6.0"
   },
   "autoload-dev": {
     "psr-4": {

tests/EntityTest.php

@@ -5,10 +5,11 @@
 namespace Yokai\DoctrineValueObject\Tests;
 
 use DateTimeImmutable;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Tools\SchemaTool;
-use Doctrine\ORM\Tools\Setup;
 use PHPUnit\Framework\TestCase;
 use Yokai\DoctrineValueObject\Doctrine\Types;
 
@@ -34,10 +35,7 @@ public function testUserWithNoValues(): void
 
         // fetch row from database
         $sql = "SELECT * FROM user WHERE id = ?";
-        $stmt = $entityManager->getConnection()->prepare($sql);
-        $stmt->bindValue(1, $user->id);
-        $stmt->execute();
-        $row = $stmt->fetchAssociative();
+        $row = $entityManager->getConnection()->fetchAssociative($sql, [$user->id]);
         // assert all columns are null
         self::assertNull($row['status']);
         self::assertNull($row['birthdate']);
@@ -77,12 +75,9 @@ public function testUserWithAllValues(): void
 
         // fetch row from database
         $sql = "SELECT * FROM user WHERE id = ?";
-        $stmt = $entityManager->getConnection()->prepare($sql);
-        $stmt->bindValue(1, $user->id);
-        $stmt->execute();
-        $row = $stmt->fetchAssociative();
+        $row = $entityManager->getConnection()->fetchAssociative($sql, [$user->id]);
         // assert all columns are filled with value object values
-        self::assertSame('0', $row['status']);
+        self::assertSame('0', (string)$row['status']);
         self::assertSame('1986-11-17 00:00:00', $row['birthdate']);
         self::assertSame('+33677889900', $row['contactPhoneNumber']);
         self::assertSame('["+33455667788","+33233445566"]', $row['phoneNumbers']);
@@ -110,8 +105,9 @@ private function manager(): EntityManager
         (new Types(self::TYPES))->register(Type::getTypeRegistry());
 
         // create entity manager with an sqlite in memory storage
-        $config = Setup::createAnnotationMetadataConfiguration([__DIR__], true, null, null, false);
-        $entityManager = EntityManager::create(['url' => 'sqlite:///:memory:'], $config);
+        $config = ORMSetup::createAttributeMetadataConfiguration([__DIR__], true);
+        $connection = DriverManager::getConnection(['url' => 'sqlite:///:memory:']);
+        $entityManager = new EntityManager($connection, $config);
         // create schema
         (new SchemaTool($entityManager))
             ->createSchema($entityManager->getMetadataFactory()->getAllMetadata());

tests/User.php

@@ -6,40 +6,26 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 final class User
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: "integer")]
     public ?int $id = null;
 
-    /**
-     * @ORM\Column(type="user_status", nullable=true)
-     */
+    #[ORM\Column(type: "user_status", nullable: true)]
     public ?Status $status = null;
 
-    /**
-     * @ORM\Column(type="birthdate", nullable=true)
-     */
+    #[ORM\Column(type: "birthdate", nullable: true)]
     public ?Birthdate $birthdate = null;
 
-    /**
-     * @ORM\Column(type="phone_number", nullable=true)
-     */
+    #[ORM\Column(type: "phone_number", nullable: true)]
     public ?PhoneNumber $contactPhoneNumber = null;
 
-    /**
-     * @ORM\Column(type="phone_numbers", nullable=true)
-     */
+    #[ORM\Column(type: "phone_numbers", nullable: true)]
     public ?PhoneNumbers $phoneNumbers = null;
 
-    /**
-     * @ORM\Column(type="notifications", nullable=true)
-     */
+    #[ORM\Column(type: "notifications", nullable:true)]
     public ?Notifications $notifications = null;
 }