Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 4b3ff56b8a9b · 2025-07-15T13:30:57.000+02:00
* 6.4: [Routing] Add test to validate that default value is allowed to not match requirement fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
diff --git a/PropertyPath.php b/PropertyPath.php
@@ -72,7 +72,7 @@ public function __construct(self|string $propertyPath)
     {
         // Can be used as copy constructor
         if ($propertyPath instanceof self) {
-            /* @var PropertyPath $propertyPath */
+            /** @var PropertyPath $propertyPath */
             $this->elements = $propertyPath->elements;
             $this->length = $propertyPath->length;
             $this->isIndex = $propertyPath->isIndex;

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct(self\|string $propertyPath)`
`72`	`72`	`{`
`73`	`73`	`// Can be used as copy constructor`
`74`	`74`	`if ($propertyPath instanceof self) {`
`75`		`- /* @var PropertyPath $propertyPath */`
	`75`	`+ /** @var PropertyPath $propertyPath */`
`76`	`76`	`$this->elements = $propertyPath->elements;`
`77`	`77`	`$this->length = $propertyPath->length;`
`78`	`78`	`$this->isIndex = $propertyPath->isIndex;`