Merge branch 'ACP2E-3871' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-05-01-2025

Author: chittima

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2017 Adobe All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
@@ -86,6 +86,7 @@ public function build(Schema $schema)
         $tablesWithJsonTypeField = [];
         if (isset($data['table'])) {
             foreach ($data['table'] as $keyTable => $tableColumns) {
+                $tableColumns['column'] ??= [];
                 foreach ($tableColumns['column'] as $keyColumn => $columnData) {
                     if ($columnData['type'] == 'json') {
                         $tablesWithJsonTypeField[$keyTable] = $keyColumn;

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2018 Adobe All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\SqlVersionProvider;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
 use Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder;
@@ -330,6 +331,87 @@ public function testBuildUnknownIndexColumn(array $columns, array $references, a
         $this->model->build($schema);
     }
 
+    /**
+     *  This test verifies that the system does not crash or throw unexpected errors when attempting to build
+     *  a schema with missing column definitions.
+     *
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testBuildHandlesMissingColumnsGracefully()
+    {
+        $data = [
+            'table' => [
+                'test_table' => [
+                    'name' => 'test_table_fail',
+                    'resource' => 'default',
+                    'engine' => 'innodb',
+                    'comment' => 'test table',
+                    'disabled' => 'true',
+                ]
+            ]
+        ];
+
+        $this->shardingMock->expects(self::once())
+            ->method('getResources')
+            ->willReturn(['default']);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readTables')
+            ->with('default')
+            ->willReturn(['test_table']);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readColumns')
+            ->with('test_table')
+            ->willReturn([]);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readIndexes')
+            ->with('test_table')
+            ->willReturn([]);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readReferences')
+            ->willReturn([]);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('readConstraints')
+            ->with('test_table')
+            ->willReturn([]);
+
+        $this->dbSchemaReaderMock->expects(self::once())
+            ->method('getTableOptions')
+            ->with('test_table')
+            ->willReturn([
+                'engine' => 'innodb',
+                'comment' => '',
+                'charset' => 'utf-8',
+                'collation' => 'utf-8'
+            ]);
+
+        $this->elementFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->createMock(Table::class));
+
+        $readerCompositeMock = $this->getMockBuilder(ReaderComposite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $readerCompositeMock->expects($this->once())
+            ->method('read')
+            ->willReturn($data);
+
+        $schemaBuilder = new SchemaBuilder(
+            $this->elementFactoryMock,
+            $this->dbSchemaReaderMock,
+            $this->shardingMock,
+            $readerCompositeMock
+        );
+
+        $schemaBuilder->build($this->createMock(Schema::class));
+        $this->assertTrue(true, 'System did not crash when columns were missing.');
+    }
+
     /**
      * Prepare mocks for test.
      *
@@ -338,6 +420,8 @@ public function testBuildUnknownIndexColumn(array $columns, array $references, a
      * @param array $constraints
      * @param array $indexes
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function prepareSchemaMocks(array $columns, array $references, array $constraints, array $indexes)
     {