Merge branch '6.4' into 7.0

* 6.4:
  initialize the current time with midnight before modifying the date
  fix tests
  [HtmlSanitizer] Ignore Processing Instructions

Author: xabbuh

src/Symfony/Component/Clock/DatePoint.php

@@ -32,15 +32,21 @@ public function __construct(string $datetime = 'now', ?\DateTimeZone $timezone =
 
             if (\PHP_VERSION_ID < 80300) {
                 try {
-                    $timezone = (new parent($datetime, $timezone ?? $now->getTimezone()))->getTimezone();
+                    $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                    $timezone = $builtInDate->getTimezone();
                 } catch (\Exception $e) {
                     throw new \DateMalformedStringException($e->getMessage(), $e->getCode(), $e);
                 }
             } else {
-                $timezone = (new parent($datetime, $timezone ?? $now->getTimezone()))->getTimezone();
+                $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                $timezone = $builtInDate->getTimezone();
             }
 
             $now = $now->setTimezone($timezone)->modify($datetime);
+
+            if ('00:00:00.000000' === $builtInDate->format('H:i:s.u')) {
+                $now = $now->setTime(0, 0);
+            }
         } elseif (null !== $timezone) {
             $now = $now->setTimezone($timezone);
         }

src/Symfony/Component/Clock/Tests/DatePointTest.php

@@ -57,4 +57,19 @@ public function testModify()
         $this->expectExceptionMessage('Failed to parse time string (Bad Date)');
         $date->modify('Bad Date');
     }
+
+    /**
+     * @testWith ["2024-04-01 00:00:00.000000", "2024-04"]
+     *           ["2024-04-09 00:00:00.000000", "2024-04-09"]
+     *           ["2024-04-09 03:00:00.000000", "2024-04-09 03:00"]
+     *           ["2024-04-09 00:00:00.123456", "2024-04-09 00:00:00.123456"]
+     */
+    public function testTimeDefaultsToMidnight(string $expected, string $datetime)
+    {
+        $date = new \DateTimeImmutable($datetime);
+        $this->assertSame($expected, $date->format('Y-m-d H:i:s.u'));
+
+        $date = new DatePoint($datetime);
+        $this->assertSame($expected, $date->format('Y-m-d H:i:s.u'));
+    }
 }

src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerAllTest.php

@@ -309,6 +309,12 @@ public static function provideSanitizeBody()
                 'Lorem ipsum  ',
             ],
 
+            // Processing instructions
+            [
+                'Lorem ipsum<?div x?>foo',
+                'Lorem ipsumfoo',
+            ],
+
             // Normal tags
             [
                 '<abbr>Lorem ipsum</abbr>',

src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php

@@ -134,9 +134,10 @@ private function visitChildren(\DOMNode $domNode, Cursor $cursor): void
             if ('#text' === $child->nodeName) {
                 // Add text directly for performance
                 $cursor->node->addChild(new TextNode($cursor->node, $child->nodeValue));
-            } elseif (!$child instanceof \DOMText) {
+            } elseif (!$child instanceof \DOMText && !$child instanceof \DOMProcessingInstruction) {
                 // Otherwise continue the visit recursively
                 // Ignore comments for security reasons (interpreted differently by browsers)
+                // Ignore processing instructions (treated as comments)
                 $this->visitNode($child, $cursor);
             }
         }

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php

@@ -300,7 +300,7 @@ private function getDBALConnectionMock()
         $platform = $this->createMock(AbstractPlatform::class);
 
         if (!method_exists(QueryBuilder::class, 'forUpdate')) {
-            $platform->method('getWriteLockSQL')->willReturn('FOR UPDATE');
+            $platform->method('getWriteLockSQL')->willReturn('FOR UPDATE SKIP LOCKED');
         }
 
         $configuration = $this->createMock(\Doctrine\DBAL\Configuration::class);
@@ -573,7 +573,7 @@ class_exists(MySQLPlatform::class) ? new MySQLPlatform() : new MySQL57Platform()
 
         yield 'SQL Server' => [
             class_exists(SQLServerPlatform::class) && !class_exists(SQLServer2012Platform::class) ? new SQLServerPlatform() : new SQLServer2012Platform(),
-            'SELECT m.* FROM messenger_messages m WITH (UPDLOCK, ROWLOCK, READPAST) WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY  ',
+            sprintf('SELECT m.* FROM messenger_messages m WITH (UPDLOCK, ROWLOCK%s) WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY  ', method_exists(QueryBuilder::class, 'forUpdate') ? ', READPAST' : ''),
         ];
 
         if (!class_exists(MySQL57Platform::class)) {
@@ -586,7 +586,7 @@ class_exists(SQLServerPlatform::class) && !class_exists(SQLServer2012Platform::c
             // DBAL < 4
             yield 'Oracle' => [
                 new OraclePlatform(),
-                'SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE SKIP LOCKED',
+                sprintf('SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE%s', method_exists(QueryBuilder::class, 'forUpdate') ? ' SKIP LOCKED' : ''),
             ];
         }
     }