ENGCOM-7795: #28579:DependencyTest does not analyze GraphQL schema… #…

…28747

 - Merge Pull Request #28747 from sasha19957099/magento2:28579_DependencyTest_does_not_analyze_GraphQL_schema_files
 - Merged commits:
   1. 64b806f
   2. e19d807
   3. 5b65095
   4. a7037ce
   5. ce1464e
   6. 6f62bea
   7. 50639da
   8. b6ae25b
   9. e76f1c5
   10. 26df598
   11. 0e32b44
   12. 8c4cff4
   13. d64ef3d
   14. 1305a3e

app/code/Magento/SwatchesGraphQl/composer.json

@@ -6,9 +6,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-swatches": "*",
-        "magento/module-catalog": "*"
-    },
-    "suggest": {
+        "magento/module-catalog": "*",
         "magento/module-catalog-graph-ql": "*"
     },
     "license": [

dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php

@@ -47,9 +47,11 @@ protected function setUp(): void
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
+        $filePath1 = __DIR__ . '/../_files/schemaA.graphqls';
+        $filePath2 = __DIR__ . '/../_files/schemaB.graphqls';
         $fileList = [
-            file_get_contents(__DIR__ . '/../_files/schemaA.graphqls'),
-            file_get_contents(__DIR__ . '/../_files/schemaB.graphqls')
+            $filePath1 => file_get_contents($filePath1),
+            $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
         $graphQlReader = $this->objectManager->create(
@@ -219,31 +221,25 @@ function ($a, $b) {
         }
         //Checks to make sure that the given description exists in the expectedOutput array
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for empty PhysicalProductInterface',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for empty PhysicalProductInterface',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for empty Enum',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for empty Enum',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for SearchResultPageInfo',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for SearchResultPageInfo',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
     }
 }

dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php

@@ -36,20 +36,24 @@ protected function setUp(): void
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
+        $filePath1 = __DIR__ . '/_files/schemaC.graphqls';
+        $filePath2 = __DIR__ . '/_files/schemaD.graphqls';
         $fileList = [
-            file_get_contents(__DIR__ . '/_files/schemaC.graphqls'),
-            file_get_contents(__DIR__ . '/_files/schemaD.graphqls')
+            $filePath1 => file_get_contents($filePath1),
+            $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
         $graphQlReader = $objectManager->create(
             \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
             ['fileResolver' => $fileResolverMock]
         );
         $reader = $objectManager->create(
+            // phpstan:ignore
             \Magento\Framework\GraphQlSchemaStitching\Reader::class,
             ['readers' => ['graphql_reader' => $graphQlReader]]
         );
         $data = $objectManager->create(
+            // phpstan:ignore
             \Magento\Framework\GraphQl\Config\Data ::class,
             ['reader' => $reader]
         );

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

@@ -8,14 +8,20 @@
 
 namespace Magento\Test\Integrity;
 
-use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Utility\AggregateInvoker;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class DeclarativeDependencyTest
+ * Test for undeclared dependencies in declarative schema
  */
-class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
+class DeclarativeDependencyTest extends TestCase
 {
     /**
      * @var DeclarativeSchemaDependencyProvider
@@ -25,7 +31,7 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
     /**
      * Sets up data
      *
-     * @throws \Exception
+     * @throws InspectionException
      */
     protected function setUp(): void
     {
@@ -37,15 +43,16 @@ protected function setUp(): void
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-        $this->dependencyProvider = new DeclarativeSchemaDependencyProvider();
+        $objectManager = ObjectManager::getInstance();
+        $this->dependencyProvider = $objectManager->create(DeclarativeSchemaDependencyProvider::class);
     }
 
     /**
-     * @throws \Exception
+     * @throws LocalizedException
      */
     public function testUndeclaredDependencies()
     {
-        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+        $invoker = new AggregateInvoker($this);
         $invoker(
             /**
              * Check undeclared modules dependencies for specified file
@@ -107,7 +114,7 @@ private function prepareFiles(array $files): array
      */
     private function getErrorMessage(string $id): string
     {
-        $decodedId = $this->dependencyProvider->decodeDependencyId($id);
+        $decodedId = DeclarativeSchemaDependencyProvider::decodeDependencyId($id);
         $entityType = $decodedId['entityType'];
         if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
             $message = sprintf(
@@ -131,14 +138,13 @@ private function getErrorMessage(string $id): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Exception
+     * @throws InspectionException
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception("Invalid Json: $file");
+            throw new InspectionException("Invalid Json: $file");
         }
 
         return $decodedJson;