cr fixes

Author: krzysztof-ciszewski

tests/Tests/DocumentManagerTest.php

@@ -252,12 +252,14 @@ public function testGetClassNameForAssociationWithClassMetadataDiscriminatorMap(
         $data    = ['type' => 'forum_user'];
 
         $userClassMetadata = new ClassMetadata(ForumUser::class);
-        $reflectionProp    = new ReflectionProperty(ClassMetadata::class, 'discriminatorField');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($userClassMetadata, 'type');
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'discriminatorMap');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($userClassMetadata, ['forum_user' => ForumUser::class]);
+        new ReflectionProperty(ClassMetadata::class, 'discriminatorField')->setValue(
+            $userClassMetadata,
+            'type',
+        );
+        new ReflectionProperty(ClassMetadata::class, 'discriminatorMap')->setValue(
+            $userClassMetadata,
+            ['forum_user' => ForumUser::class],
+        );
         $this->dm->getMetadataFactory()->setMetadataFor(User::class, $userClassMetadata);
 
         self::assertEquals(ForumUser::class, $this->dm->getClassNameForAssociation($mapping, $data));

tests/Tests/Mapping/ClassMetadataTest.php

@@ -727,10 +727,8 @@ public function testDefaultStorageStrategyOfEmbeddedDocumentFields(): void
             public $many;
         };
 
-        $cm             = new ClassMetadata($object::class);
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'isEmbeddedDocument');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, true);
+        $cm = new ClassMetadata($object::class);
+        new ReflectionProperty(ClassMetadata::class, 'isEmbeddedDocument')->setValue($cm, true);
 
         $mapping = $cm->mapField([
             'fieldName' => 'many',
@@ -750,10 +748,8 @@ public function testOwningAndInversedRefsNeedTargetDocument(array $config): void
             'strategy' => ClassMetadata::STORAGE_STRATEGY_ATOMIC_SET,
         ]);
 
-        $cm             = new ClassMetadata('stdClass');
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'isEmbeddedDocument');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, true);
+        $cm = new ClassMetadata('stdClass');
+        new ReflectionProperty(ClassMetadata::class, 'isEmbeddedDocument')->setValue($cm, true);
         $this->expectException(MappingException::class);
         $cm->mapField($config);
     }
@@ -827,10 +823,11 @@ public function testSetShardKeyForClassWithoutInheritance(): void
 
     public function testSetShardKeyForClassWithSingleCollectionInheritance(): void
     {
-        $cm             = new ClassMetadata('stdClass');
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'inheritanceType');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, ClassMetadata::INHERITANCE_TYPE_SINGLE_COLLECTION);
+        $cm = new ClassMetadata('stdClass');
+        new ReflectionProperty(ClassMetadata::class, 'inheritanceType')->setValue(
+            $cm,
+            ClassMetadata::INHERITANCE_TYPE_SINGLE_COLLECTION,
+        );
         $cm->setShardKey(['id' => 'asc']);
 
         $shardKey = $cm->getShardKey();
@@ -842,9 +839,10 @@ public function testSetShardKeyForClassWithSingleCollectionInheritanceWhichAlrea
     {
         $cm = new ClassMetadata('stdClass');
         $cm->setShardKey(['id' => 'asc']);
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'inheritanceType');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, ClassMetadata::INHERITANCE_TYPE_SINGLE_COLLECTION);
+        new ReflectionProperty(ClassMetadata::class, 'inheritanceType')->setValue(
+            $cm,
+            ClassMetadata::INHERITANCE_TYPE_SINGLE_COLLECTION,
+        );
 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage('Shard key overriding in subclass is forbidden for single collection inheritance');
@@ -853,10 +851,11 @@ public function testSetShardKeyForClassWithSingleCollectionInheritanceWhichAlrea
 
     public function testSetShardKeyForClassWithCollPerClassInheritance(): void
     {
-        $cm             = new ClassMetadata('stdClass');
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'inheritanceType');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, ClassMetadata::INHERITANCE_TYPE_COLLECTION_PER_CLASS);
+        $cm = new ClassMetadata('stdClass');
+        new ReflectionProperty(ClassMetadata::class, 'inheritanceType')->setValue(
+            $cm,
+            ClassMetadata::INHERITANCE_TYPE_COLLECTION_PER_CLASS,
+        );
         $cm->setShardKey(['id' => 'asc']);
 
         $shardKey = $cm->getShardKey();

tests/Tests/SchemaManagerTest.php

@@ -750,16 +750,10 @@ public function testUpdateDocumentValidatorReset(array $expectedWriteOptions, ?i
     #[DataProvider('getWriteOptions')]
     public function testCreateDocumentCollection(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
-        $cm             = $this->dm->getClassMetadata(CmsArticle::class);
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'collectionCapped');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, true);
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'collectionSize');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, 1048576);
-        $reflectionProp = new ReflectionProperty(ClassMetadata::class, 'collectionMax');
-        $reflectionProp->setAccessible(true);
-        $reflectionProp->setValue($cm, 32);
+        $cm = $this->dm->getClassMetadata(CmsArticle::class);
+        new ReflectionProperty(ClassMetadata::class, 'collectionCapped')->setValue($cm, true);
+        new ReflectionProperty(ClassMetadata::class, 'collectionSize')->setValue($cm, 1048576);
+        new ReflectionProperty(ClassMetadata::class, 'collectionMax')->setValue($cm, 32);
 
         $options = [
             'capped' => true,