Merge branch '6.4' into 7.0

derrabus · derrabus · commit 8debf885173a · 2024-02-27T13:34:35.000+01:00
* 6.4:
  Safeguard dynamic access to Doctrine metadata properties
  Enhance error handling in StaticPrefixCollection for compatibility with libpcre2-10.43
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -195,7 +195,7 @@ private static function getRealClass(string $class): string
     private static function getMappingValue(array|JoinColumnMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof JoinColumnMapping) {
-            return $mapping->$key;
+            return $mapping->$key ?? null;
         }
 
         return $mapping[$key] ?? null;
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -279,7 +279,7 @@ private function getPhpType(string $doctrineType): ?string
     private static function getMappingValue(array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof AssociationMapping || $mapping instanceof EmbeddedClassMapping || $mapping instanceof FieldMapping || $mapping instanceof JoinColumnMapping) {
-            return $mapping->$key;
+            return $mapping->$key ?? null;
         }
 
         return $mapping[$key] ?? null;
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -137,7 +137,7 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array
     private static function getFieldMappingValue(array|FieldMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof FieldMapping) {
-            return $mapping->$key;
+            return $mapping->$key ?? null;
         }
 
         return $mapping[$key] ?? null;
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -198,6 +198,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
 
     public static function handleError(int $type, string $msg): bool
     {
-        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');
+        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')
+            || str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ private static function getRealClass(string $class): string`
`195`	`195`	`private static function getMappingValue(array\|JoinColumnMapping $mapping, string $key): mixed`
`196`	`196`	`{`
`197`	`197`	`if ($mapping instanceof JoinColumnMapping) {`
`198`		`- return $mapping->$key;`
	`198`	`+ return $mapping->$key ?? null;`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`return $mapping[$key] ?? null;`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private function getPhpType(string $doctrineType): ?string`
`279`	`279`	`private static function getMappingValue(array\|AssociationMapping\|EmbeddedClassMapping\|FieldMapping\|JoinColumnMapping $mapping, string $key): mixed`
`280`	`280`	`{`
`281`	`281`	`if ($mapping instanceof AssociationMapping \|\| $mapping instanceof EmbeddedClassMapping \|\| $mapping instanceof FieldMapping \|\| $mapping instanceof JoinColumnMapping) {`
`282`		`- return $mapping->$key;`
	`282`	`+ return $mapping->$key ?? null;`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`return $mapping[$key] ?? null;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array`
`137`	`137`	`private static function getFieldMappingValue(array\|FieldMapping $mapping, string $key): mixed`
`138`	`138`	`{`
`139`	`139`	`if ($mapping instanceof FieldMapping) {`
`140`		`- return $mapping->$key;`
	`140`	`+ return $mapping->$key ?? null;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`return $mapping[$key] ?? null;`
Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array`
`198`	`198`
`199`	`199`	`public static function handleError(int $type, string $msg): bool`
`200`	`200`	`{`
`201`		`- return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');`
	`201`	`+ return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')`
	`202`	`+ \|\| str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');`
`202`	`203`	`}`
`203`	`204`	`}`