Use promoted properties for encrypted document tests

Author: GromNaN

tests/Doctrine/ODM/MongoDB/Tests/EncryptionTest.php

@@ -9,7 +9,7 @@
 
 class EncryptionTest extends BaseTestCase
 {
-    public function testMetadataIsEncrypted(): void
+    public function testEncryptionFieldMap(): void
     {
         $factory            = new EncryptionFieldMap($this->dm->getMetadataFactory());
         $encryptedFieldsMap = $factory->getEncryptionFieldMap(Patient::class);

tests/Doctrine/ODM/MongoDB/Tests/Functional/QueryableEncryptionTest.php

@@ -34,20 +34,18 @@ public function testCreateAndQueryEncryptedCollection(): void
         self::assertContains('datakeys', $collectionNames);
 
         // Insert a document
-        $patient              = new Patient();
-        $patient->patientName = 'Jon Doe';
-        $patient->patientId   = 12345678;
-
-        $patientRecord                = new PatientRecord();
-        $patientRecord->ssn           = '987-65-4320';
-        $patientRecord->billingAmount = 1200;
-
-        $billing         = new PatientBilling();
-        $billing->type   = 'Visa';
-        $billing->number = '4111111111111111';
-
-        $patientRecord->billing = $billing;
-        $patient->patientRecord = $patientRecord;
+        $patient = new Patient(
+            patientName: 'Jon Doe',
+            patientId: 12345678,
+            patientRecord: new PatientRecord(
+                ssn: '987-65-4320',
+                billing: new PatientBilling(
+                    type: 'Visa',
+                    number: '4111111111111111',
+                ),
+                billingAmount: 1200,
+            ),
+        );
 
         $this->dm->persist($patient);
         $this->dm->flush();
@@ -58,6 +56,7 @@ public function testCreateAndQueryEncryptedCollection(): void
         self::assertNotNull($result);
         self::assertSame('Jon Doe', $result->patientName);
         self::assertSame('987-65-4320', $result->patientRecord->ssn);
+        self::assertSame('4111111111111111', $result->patientRecord->billing->number);
 
         // Queryable with range
         $result = $this->dm->getRepository(Patient::class)->findOneBy(['patientRecord.billingAmount' => ['$gt' => 1000, '$lt' => 2000]]);

tests/Documents/Encryption/Patient.php

@@ -12,12 +12,13 @@ class Patient
     #[ODM\Id]
     public ?string $id;
 
-    #[ODM\Field]
-    public string $patientName;
-
-    #[ODM\Field]
-    public int $patientId;
-
-    #[ODM\EmbedOne(targetDocument: PatientRecord::class)]
-    public PatientRecord $patientRecord;
+    public function __construct(
+        #[ODM\Field]
+        public string $patientName,
+        #[ODM\Field]
+        public int $patientId,
+        #[ODM\EmbedOne(targetDocument: PatientRecord::class)]
+        public PatientRecord $patientRecord,
+    ) {
+    }
 }

tests/Documents/Encryption/PatientBilling.php

@@ -10,9 +10,11 @@
 #[EmbeddedDocument]
 class PatientBilling
 {
-    #[ODM\Field]
-    public string $type;
-
-    #[ODM\Field]
-    public string $number;
+    public function __construct(
+        #[ODM\Field]
+        public string $type,
+        #[ODM\Field]
+        public string $number,
+    ) {
+    }
 }

tests/Documents/Encryption/PatientRecord.php

@@ -13,15 +13,16 @@ class PatientRecord
     #[ODM\Id]
     public ?string $id;
 
-    #[ODM\Field]
-    #[ODM\Encrypt(queryType: ODM\Encrypt::QUERY_TYPE_EQUALITY)]
-    public string $ssn;
-
-    #[ODM\EmbedOne(targetDocument: PatientBilling::class)]
-    #[ODM\Encrypt]
-    public PatientBilling $billing;
-
-    #[ODM\Field]
-    #[ODM\Encrypt(queryType: ODM\Encrypt::QUERY_TYPE_RANGE, sparsity: 1, trimFactor: 4, min: 100, max: 2000)]
-    public int $billingAmount;
+    public function __construct(
+        #[ODM\Field]
+        #[ODM\Encrypt(queryType: ODM\Encrypt::QUERY_TYPE_EQUALITY)]
+        public string $ssn,
+        #[ODM\EmbedOne(targetDocument: PatientBilling::class)]
+        #[ODM\Encrypt]
+        public PatientBilling $billing,
+        #[ODM\Field]
+        #[ODM\Encrypt(queryType: ODM\Encrypt::QUERY_TYPE_RANGE, sparsity: 1, trimFactor: 4, min: 100, max: 2000)]
+        public int $billingAmount,
+    ) {
+    }
 }