Merge branch '6.4' into 7.2

fabpot · fabpot · commit 912975cf16f0 · 2025-05-10T13:58:55.000+02:00
* 6.4:
  Improve readability of disallow_search_engine_index condition
  [Security] Avoid failing when PersistentRememberMeHandler handles a malformed cookie
  [DoctrineBridge] Undefined variable
diff --git a/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
@@ -41,7 +41,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
             throw new ConversionException(sprintf('Expected "%s", got "%s"', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', get_debug_type($value)));
         }
 
-        return $foo->bar;
+        return $value->bar;
     }
 
     public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str`
`41`	`41`	`throw new ConversionException(sprintf('Expected "%s", got "%s"', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', get_debug_type($value)));`
`42`	`42`	`}`
`43`	`43`
`44`		`- return $foo->bar;`
	`44`	`+ return $value->bar;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo`