Merge branch '2.4-develop' into 2.4-develop-system_file-xsd-fix

Author: jakwinkler

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -161,7 +161,7 @@ class StorageTest extends TestCase
         'jpg' => 'image/jpg',
         'jpeg' => 'image/jpeg',
         'png' => 'image/png',
-        'gif' => 'image/png',
+        'gif' => 'image/gif',
     ];
 
     /**

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -2091,10 +2091,8 @@ public function createOrder()
     private function beforeSubmit(Quote $quote)
     {
         $orderData = [];
-        if ($this->getSession()->getReordered() || $this->getSession()->getOrder()->getId()) {
+        if ($this->getSession()->getOrder()->getId()) {
             $oldOrder = $this->getSession()->getOrder();
-            $oldOrder = $oldOrder->getId() ?
-                $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered());
             $originalId = $oldOrder->getOriginalIncrementId();
             if (!$originalId) {
                 $originalId = $oldOrder->getIncrementId();
@@ -2121,16 +2119,12 @@ private function beforeSubmit(Quote $quote)
      */
     private function afterSubmit(Order $order)
     {
-        if ($this->getSession()->getReordered() || $this->getSession()->getOrder()->getId()) {
+        if ($this->getSession()->getOrder()->getId()) {
             $oldOrder = $this->getSession()->getOrder();
-            $oldOrder = $oldOrder->getId() ?
-                $oldOrder : $this->orderRepositoryInterface->get($this->getSession()->getReordered());
             $oldOrder->setRelationChildId($order->getId());
             $oldOrder->setRelationChildRealId($order->getIncrementId());
             $oldOrder->save();
-            if ($this->getSession()->getOrder()->getId()) {
-                $this->orderManagement->cancel($oldOrder->getEntityId());
-            }
+            $this->orderManagement->cancel($oldOrder->getEntityId());
             $order->save();
         }
     }

app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php

@@ -164,7 +164,6 @@ protected function setUp(): void
 
         $this->orderMock = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
-            ->addMethods(['setReordered', 'getReordered'])
             ->onlyMethods(
                 [
                     'getEntityId',
@@ -505,8 +504,6 @@ public function testInitFromOrder()
 
         $this->orderMock->method('getItemsCollection')
             ->willReturn($itemCollectionMock);
-        $this->orderMock->method('getReordered')
-            ->willReturn(false);
         $this->orderMock->method('getShippingAddress')
             ->willReturn($address);
         $this->orderMock->method('getBillingAddress')

app/code/Magento/Ui/Component/Filters/Type/Input.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Ui\Component\Filters\Type;
 
@@ -74,7 +74,7 @@ protected function applyFilter(): void
                 $valueExpression = $filterConfig['valueExpression'] ?? null;
             }
             if ($conditionType === self::CONDITION_LIKE) {
-                $value = str_replace(['%', '_'], ['\%', '\_'], $value);
+                $value = str_replace(['\\', '%', '_'], ['\\\\', '\%', '\_'], $value);
                 $valueExpression = $valueExpression ?? '%%%s%%';
             }
             if ($valueExpression) {

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -172,7 +172,10 @@ public function testPrepare(array $data, array $filterData, ?array $expectedCond
     }
 
     /**
+     * SuppressWarnings was added due to the big size of data provider
+     *
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public static function getPrepareDataProvider(): array
     {
@@ -221,6 +224,16 @@ public static function getPrepareDataProvider(): array
                     'setValue' => '%\%%',
                 ],
             ],
+            [
+                [
+                    'name' => 'test_date',
+                ],
+                ['test_date' => 'some\\value'],
+                [
+                    'setConditionType' => 'like',
+                    'setValue' => '%some\\\\value%',
+                ],
+            ],
             [
                 [
                     'name' => 'text_attr',

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -98,7 +98,6 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
         $order->loadByIncrementId('100000001');
 
         /** @var $orderCreate \Magento\Sales\Model\AdminOrder\Create */
-        $order->setReordered(true);
         $orderCreate = $this->model->initFromOrder($order);
 
         $quoteItems = $orderCreate->getQuote()->getItemsCollection();

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2017 Adobe All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -16,6 +16,9 @@
 use Magento\Framework\Setup\Declaration\Schema\Sharding;
 use Magento\Framework\Config\FileResolverByModule;
 use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * This type of builder is responsible for converting ENTIRE data, that comes from db
@@ -27,6 +30,7 @@
  *
  * @see        Schema
  * @inheritdoc
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SchemaBuilder
 {
@@ -55,30 +59,39 @@ class SchemaBuilder
      */
     private $readerComposite;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor.
      *
      * @param ElementFactory $elementFactory
      * @param DbSchemaReaderInterface $dbSchemaReader
      * @param Sharding $sharding
      * @param ReaderComposite $readerComposite
+     * @param LoggerInterface $logger
      */
     public function __construct(
         ElementFactory $elementFactory,
         DbSchemaReaderInterface $dbSchemaReader,
         Sharding $sharding,
-        ReaderComposite $readerComposite
+        ReaderComposite $readerComposite,
+        ?LoggerInterface $logger = null
     ) {
         $this->elementFactory = $elementFactory;
         $this->dbSchemaReader = $dbSchemaReader;
         $this->sharding = $sharding;
         $this->readerComposite = $readerComposite;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws LocalizedException
      */
     public function build(Schema $schema)
     {
@@ -88,8 +101,22 @@ public function build(Schema $schema)
             foreach ($data['table'] as $keyTable => $tableColumns) {
                 $tableColumns['column'] ??= [];
                 foreach ($tableColumns['column'] as $keyColumn => $columnData) {
-                    if ($columnData['type'] == 'json') {
-                        $tablesWithJsonTypeField[$keyTable] = $keyColumn;
+                    try {
+                        if ($columnData['type'] == 'json') {
+                            $tablesWithJsonTypeField[$keyTable] = $keyColumn;
+                        }
+                    } catch (\Throwable $e) {
+                        // Create a new exception with extended context message
+                        $errorMessage = sprintf(
+                            "%s\nError processing table %s column %s",
+                            $e->getMessage(),
+                            $keyTable,
+                            $keyColumn
+                        );
+                        $this->logger->error($errorMessage);
+                        // Throw a new exception with the extended message
+                        // This preserves the original error but adds our context
+                        throw new LocalizedException(new Phrase($errorMessage));
                     }
                 }
             }

lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2018 Adobe All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -25,6 +25,7 @@
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * Test for SchemaBuilder.
@@ -63,6 +64,11 @@ class SchemaBuilderTest extends TestCase
      */
     private $sqlVersionProvider;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
     protected function setUp(): void
     {
         $this->elementFactoryMock = $this->getMockBuilder(ElementFactory::class)
@@ -401,11 +407,16 @@ public function testBuildHandlesMissingColumnsGracefully()
             ->method('read')
             ->willReturn($data);
 
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $schemaBuilder = new SchemaBuilder(
             $this->elementFactoryMock,
             $this->dbSchemaReaderMock,
             $this->shardingMock,
-            $readerCompositeMock
+            $readerCompositeMock,
+            $this->loggerMock
         );
 
         $schemaBuilder->build($this->createMock(Schema::class));