ACP2E-1709: error during declarative schema whitelsit generation

Author: pradeep1819

app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php

@@ -184,6 +184,7 @@ private function getElementsWithFixedName(array $tableData): array
      * @param string $tableName
      * @param array $tableData
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getElementsWithAutogeneratedName(Schema $schema, string $tableName, array $tableData) : array
     {
@@ -193,26 +194,40 @@ private function getElementsWithAutogeneratedName(Schema $schema, string $tableN
         $elementType = 'index';
         if (!empty($tableData[$elementType])) {
             foreach ($tableData[$elementType] as $tableElementData) {
-                $indexName = $this->elementNameResolver->getFullIndexName(
-                    $table,
-                    $tableElementData['column'] ?? [],
-                    $tableElementData['indexType'] ?? null
-                );
-                $declaredStructure[$elementType][$indexName] = true;
+                if ($table->getIndexByName($tableElementData['referenceId'])) {
+                    $indexName = $this->elementNameResolver->getFullIndexName(
+                        $table,
+                        $tableElementData['column'],
+                        $tableElementData['indexType'] ?? null
+                    );
+                    $declaredStructure[$elementType][$indexName] = true;
+                }
             }
         }
 
         $elementType = 'constraint';
         if (!empty($tableData[$elementType])) {
             foreach ($tableData[$elementType] as $tableElementData) {
-                if ($tableElementData['type'] === 'foreign' && isset($tableElementData['referenceTable'])) {
-                    $constraintName = $this->getConstraintName($schema, $tableName, $tableElementData);
+                $constraintName = null;
+                if ($tableElementData['type'] === 'foreign' && $table->getConstraintByName($tableElementData['referenceId'])) {
+                    $referenceTable = $schema->getTableByName($tableElementData['referenceTable']);
+                    $column = $table->getColumnByName($tableElementData['column']);
+                    $referenceColumn = $referenceTable->getColumnByName($tableElementData['referenceColumn']);
+                    $constraintName = ($column !== false && $referenceColumn !== false) ?
+                        $this->elementNameResolver->getFullFKName(
+                            $table,
+                            $column,
+                            $referenceTable,
+                            $referenceColumn
+                        ) : null;
                 } else {
-                    $constraintName = $this->elementNameResolver->getFullIndexName(
-                        $table,
-                        $tableElementData['column'] ?? [],
-                        $tableElementData['type'] ?? null
-                    );
+                    if ($table->getIndexByName($tableElementData['referenceId'])) {
+                        $constraintName = $this->elementNameResolver->getFullIndexName(
+                            $table,
+                            $tableElementData['column'],
+                            $tableElementData['type']
+                        );
+                    }
                 }
                 if ($constraintName) {
                     $declaredStructure[$elementType][$constraintName] = true;
@@ -223,34 +238,6 @@ private function getElementsWithAutogeneratedName(Schema $schema, string $tableN
         return $declaredStructure;
     }
 
-    /**
-     * Provide autogenerated names of the table constraint.
-     *
-     * @param Schema $schema
-     * @param string $tableName
-     * @param array $tableElementData
-     * @return string|null
-     */
-    private function getConstraintName(Schema $schema, string $tableName, array $tableElementData): ?string
-    {
-        $table = $schema->getTableByName($tableName);
-
-        $referenceTable = isset($tableElementData['referenceTable'])
-            ? $schema->getTableByName($tableElementData['referenceTable']) : false;
-        $column = isset($tableElementData['column'])
-            ? $table->getColumnByName($tableElementData['column']) : false;
-        $referenceColumn = isset($tableElementData['referenceColumn'])
-            ? $referenceTable->getColumnByName($tableElementData['referenceColumn']) : false;
-
-        return ($column !== false && $referenceColumn !== false && $referenceTable !== false) ?
-            $this->elementNameResolver->getFullFKName(
-                $table,
-                $column,
-                $referenceTable,
-                $referenceColumn
-            ) : null;
-    }
-
     /**
      * Load db_schema content from the primary scope app/etc/db_schema.xml.
      *