AC-6921:Fixed Integraion and static tests related to maridb10.6 support

Author: faizan-shk

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mariadb106.php

@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 // @codingStandardsIgnoreFile
 return [
     'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0,
@@ -25,7 +27,7 @@
   `smallint_ref` smallint(6) NOT NULL DEFAULT 0,
   PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
   UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'test_table' => 'CREATE TABLE `test_table` (
   `smallint` smallint(6) DEFAULT NULL,
   `tinyint` tinyint(4) DEFAULT NULL,
@@ -53,5 +55,5 @@
   CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mariadb106.php

@@ -12,16 +12,16 @@
   `store_owner_id` smallint(6) DEFAULT NULL COMMENT \'Store Owner Reference\',
   KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
   CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
         'store_owner' => 'CREATE TABLE `store_owner` (
   `owner_id` smallint(6) NOT NULL AUTO_INCREMENT,
   `store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
   PRIMARY KEY (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT=\'Store owner information\''
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT=\'Store owner information\''
     ],
     'after' => [
         'store' => 'CREATE TABLE `store` (
   `store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
     ]
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mariadb106.php

@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 return [
     'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mariadb106.php

@@ -8,8 +8,8 @@
 return [
     'before' => 'CREATE TABLE `some_table` (
   `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'after' => 'CREATE TABLE `some_table_renamed` (
   `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.mariadb106.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 // @codingStandardsIgnoreFile
 return ['CREATE TABLE `reference_table` (
 `tinyint_ref` tinyint  NOT NULL  AUTO_INCREMENT , 

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mariadb106.php

@@ -3,17 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 return [
     'test_table_one' => 'CREATE TABLE `test_table_one` (
   `smallint` smallint(6) NOT NULL AUTO_INCREMENT,
   `varchar` varchar(254) DEFAULT NULL,
   PRIMARY KEY (`smallint`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'test_table_two' => 'CREATE TABLE `test_table_two` (
   `smallint` smallint(6) NOT NULL AUTO_INCREMENT,
   `varchar` varchar(254) DEFAULT NULL,
   PRIMARY KEY (`smallint`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0,
@@ -27,10 +29,10 @@
   `bigint_default_nullable` bigint(20) unsigned DEFAULT 1,
   `bigint_not_default_not_nullable` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`tinyint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mariadb106.php

@@ -10,5 +10,5 @@
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];