Merge remote-tracking branch 'origin/2.1.x' into 3.0.x

dbu · dbu · commit abc20ac8bd8d · 2025-12-04T11:08:07.000+01:00
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -31,6 +31,7 @@ jobs:
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 symfony-version: ['*']
                 jackalope-version: ['1.*']
@@ -45,11 +46,16 @@ jobs:
                   - php-version: '8.2'
                     dependencies: highest
                     symfony-version: '6.*'
-                  - php-version: '8.4'
+                  - php-version: '8.5'
                     dependencies: highest
                     symfony-version: '7.*'
                     jackalope-version: '2.*'
                     php-bench: true
+                  - php-version: '8.5'
+                    dependencies: highest
+                    symfony-version: '8.*'
+                    jackalope-version: '2.*'
+                    php-bench: true
 
         steps:
             - name: Checkout project
@@ -111,6 +117,7 @@ jobs:
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 symfony-version: ['*']
                 jackalope-version: ['1.*']
@@ -125,11 +132,16 @@ jobs:
                   - php-version: '8.2'
                     dependencies: highest
                     symfony-version: '6.*'
-                  - php-version: '8.4'
+                  - php-version: '8.5'
                     dependencies: highest
                     symfony-version: '7.*'
                     jackalope-version: '2.*'
                     php-bench: true
+                  - php-version: '8.5'
+                    dependencies: highest
+                    symfony-version: '8.*'
+                    jackalope-version: '2.*'
+                    php-bench: true
 
         steps:
             - name: Checkout project
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,17 @@ Changelog
 2.x
 ===
 
+2.1.1
+-----
+
+* Compatibility with Symfony 8.
+* Test with PHP 8.5 and fix deprecations.
+
+2.1.0
+-----
+
+* Removed accidentally added unused dependency to `doctrine/data-fixtures`.
+
 2.0.1
 -----
 
@@ -503,4 +514,4 @@ maintenance release of the 1.0 family with bugfixes
    ->execute(Query::HYDRATE_PHPCR);
  * CreateQuery($statement, $language) has NOT been implemented in the new query builder.
    It is, however, still available in the DocumentManager.
- * DocumentManager->getDocumentsByQuery renamed to getDocumentsByPhpcrQuery()
+ * DocumentManager->getDocumentsByQuery renamed to getDocumentsByPhpcrQuery()
diff --git a/composer.json b/composer.json
@@ -22,27 +22,26 @@
         "php": "^8.1",
         "doctrine/collections": "^2.0",
         "doctrine/common": "^2.4 || ^3.0",
-        "doctrine/data-fixtures": "^1.0",
         "doctrine/event-manager": "^1.0 || ^2.0",
         "doctrine/persistence": "^3.0",
         "phpcr/phpcr": "^2.1.1",
         "phpcr/phpcr-implementation": "^2.1",
         "phpcr/phpcr-utils": "^1.3.0 || ^2.0",
         "doctrine/instantiator": "^1.0.1 || ^2.0",
-        "symfony/console": "^3.4 || ^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/console": "^3.4 || ^4.3 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
         "psr/cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "symfony/cache": "^5.4 || ^6.0.19 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0.19 || ^7.0",
-        "symfony/phpunit-bridge": "^5.4.21 || ^6.0.19 || ^7.0",
         "liip/rmt": "^1.7.3",
