DEVOPS-2346: Fix static tests

Author: slavvka

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

@@ -433,7 +433,11 @@ private function checkProject()
                 }
             }
             sort($dependenciesListed);
-            $nonDeclaredDependencies = array_diff(self::$dependencies, $dependenciesListed);
+            $nonDeclaredDependencies = array_diff(
+                self::$dependencies,
+                $dependenciesListed,
+                self::$rootComposerModuleBlacklist
+            );
             $nonexistentDependencies = array_diff($dependenciesListed, self::$dependencies);
             $this->assertEmpty(
                 $nonDeclaredDependencies,

dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php

@@ -22,33 +22,53 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
         '$this', 'void', 'string', 'int', 'bool', 'boolean', 'integer', 'null'
     ];
 
+    /**
+     * @var string[]|null
+     */
+    private $blockWhitelist;
+
+    /**
+     * Return whitelist class names
+     *
+     * @return string[]
+     */
+    private function getWhitelist(): array
+    {
+        if ($this->blockWhitelist === null) {
+            $whiteListFiles = str_replace(
+                '\\',
+                '/',
+                realpath(__DIR__) . '/_files/whitelist/public_code*.txt'
+            );
+            $whiteListItems = [];
+            foreach (glob($whiteListFiles) as $fileName) {
+                $whiteListItems = array_merge(
+                    $whiteListItems,
+                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+            $this->blockWhitelist = $whiteListItems;
+        }
+        return $this->blockWhitelist;
+    }
+
     /**
      * Since blocks can be referenced from templates, they should be stable not to break theme customizations.
      * So all blocks should be @api annotated. This test checks that all blocks declared in layout files are public
      *
      * @param $layoutFile
+     * @throws \ReflectionException
      * @dataProvider layoutFilesDataProvider
      */
     public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
     {
-        // A block can be whitelisted and thus not be required to be public
-        $whiteListFiles = str_replace('\\', '/', realpath(__DIR__))
-            . '/_files/whitelist/public_code*.txt';
-        $whiteListBlocks = [];
-        foreach (glob($whiteListFiles) as $fileName) {
-            $whiteListBlocks = array_merge(
-                $whiteListBlocks,
-                file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-            );
-        }
-
         $nonPublishedBlocks = [];
         $xml = simplexml_load_file($layoutFile);
         $elements = $xml->xpath('//block | //referenceBlock') ?: [];
         /** @var $node \SimpleXMLElement */
         foreach ($elements as $node) {
             $class = (string) $node['class'];
-            if ($class && \class_exists($class) && !in_array($class, $whiteListBlocks)) {
+            if ($class && \class_exists($class) && !in_array($class, $this->getWhitelist())) {
                 $reflection = (new \ReflectionClass($class));
                 if (strpos($reflection->getDocComment(), '@api') === false) {
                     $nonPublishedBlocks[] = $class;
@@ -67,6 +87,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
      * Find all layout update files in magento modules and themes.
      *
      * @return array
+     * @throws \Exception
      */
     public function layoutFilesDataProvider()
     {
@@ -79,8 +100,8 @@ public function layoutFilesDataProvider()
      * This test walks through all public PHP types and makes sure that all their method arguments
      * and return values are public types.
      *
-     *
      * @param string $class
+     * @throws \ReflectionException
      * @dataProvider publicPHPTypesDataProvider
      */
     public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
@@ -121,6 +142,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
     /**
      * Retrieve list of all interfaces and classes in Magento codebase that are marked with @api annotation.
      * @return array
+     * @throws \Exception
      */
     public function publicPHPTypesDataProvider()
     {
@@ -130,7 +152,9 @@ public function publicPHPTypesDataProvider()
             $fileContents = \file_get_contents($file);
             if (strpos($fileContents, '@api') !== false) {
                 foreach ($this->getDeclaredClassesAndInterfaces($file) as $class) {
-                    if (class_exists($class->getName()) || interface_exists($class->getName())) {
+                    if (!in_array($class->getName(), $this->getWhitelist())
+                        && (class_exists($class->getName()) || interface_exists($class->getName()))
+                    ) {
                         $result[$class->getName()] = [$class->getName()];
                     }
                 }