MAGETWO-95595: Index names are ignored by declarative schema

Author: fascinosum

app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php

@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
         try {
             $this->whitelistGenerator->generate($moduleName);
         } catch (ConfigurationMismatchException $e) {
-            $output->writeln("<info>". $e . "</info>");
+            $output->writeln($e->getMessage());
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         } catch (\Exception $e) {
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;

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

@@ -161,7 +161,7 @@ private function persistModule(Schema $schema, string $moduleName)
     }
 
     /**
-     * Provides immutable names of the table elements.
+     * Provide immutable names of the table elements.
      *
      * @param array $tableData
      * @return array
@@ -177,7 +177,7 @@ private function getElementsWithFixedName(array $tableData): array
     }
 
     /**
-     * Provides autogenerated names of the table elements.
+     * Provide autogenerated names of the table elements.
      *
      * @param Schema $schema
      * @param string $tableName

lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php

@@ -75,7 +75,7 @@ private function recursiveConvert(\Traversable $source): array
     }
 
     /**
-     * Provides the value of the ID attribute for each element.
+     * Provide the value of the ID attribute for each element.
      *
      * @param \DOMElement $element
      * @return string

lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/TableElement/ElementNameResolver.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Setup\Declaration\Schema\TableNameResolver;
 
 /**
- * Provides names of table elements with autogenerated names.
+ * Provide names of table elements with autogenerated names.
  */
 class ElementNameResolver
 {
@@ -39,7 +39,7 @@ public function __construct(TableNameResolver $tableNameResolver, ResourceConnec
     }
 
     /**
-     * Provides the full index name based on the prefix value.
+     * Provide the full index name based on the prefix value.
      *
      * @param Table $table
      * @param string[] $columns
@@ -59,12 +59,11 @@ public function getFullIndexName(
          * Temporary solution.
          * @see MAGETWO-91365
          */
-        if ($type
-            && !array_search(
-                $type,
-                [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
-            )
-        ) {
+        $isIndexTypeOutOfList = false === array_search(
+            $type,
+            [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
+        );
+        if ($type && $isIndexTypeOutOfList) {
             $type = AdapterInterface::INDEX_TYPE_INDEX;
         }
 
@@ -79,7 +78,7 @@ public function getFullIndexName(
     }
 
     /**
-     * Provides the index name without prefix value.
+     * Provide the index name without prefix value.
      *
      * @param string $name
      * @param Table $table
@@ -104,12 +103,11 @@ public function getIndexNameWithoutPrefix(
              * Temporary solution.
              * @see MAGETWO-91365
              */
-            if ($type
-                && !array_search(
-                    $type,
-                    [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
-                )
-            ) {
+            $isIndexTypeOutOfList = false === array_search(
+                $type,
+                [AdapterInterface::INDEX_TYPE_FULLTEXT, AdapterInterface::INDEX_TYPE_UNIQUE]
+            );
+            if ($type && $isIndexTypeOutOfList) {
                 $type = AdapterInterface::INDEX_TYPE_INDEX;
             }
 
@@ -128,7 +126,7 @@ public function getIndexNameWithoutPrefix(
     }
 
     /**
-     * Provides the full foreign key name based on the prefix value.
+     * Provide the full foreign key name based on the prefix value.
      *
      * @param Table $table
      * @param Column $column
@@ -154,7 +152,7 @@ public function getFullFKName(
     }
 
     /**
-     * Provides the foreign key name without prefix value.
+     * Provide the foreign key name without prefix value.
      *
      * @param string $name
      * @param Table $table