-        "phpunit/phpunit": "^9.6.15"
+        "phpunit/phpunit": "^9.6.15",
+        "symfony/cache": "^5.4 || ^6.0.19 || ^7.0 || ^8.0",
+        "symfony/yaml": "^5.4 || ^6.0.19 || ^7.0 || ^8.0",
+        "symfony/phpunit-bridge": "^5.4.21 || ^6.0.19 || ^7.0 || ^8.0"
     },
     "suggest": {
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
         "jackalope/jackalope-doctrine-dbal": "^1.3 || ^2.0",
-        "jackalope/jackalope-jackrabbit": "^1.3 || ^2.0"
+        "jackalope/jackalope-jackrabbit": "^1.3 || ^2.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "conflict": {
         "jackalope/jackalope-doctrine-dbal": "<1.1.5",
diff --git a/lib/Doctrine/ODM/PHPCR/Document/AbstractFile.php b/lib/Doctrine/ODM/PHPCR/Document/AbstractFile.php
@@ -10,7 +10,7 @@
  * This class represents an abstract "file".
  */
 #[PHPCR\MappedSuperclass(mixins: ['mix:created'])]
-abstract class AbstractFile implements HierarchyInterface
+abstract class AbstractFile implements \Stringable, HierarchyInterface
 {
     #[PHPCR\Id(strategy: 'parent')]
     protected string $id;
diff --git a/lib/Doctrine/ODM/PHPCR/Document/Generic.php b/lib/Doctrine/ODM/PHPCR/Document/Generic.php
@@ -15,7 +15,7 @@
  * You can not use this to create nodes as it has no type mapping.
  */
 #[PHPCR\Document]
-class Generic
+class Generic implements \Stringable
 {
     /**
      * Id (path) of this document.
diff --git a/lib/Doctrine/ODM/PHPCR/Document/Resource.php b/lib/Doctrine/ODM/PHPCR/Document/Resource.php
@@ -12,7 +12,7 @@
  * @see http://wiki.apache.org/jackrabbit/nt:resource
  */
 #[PHPCR\Document(nodeType: 'nt:resource')]
-class Resource
+class Resource implements \Stringable
 {
     #[PHPCR\Id]
     protected string $id;
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php
@@ -315,7 +315,6 @@ public function wakeupReflection(ReflectionService $reflService): void
             $reflField = array_key_exists('declared', $this->mappings[$fieldName])
                 ? new \ReflectionProperty($this->mappings[$fieldName]['declared'], $fieldName)
                 : $this->reflClass->getProperty($fieldName);
-            $reflField->setAccessible(true);
             $this->reflFields[$fieldName] = $reflField;
         }
     }
@@ -888,7 +887,7 @@ private function validateAndCompleteFieldMapping(array $mapping, ?self $inherite
             $mapping['assocNulls'] = $mapping['property'].'Nulls';
         }
 
-        if (array_key_exists($mapping['fieldName'], $this->mappings)) {
+        if ($mapping['fieldName'] && array_key_exists($mapping['fieldName'], $this->mappings)) {
             if (!$isField
                 || empty($mapping['type'])
                 || empty($this->mappings[$mapping['fieldName']])
@@ -909,7 +908,6 @@ private function validateAndCompleteFieldMapping(array $mapping, ?self $inherite
         }
 
         $reflProp = $this->reflClass->getProperty($mapping['fieldName']);
-        $reflProp->setAccessible(true);
         $this->reflFields[$mapping['fieldName']] = $reflProp;
         $this->mappings[$mapping['fieldName']] = $mapping;
 
@@ -1212,7 +1210,7 @@ public function hasField($fieldName): bool
             || $this->versionCreatedField === $fieldName;
     }
 
-    public function hasAssociation($fieldName): bool
+    public function hasAssociation(string $fieldName): bool
     {
         return array_key_exists($fieldName, $this->mappings)
             && in_array($this->mappings[$fieldName]['type'], [self::MANY_TO_ONE, self::MANY_TO_MANY, 'referrers', 'mixedreferrers', 'children', 'child', 'parent'], true);
@@ -1232,14 +1230,14 @@ public function getAssociation(string $fieldName): array
         return $this->mappings[$fieldName];
     }
 
-    public function isSingleValuedAssociation($fieldName): bool
+    public function isSingleValuedAssociation(string $fieldName): bool
     {
         return array_key_exists($fieldName, $this->childMappings)
             || $fieldName === $this->parentMapping
             || array_key_exists($fieldName, $this->referenceMappings) && self::MANY_TO_ONE === $this->mappings[$fieldName]['type'];
     }
 
-    public function isCollectionValuedAssociation($fieldName): bool
+    public function isCollectionValuedAssociation(string $fieldName): bool
     {
         return array_key_exists($fieldName, $this->referenceMappings) && self::MANY_TO_MANY === $this->mappings[$fieldName]['type']
             || array_key_exists($fieldName, $this->referrersMappings)
@@ -1362,7 +1360,7 @@ public function isNullable(string $fieldName): bool
      */
     public function mapField(array $mapping, ?self $inherited = null): void
     {
-        $parentMapping = array_key_exists('fieldName', $mapping) && array_key_exists($mapping['fieldName'], $this->mappings)
+        $parentMapping = array_key_exists('fieldName', $mapping) && null !== $mapping['fieldName'] && array_key_exists($mapping['fieldName'], $this->mappings)
             ? $this->mappings[$mapping['fieldName']]
             : null;
 
@@ -1547,7 +1545,7 @@ public function newInstance(): object
 
     public function setIdentifierValue(object $document, string $id): void
     {
-        if (array_key_exists($this->identifier, $this->reflFields)) {
+        if (null !== $this->identifier && array_key_exists($this->identifier, $this->reflFields)) {
             $this->reflFields[$this->identifier]->setValue($document, $id);
         }
     }
diff --git a/lib/Doctrine/ODM/PHPCR/PersistentCollection.php b/lib/Doctrine/ODM/PHPCR/PersistentCollection.php
@@ -8,7 +8,7 @@
 /**
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-abstract class PersistentCollection implements Collection
+abstract class PersistentCollection implements \Stringable, Collection
 {
     protected const INITIALIZED_NONE = 'not initialized';
 
diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php b/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php
@@ -169,7 +169,6 @@ private function createCloner(PhpcrClassMetadata $classMetadata, ?\ReflectionPro
                 $propertyName = $reflectionProperty->getName();
 
                 if ($classMetadata->hasField($propertyName) || $classMetadata->hasAssociation($propertyName)) {
-                    $reflectionProperty->setAccessible(true);
                     $reflectionProperty->setValue($cloned, $reflectionProperty->getValue($original));
                 }
             }
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Builder/ConverterPhpcr.php b/lib/Doctrine/ODM/PHPCR/Query/Builder/ConverterPhpcr.php
@@ -307,7 +307,7 @@ protected function walkOperandStaticLiteral(OperandStaticLiteral $node): Literal
                     'uuid' => 'string',
                 ];
 
-                if (array_key_exists($type, $typeMapping)) {
+                if ($type && array_key_exists($type, $typeMapping)) {
                     settype($value, $typeMapping[$type]);
                 }
             }
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Builder/QueryBuilder.php b/lib/Doctrine/ODM/PHPCR/Query/Builder/QueryBuilder.php
@@ -28,7 +28,7 @@
  *
  * @author Daniel Leech <daniel@dantleech.com>
  */
-class QueryBuilder extends QBConstants
+class QueryBuilder extends QBConstants implements \Stringable
 {
     private ?ConverterInterface $converter = null;
     private int $firstResult = 0;
diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -376,7 +376,7 @@ public function getOrCreateDocuments(?string $className, iterable $nodes, array
 
             foreach ($class->fieldMappings as $fieldName) {
                 $mapping = $class->mappings[$fieldName];
-                if (array_key_exists($mapping['property'], $properties)) {
+                if (null !== $mapping['property'] && array_key_exists($mapping['property'], $properties)) {
                     if (true === $mapping['multivalue']) {
                         if (array_key_exists('assoc', $mapping) && null !== $mapping['assoc']) {
                             $documentState[$fieldName] = $this->createAssoc($properties, $mapping);
@@ -580,7 +580,8 @@ public function getOrCreateProxy(string $targetId, string $className, ?string $l
         }
 
         $metadata = $this->dm->getClassMetadata($className);
-        $proxyDocument = $this->dm->getProxyFactory()->getProxy($className, [$metadata->identifier => $targetId]);
+        // TODO: what should happen when identifier is null?
+        $proxyDocument = $this->dm->getProxyFactory()->getProxy($className, [(string) $metadata->identifier => $targetId]);
 
         // register the document under its own id
         $this->registerDocument($proxyDocument, $targetId);
@@ -1378,6 +1379,7 @@ public function computeChangeSet(ClassMetadata $class, object $document): void
             $destPath = $destName = false;
 
             if (array_key_exists($oid, $this->originalData)
+                && null !== $class->parentMapping
                 && array_key_exists($class->parentMapping, $this->originalData[$oid])
                 && array_key_exists($class->parentMapping, $changeSet)
                 && $this->originalData[$oid][$class->parentMapping] !== $changeSet[$class->parentMapping]
@@ -1386,6 +1388,7 @@ public function computeChangeSet(ClassMetadata $class, object $document): void
             }
 
             if (array_key_exists($oid, $this->originalData)
+                && null !== $class->nodename
                 && array_key_exists($class->nodename, $this->originalData[$oid])
                 && array_key_exists($class->nodename, $changeSet)
                 && $this->originalData[$oid][$class->nodename] !== $changeSet[$class->nodename]
@@ -1397,7 +1400,7 @@ public function computeChangeSet(ClassMetadata $class, object $document): void
             if ($destPath || $destName) {
                 // add the other field if only one was changed
                 if (false === $destPath) {
-                    $destPath = array_key_exists($class->parentMapping, $changeSet)
+                    $destPath = null !== $class->parentMapping && array_key_exists($class->parentMapping, $changeSet)
                         ? $this->getDocumentId($changeSet[$class->parentMapping])
                         : PathHelper::getParentPath($this->getDocumentId($document));
                 }
@@ -1419,6 +1422,7 @@ public function computeChangeSet(ClassMetadata $class, object $document): void
             }
 
             if (array_key_exists($oid, $this->originalData)
+                && null !== $class->identifier
                 && array_key_exists($class->identifier, $this->originalData[$oid])
                 && array_key_exists($class->identifier, $changeSet)
                 && $this->originalData[$oid][$class->identifier] !== $changeSet[$class->identifier]
@@ -2926,7 +2930,7 @@ public function getDocumentById(string $id): ?object
     public function getDocumentId($document, bool $throw = true): ?string
     {
         $oid = is_object($document) ? \spl_object_hash($document) : $document;
-        if (empty($this->documentIds[$oid])) {
+        if (null === $oid || empty($this->documentIds[$oid])) {
             if (!$throw) {
                 return null;
             }
@@ -3195,6 +3199,7 @@ public function doLoadTranslation(object $document, ClassMetadata $metadata, ?st
             // current locale is already loaded and not removed
             if (!$refresh
                 && array_key_exists($oid, $this->documentTranslations)
+                && null !== $currentLocale
                 && array_key_exists($currentLocale, $this->documentTranslations[$oid])
             ) {
                 return;
diff --git a/lib/Doctrine/ODM/PHPCR/Version.php b/lib/Doctrine/ODM/PHPCR/Version.php
@@ -10,5 +10,5 @@ final class Version
     /**
      * Current version of PHPCR ODM.
      */
-    public const VERSION = '2.0-dev';
+    public const VERSION = '2.1.1';
 }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/DocumentClassMapperTest.php b/tests/Doctrine/Tests/ODM/PHPCR/DocumentClassMapperTest.php
@@ -209,7 +209,6 @@ public function testExpandClassName(string $className, string $fqClassName, bool
 
         $refl = new \ReflectionClass($this->mapper);
         $method = $refl->getMethod('expandClassName');
-        $method->setAccessible(true);
         $res = $method->invoke($this->mapper, $this->dm, $className);
 
         $this->assertEquals($fqClassName, $res);
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php b/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php
@@ -82,7 +82,6 @@ public function testGetMetadataFactory(): void
         $factory = $dm->getMetadataFactory();
         $reflection = new \ReflectionClass($factory);
         $property = $reflection->getProperty('dm');
-        $property->setAccessible(true);
         $this->assertSame($dm, $property->getValue($factory));
     }
 
@@ -114,9 +113,7 @@ public function testContains(): void
         $uow = $dm->getUnitOfWork();
 
         $method = new \ReflectionMethod($uow, 'registerDocument');
-        $method->setAccessible(true);
         $method->invoke($uow, $obj, '/foo');
-        $method->setAccessible(false);
 
         $this->assertTrue($dm->contains($obj));
     }
@@ -185,9 +182,7 @@ public function testGetDocumentIdReturnsValueOfUnitOfWork(): void
         $uow = $dm->getUnitOfWork();
 
         $reflectionProperty = new \ReflectionProperty($uow, 'documentIds');
-        $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($uow, [spl_object_hash($obj) => '/foo']);
-        $reflectionProperty->setAccessible(false);
 
         $this->assertSame('/foo', $dm->getDocumentId($obj));
     }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractLeafNodeTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractLeafNodeTest.php
@@ -46,7 +46,6 @@ public function testExplodeField($fieldSpec, $xpctdExceptionMessage, $xpctdRes =
         }
 
         $method = $this->refl->getMethod('explodeField');
-        $method->setAccessible(true);
         $res = $method->invoke($this->leafNode, $fieldSpec);
 
         if (false === $xpctdExceptionMessage) {
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/QueryBuilderTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/QueryBuilderTest.php
@@ -107,7 +107,6 @@ public function testCloningQueryBuilderUniqueConverterInstance(): void
     {
         $reflection = new \ReflectionClass(get_class($this->node));
         $property = $reflection->getProperty('converter');
-        $property->setAccessible(true);
 
         $this->node->setConverter($this->createMock(ConverterInterface::class));
 
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Translation/AttributeTranslationStrategyTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Translation/AttributeTranslationStrategyTest.php
@@ -30,7 +30,6 @@ public function setUp(): void
 
         $class = new \ReflectionClass(AttributeTranslationStrategy::class);
         $this->method = $class->getMethod('getTranslatedPropertyName');
-        $this->method->setAccessible(true);
     }
 
     public function testSetPrefixAndGetPropertyName(): void
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/UnitOfWorkTest.php b/tests/Doctrine/Tests/ODM/PHPCR/UnitOfWorkTest.php

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* This class represents an abstract "file".`
`11`	`11`	`*/`
`12`	`12`	`#[PHPCR\MappedSuperclass(mixins: ['mix:created'])]`
`13`		`-abstract class AbstractFile implements HierarchyInterface`
	`13`	`+abstract class AbstractFile implements \Stringable, HierarchyInterface`
`14`	`14`	`{`
`15`	`15`	`#[PHPCR\Id(strategy: 'parent')]`
`16`	`16`	`protected string $id;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* You can not use this to create nodes as it has no type mapping.`
`16`	`16`	`*/`
`17`	`17`	`#[PHPCR\Document]`
`18`		`-class Generic`
	`18`	`+class Generic implements \Stringable`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* Id (path) of this document.`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* @see http://wiki.apache.org/jackrabbit/nt:resource`
`13`	`13`	`*/`
`14`	`14`	`#[PHPCR\Document(nodeType: 'nt:resource')]`
`15`		`-class Resource`
	`15`	`+class Resource implements \Stringable`
`16`	`16`	`{`
`17`	`17`	`#[PHPCR\Id]`
`18`	`18`	`protected string $id;`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,6 @@ public function wakeupReflection(ReflectionService $reflService): void`
`315`	`315`	`$reflField = array_key_exists('declared', $this->mappings[$fieldName])`
`316`	`316`	`? new \ReflectionProperty($this->mappings[$fieldName]['declared'], $fieldName)`
`317`	`317`	`: $this->reflClass->getProperty($fieldName);`
`318`		`- $reflField->setAccessible(true);`
`319`	`318`	`$this->reflFields[$fieldName] = $reflField;`
`320`	`319`	`}`
`321`	`320`	`}`
`@@ -888,7 +887,7 @@ private function validateAndCompleteFieldMapping(array $mapping, ?self $inherite`
`888`	`887`	`$mapping['assocNulls'] = $mapping['property'].'Nulls';`
`889`	`888`	`}`
`890`	`889`
`891`		`- if (array_key_exists($mapping['fieldName'], $this->mappings)) {`
	`890`	`+ if ($mapping['fieldName'] && array_key_exists($mapping['fieldName'], $this->mappings)) {`
`892`	`891`	`if (!$isField`
`893`	`892`	`\|\| empty($mapping['type'])`
`894`	`893`	`\|\| empty($this->mappings[$mapping['fieldName']])`
`@@ -909,7 +908,6 @@ private function validateAndCompleteFieldMapping(array $mapping, ?self $inherite`
`909`	`908`	`}`
`910`	`909`
`911`	`910`	`$reflProp = $this->reflClass->getProperty($mapping['fieldName']);`
`912`		`- $reflProp->setAccessible(true);`
`913`	`911`	`$this->reflFields[$mapping['fieldName']] = $reflProp;`
`914`	`912`	`$this->mappings[$mapping['fieldName']] = $mapping;`
`915`	`913`
`@@ -1212,7 +1210,7 @@ public function hasField($fieldName): bool`
`1212`	`1210`	`\|\| $this->versionCreatedField === $fieldName;`
`1213`	`1211`	`}`
`1214`	`1212`
`1215`		`- public function hasAssociation($fieldName): bool`
	`1213`	`+ public function hasAssociation(string $fieldName): bool`
`1216`	`1214`	`{`
`1217`	`1215`	`return array_key_exists($fieldName, $this->mappings)`
`1218`	`1216`	`&& in_array($this->mappings[$fieldName]['type'], [self::MANY_TO_ONE, self::MANY_TO_MANY, 'referrers', 'mixedreferrers', 'children', 'child', 'parent'], true);`
`@@ -1232,14 +1230,14 @@ public function getAssociation(string $fieldName): array`
`1232`	`1230`	`return $this->mappings[$fieldName];`
`1233`	`1231`	`}`
`1234`	`1232`
`1235`		`- public function isSingleValuedAssociation($fieldName): bool`
	`1233`	`+ public function isSingleValuedAssociation(string $fieldName): bool`
`1236`	`1234`	`{`
`1237`	`1235`	`return array_key_exists($fieldName, $this->childMappings)`
`1238`	`1236`	`\|\| $fieldName === $this->parentMapping`
`1239`	`1237`	`\|\| array_key_exists($fieldName, $this->referenceMappings) && self::MANY_TO_ONE === $this->mappings[$fieldName]['type'];`
`1240`	`1238`	`}`
`1241`	`1239`
`1242`		`- public function isCollectionValuedAssociation($fieldName): bool`
	`1240`	`+ public function isCollectionValuedAssociation(string $fieldName): bool`
`1243`	`1241`	`{`
`1244`	`1242`	`return array_key_exists($fieldName, $this->referenceMappings) && self::MANY_TO_MANY === $this->mappings[$fieldName]['type']`
`1245`	`1243`	`\|\| array_key_exists($fieldName, $this->referrersMappings)`
`@@ -1362,7 +1360,7 @@ public function isNullable(string $fieldName): bool`
`1362`	`1360`	`*/`
`1363`	`1361`	`public function mapField(array $mapping, ?self $inherited = null): void`
`1364`	`1362`	`{`
`1365`		`- $parentMapping = array_key_exists('fieldName', $mapping) && array_key_exists($mapping['fieldName'], $this->mappings)`
	`1363`	`+ $parentMapping = array_key_exists('fieldName', $mapping) && null !== $mapping['fieldName'] && array_key_exists($mapping['fieldName'], $this->mappings)`
`1366`	`1364`	`? $this->mappings[$mapping['fieldName']]`
`1367`	`1365`	`: null;`
`1368`	`1366`
`@@ -1547,7 +1545,7 @@ public function newInstance(): object`
`1547`	`1545`
`1548`	`1546`	`public function setIdentifierValue(object $document, string $id): void`
`1549`	`1547`	`{`
`1550`		`- if (array_key_exists($this->identifier, $this->reflFields)) {`
	`1548`	`+ if (null !== $this->identifier && array_key_exists($this->identifier, $this->reflFields)) {`
`1551`	`1549`	`$this->reflFields[$this->identifier]->setValue($document, $id);`
`1552`	`1550`	`}`
`1553`	`1551`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`/**`
`9`	`9`	`* @author Benjamin Eberlei <kontakt@beberlei.de>`
`10`	`10`	`*/`
`11`		`-abstract class PersistentCollection implements Collection`
	`11`	`+abstract class PersistentCollection implements \Stringable, Collection`
`12`	`12`	`{`
`13`	`13`	`protected const INITIALIZED_NONE = 'not initialized';`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ private function createCloner(PhpcrClassMetadata $classMetadata, ?\ReflectionPro`
`169`	`169`	`$propertyName = $reflectionProperty->getName();`
`170`	`170`
`171`	`171`	`if ($classMetadata->hasField($propertyName) \|\| $classMetadata->hasAssociation($propertyName)) {`
`172`		`- $reflectionProperty->setAccessible(true);`
`173`	`172`	`$reflectionProperty->setValue($cloned, $reflectionProperty->getValue($original));`
`174`	`173`	`}`
`175`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ protected function walkOperandStaticLiteral(OperandStaticLiteral $node): Literal`
`307`	`307`	`'uuid' => 'string',`
`308`	`308`	`];`
`309`	`309`
`310`		`- if (array_key_exists($type, $typeMapping)) {`
	`310`	`+ if ($type && array_key_exists($type, $typeMapping)) {`
`311`	`311`	`settype($value, $typeMapping[$type]);`
`312`	`312`	`}`
`313`	`313`	`}`