reverted back AC-11654 changes and added missing strict types

Author: glo60612

app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php

@@ -9,6 +9,7 @@
 
 use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Sales\Model\Spi\TransactionResourceInterface;
+use Magento\Tests\NamingConvention\true\string;
 
 /**
  * Sales transaction resource model
@@ -223,8 +224,9 @@ private function _getLoadByUniqueKeySelect($orderId, $paymentId, $txnId, $column
      * Retrieve transaction by the unique key of order_id
      *
      * @param int $orderId
+     * @return string
      */
-    private function getParentTxnId($orderId)
+    private function getParentTxnId(int $orderId): string
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from(

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

@@ -67,9 +67,8 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(Schema $schema, $tablesWithJsonTypeField = [])
+    public function build(Schema $schema)
     {
         foreach ($this->sharding->getResources() as $resource) {
             foreach ($this->dbSchemaReader->readTables($resource) as $tableName) {
@@ -96,16 +95,9 @@ public function build(Schema $schema, $tablesWithJsonTypeField = [])
                         'collation' => $tableOptions['collation']
                     ]
                 );
-                $isJsonType = false;
-                if (count($tablesWithJsonTypeField) > 0 && isset($tablesWithJsonTypeField[$tableName])) {
-                    $isJsonType = true;
-                }
 
                 // Process columns
                 foreach ($columnsData as $columnData) {
-                    if ($isJsonType && $tablesWithJsonTypeField[$tableName] == $columnData['name']) {
-                        $columnData['type'] = 'json';
-                    }
                     $columnData['table'] = $table;
                     $column = $this->elementFactory->create($columnData['type'], $columnData);
                     $columns[$column->getName()] = $column;

lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php

@@ -62,17 +62,8 @@ public function __construct(
      */
     public function getDbConfig()
     {
-        $declarativeSchema = $this->getDeclarationConfig();
-        $tablesWithJsonTypeField = [];
-        foreach ($declarativeSchema->getTables() as $table) {
-            foreach ($table->getColumns() as $column) {
-                if ($column->getType() == 'json') {
-                    $tablesWithJsonTypeField[$table->getName()] = $column->getName();
-                }
-            }
-        }
         $schema = $this->schemaFactory->create();
-        $schema = $this->dbSchemaBuilder->build($schema, $tablesWithJsonTypeField);
+        $schema = $this->dbSchemaBuilder->build($schema);
         return $schema;
     }