File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
dev/tests/setup-integration/framework/Magento/TestFramework/TestCase
lib/internal/Magento/Framework/DB/Adapter Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ public function __construct(
48
48
$ dataName = '' ,
49
49
ResourceConnection $ resourceConnection = null
50
50
) {
51
- parent ::__construct ($ name, $ data , $ dataName );
51
+ parent ::__construct ($ name );
52
52
53
53
$ objectManager = Bootstrap::getObjectManager ();
54
54
$ this ->sqlVersionProvider = $ objectManager ->get (SqlVersionProvider::class);
@@ -69,7 +69,7 @@ public function flushData()
69
69
*/
70
70
public function getData ()
71
71
{
72
- if (empty ($ this ->data )){
72
+ if (empty ($ this ->data )) {
73
73
$ testDataObj = DataProviderFromFile::getTestObject ();
74
74
$ this ->data = $ testDataObj ->providedData ();
75
75
}
@@ -110,7 +110,7 @@ private function getDbKey(): string
110
110
break ;
111
111
} elseif ($ this ->sqlVersionProvider ->isMariaDbEngine ()) {
112
112
$ suffixKey = $ this ->sqlVersionProvider ->getMariaDbSuffixKey ();
113
- $ this ->dbKey = DataProviderFromFile::POSSIBLE_SUFFIXES [$ suffixKey ];;
113
+ $ this ->dbKey = DataProviderFromFile::POSSIBLE_SUFFIXES [$ suffixKey ];
114
114
break ;
115
115
} elseif (strpos ($ this ->getDatabaseVersion (), (string )$ possibleVersion ) !== false ) {
116
116
$ this ->dbKey = $ suffix ;
Original file line number Diff line number Diff line change @@ -160,11 +160,11 @@ public function getMariaDbSuffixKey(): string
160
160
$ isMariaDB114 = str_contains ($ sqlVersion , SqlVersionProvider::MARIA_DB_11_4_VERSION );
161
161
$ sqlExactVersion = $ this ->fetchSqlVersion (ResourceConnection::DEFAULT_CONNECTION );
162
162
if (version_compare ($ sqlExactVersion , '10.4.27 ' , '>= ' )) {
163
- if ($ isMariaDB104 ){
163
+ if ($ isMariaDB104 ) {
164
164
return SqlVersionProvider::MARIA_DB_10_4_27_VERSION ;
165
- } elseif ($ isMariaDB106 ){
165
+ } elseif ($ isMariaDB106 ) {
166
166
return SqlVersionProvider::MARIA_DB_10_6_11_VERSION ;
167
- } elseif ($ isMariaDB114 ){
167
+ } elseif ($ isMariaDB114 ) {
168
168
return SqlVersionProvider::MARIA_DB_10_6_11_VERSION ;
169
169
}
170
170
}
You can’t perform that action at this time.
0 commit comments