Merge remote-tracking branch 'mainline/2.4.1-develop' into MC-36276-internal-error

danielrenaud · danielrenaud · commit d6c00a1ef11b · 2020-08-17T15:39:56.000-05:00
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -178,7 +178,7 @@ public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNE
             list($modelEntity, $tableSuffix) = $modelEntity;
         }
 
-        $tableName = $modelEntity;
+        $tableName = (string)$modelEntity;
 
         $mappedTableName = $this->getMappedTableName($tableName);
         if ($mappedTableName) {

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNE`
`178`	`178`	`list($modelEntity, $tableSuffix) = $modelEntity;`
`179`	`179`	`}`
`180`	`180`
`181`		`- $tableName = $modelEntity;`
	`181`	`+ $tableName = (string)$modelEntity;`
`182`	`182`
`183`	`183`	`$mappedTableName = $this->getMappedTableName($tableName);`
`184`	`184`	`if ($mappedTableName) {`