From 96b6eb737982ba53592364d4f1a98a75d88040e7 Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Mon, 24 Jan 2022 17:39:35 +0200
Subject: [PATCH] MCS fixes

---
 Setup/InstallSchema.php      | 99 ------------------------------------
 etc/db_schema.xml            | 39 ++++++++++++++
 etc/db_schema_whitelist.json | 39 ++++++++++++++
 3 files changed, 78 insertions(+), 99 deletions(-)
 delete mode 100644 Setup/InstallSchema.php
 create mode 100644 etc/db_schema.xml
 create mode 100644 etc/db_schema_whitelist.json

diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
deleted file mode 100644
index 15a711c..0000000
--- a/Setup/InstallSchema.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-namespace Swissup\Testimonials\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * Installs DB schema for a module
-     *
-     * @param SchemaSetupInterface $setup
-     * @param ModuleContextInterface $context
-     * @return void
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        /**
-         * Create table 'swissup_testimonials_data'
-         */
-        $table = $installer->getConnection()
-            ->newTable($installer->getTable('swissup_testimonials_data'))
-            ->addColumn(
-                'testimonial_id',
-                Table::TYPE_SMALLINT,
-                null,
-                ['identity' => true, 'nullable' => false, 'primary' => true],
-                'Testimonial ID'
-            )
-            ->addColumn('status', Table::TYPE_SMALLINT, null, ['nullable' => false, 'default' => '1'], 'Testimonial status')
-            ->addColumn('date', Table::TYPE_DATETIME, null, ['nullable' => false], 'Testimonial creation time')
-            ->addColumn('name', Table::TYPE_TEXT, 100, ['nullable' => false], 'User name')
-            ->addColumn('email', Table::TYPE_TEXT, 100, ['nullable' => false], 'User email')
-            ->addColumn('message', Table::TYPE_TEXT, null, ['nullable' => false], 'User message')
-            ->addColumn('company', Table::TYPE_TEXT, 255, ['nullable' => true], 'User company')
-            ->addColumn('website', Table::TYPE_TEXT, 255, ['nullable' => true], 'User website')
-            ->addColumn('twitter', Table::TYPE_TEXT, 255, ['nullable' => true], 'User twitter')
-            ->addColumn('facebook', Table::TYPE_TEXT, 255, ['nullable' => true], 'User facebook')
-            ->addColumn('image', Table::TYPE_TEXT, 100, ['nullable' => true], 'User image path')
-            ->addColumn('rating', Table::TYPE_SMALLINT, null, ['nullable' => true], 'User rating')
-            ->addColumn('widget', Table::TYPE_SMALLINT, null, ['nullable' => true, 'default' => 1], 'Show testimonial in widget')
-            ->addIndex(
-                $setup->getIdxName(
-                    $installer->getTable('swissup_testimonials_data'),
-                    ['name', 'email', 'message'],
-                    AdapterInterface::INDEX_TYPE_FULLTEXT
-                ),
-                ['name', 'email', 'message'],
-                ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-            )
-            ->setComment('Swissup Testimonials Data Table');
-        $installer->getConnection()->createTable($table);
-
-        /**
-         * Create table 'swissup_testimonials_store'
-         */
-        $table = $installer->getConnection()->newTable(
-            $installer->getTable('swissup_testimonials_store')
-        )->addColumn(
-            'testimonial_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['nullable' => false, 'primary' => true],
-            'Testimonial ID'
-        )->addColumn(
-            'store_id',
-            Table::TYPE_SMALLINT,
-            null,
-            ['unsigned' => true, 'nullable' => false, 'primary' => true],
-            'Store ID'
-        )->addIndex(
-            $installer->getIdxName('swissup_testimonials_store', ['store_id']),
-            ['store_id']
-        )->addForeignKey(
-            $installer->getFkName('swissup_testimonials_store', 'testimonial_id', 'swissup_testimonials_data', 'testimonial_id'),
-            'testimonial_id',
-            $installer->getTable('swissup_testimonials_data'),
-            'testimonial_id',
-            Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('swissup_testimonials_store', 'store_id', 'store', 'store_id'),
-            'store_id',
-            $installer->getTable('store'),
-            'store_id',
-            Table::ACTION_CASCADE
-        )->setComment(
-            'Swissup Testimonial To Store Linkage Table'
-        );
-        $installer->getConnection()->createTable($table);
-
-        $installer->endSetup();
-    }
-}
\ No newline at end of file
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
new file mode 100644
index 0000000..748c367
--- /dev/null
+++ b/etc/db_schema.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+  <table name="swissup_testimonials_data" resource="default" engine="innodb" comment="Swissup Testimonials Data Table">
+    <column xsi:type="smallint" name="testimonial_id" padding="6" unsigned="false" nullable="false" identity="true" comment="Testimonial ID"/>
+    <column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="false" identity="false" default="1" comment="Testimonial status"/>
+    <column xsi:type="datetime" name="date" on_update="false" nullable="false" comment="Testimonial creation time"/>
+    <column xsi:type="varchar" name="name" nullable="false" length="100" comment="User name"/>
+    <column xsi:type="varchar" name="email" nullable="false" length="100" comment="User email"/>
+    <column xsi:type="text" name="message" nullable="false" comment="User message"/>
+    <column xsi:type="varchar" name="company" nullable="true" length="255" comment="User company"/>
+    <column xsi:type="varchar" name="website" nullable="true" length="255" comment="User website"/>
+    <column xsi:type="varchar" name="twitter" nullable="true" length="255" comment="User twitter"/>
+    <column xsi:type="varchar" name="facebook" nullable="true" length="255" comment="User facebook"/>
+    <column xsi:type="varchar" name="image" nullable="true" length="100" comment="User image path"/>
+    <column xsi:type="smallint" name="rating" padding="6" unsigned="false" nullable="true" identity="false" comment="User rating"/>
+    <column xsi:type="smallint" name="widget" padding="6" unsigned="false" nullable="true" identity="false" default="1" comment="Show testimonial in widget"/>
+    <constraint xsi:type="primary" referenceId="PRIMARY">
+      <column name="testimonial_id"/>
+    </constraint>
+    <index referenceId="SWISSUP_TESTIMONIALS_DATA_NAME_EMAIL_MESSAGE" indexType="fulltext">
+      <column name="name"/>
+      <column name="email"/>
+      <column name="message"/>
+    </index>
+  </table>
+  <table name="swissup_testimonials_store" resource="default" engine="innodb" comment="Swissup Testimonial To Store Linkage Table">
+    <column xsi:type="smallint" name="testimonial_id" padding="6" unsigned="false" nullable="false" identity="false" comment="Testimonial ID"/>
+    <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false" comment="Store ID"/>
+    <constraint xsi:type="primary" referenceId="PRIMARY">
+      <column name="testimonial_id"/>
+      <column name="store_id"/>
+    </constraint>
+    <constraint xsi:type="foreign" referenceId="FK_6075F59DE8F3F62A95A3F8371EA6D77D" table="swissup_testimonials_store" column="testimonial_id" referenceTable="swissup_testimonials_data" referenceColumn="testimonial_id" onDelete="CASCADE"/>
+    <constraint xsi:type="foreign" referenceId="SWISSUP_TESTIMONIALS_STORE_STORE_ID_STORE_STORE_ID" table="swissup_testimonials_store" column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
+    <index referenceId="SWISSUP_TESTIMONIALS_STORE_STORE_ID" indexType="btree">
+      <column name="store_id"/>
+    </index>
+  </table>
+</schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
new file mode 100644
index 0000000..c61a9ee
--- /dev/null
+++ b/etc/db_schema_whitelist.json
@@ -0,0 +1,39 @@
+{
+    "swissup_testimonials_data": {
+        "column": {
+            "testimonial_id": true,
+            "status": true,
+            "date": true,
+            "name": true,
+            "email": true,
+            "message": true,
+            "company": true,
+            "website": true,
+            "twitter": true,
+            "facebook": true,
+            "image": true,
+            "rating": true,
+            "widget": true
+        },
+        "index": {
+            "SWISSUP_TESTIMONIALS_DATA_NAME_EMAIL_MESSAGE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "swissup_testimonials_store": {
+        "column": {
+            "testimonial_id": true,
+            "store_id": true
+        },
+        "index": {
+            "SWISSUP_TESTIMONIALS_STORE_STORE_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_6075F59DE8F3F62A95A3F8371EA6D77D": true,
+            "SWISSUP_TESTIMONIALS_STORE_STORE_ID_STORE_STORE_ID": true
+        }
+    }
+}
\ No newline at end of file