MC-40558: Stabilize Static tests and MHI

svera · svera · commit 26a877c841f7 · 2021-02-18T13:05:32.000+01:00
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -44,7 +44,7 @@ private function getWhitelist(): array
             foreach (glob($whiteListFiles) as $fileName) {
                 $whiteListItems[] = file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
             }
-            $this->blockWhitelist = $whiteListItems;
+            $this->blockWhitelist = array_merge([], ...$whiteListItems);
         }
         return $this->blockWhitelist;
     }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private function getWhitelist(): array`
`44`	`44`	`foreach (glob($whiteListFiles) as $fileName) {`
`45`	`45`	`$whiteListItems[] = file($fileName, FILE_IGNORE_NEW_LINES \| FILE_SKIP_EMPTY_LINES);`
`46`	`46`	`}`
`47`		`- $this->blockWhitelist = $whiteListItems;`
	`47`	`+ $this->blockWhitelist = array_merge([], ...$whiteListItems);`
`48`	`48`	`}`
`49`	`49`	`return $this->blockWhitelist;`
`50`	`50`	`}`