PWA-2445: Add CI builds to magento2-pwa repo

eug123 · eug123 · commit 19d7bbaa4642 · 2022-02-03T11:19:23.000-06:00
diff --git a/CatalogGraphQlAux/Model/TypeResolver/ProductAttributeMetadata.php b/CatalogGraphQlAux/Model/TypeResolver/ProductAttributeMetadata.php
@@ -15,7 +15,7 @@
  */
 class ProductAttributeMetadata implements TypeResolverInterface
 {
-    const TYPE = 'ProductAttributeMetadata';
+    private const TYPE = 'ProductAttributeMetadata';
 
     /**
      * @inheritdoc
diff --git a/ContactGraphQlPwa/Model/Resolver/ContactUs.php b/ContactGraphQlPwa/Model/Resolver/ContactUs.php
@@ -100,9 +100,8 @@ public function getDefaultValues(): array
     /**
      * Clean input values and set default values
      *
-     * @param array<string, string> $input
-     *
-     * @return array<string, string>
+     * @param string[] $input
+     * @return string[]
      */
     public function cleanInput(array $input): array
     {
@@ -130,10 +129,9 @@ public function cleanInput(array $input): array
     /**
      * Validate input data
      *
-     * @param array<string, string> $input
-     *
+     * @param string[] $input
      * @return void
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
+     * @throws GraphQlInputException
      */
     public function validateInput(array $input): void
     {
diff --git a/EavGraphQlAux/Model/Resolver/AttributesMetadata.php b/EavGraphQlAux/Model/Resolver/AttributesMetadata.php
@@ -13,9 +13,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Query\Uid;
-use Magento\Framework\GraphQl\Query\EnumLookup;
-use Magento\EavGraphQl\Model\Resolver\Query\Type;
 use Magento\EavGraphQlAux\Model\Resolver\DataProvider\AttributeMetadata as MetadataProvider;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -24,8 +21,6 @@
  */
 class AttributesMetadata implements ResolverInterface
 {
-    const COMPLEX_DATA_TYPE = 'COMPLEX';
-
     /**
      * @var Attributes
      */
@@ -41,40 +36,18 @@ class AttributesMetadata implements ResolverInterface
      */
     private $enumDataMapper;
 
-    /** @var Uid */
-    private $uidEncoder;
-
-    /**
-     * @var EnumLookup
-     */
-    private $enumLookup;
-
-    /**
-     * @var Type
-     */
-    private $type;
-
     /**
      * @param Attributes $attributes
      * @param DataMapperInterface $enumDataMapper
-     * @param Uid $uidEncoder
-     * @param EnumLookup $enumLookup
-     * @param Type $type
      * @param MetadataProvider $metadataProvider
      */
     public function __construct(
         Attributes $attributes,
         DataMapperInterface $enumDataMapper,
-        Uid $uidEncoder,
-        EnumLookup $enumLookup,
-        Type $type,
         MetadataProvider $metadataProvider
     ) {
         $this->attributes = $attributes;
         $this->enumDataMapper = $enumDataMapper;
-        $this->uidEncoder = $uidEncoder;
-        $this->enumLookup = $enumLookup;
-        $this->type = $type;
         $this->metadataProvider = $metadataProvider;
     }
 
diff --git a/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeBoolean.php b/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeBoolean.php
@@ -14,7 +14,7 @@
  */
 class UiAttributeTypeBoolean implements TypeResolverInterface
 {
-    const TYPE = 'UiAttributeTypeBoolean';
+    private const TYPE = 'UiAttributeTypeBoolean';
 
     /**
      * @inheritdoc
diff --git a/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeMultiSelect.php b/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeMultiSelect.php
@@ -14,7 +14,7 @@
  */
 class UiAttributeTypeMultiSelect implements TypeResolverInterface
 {
-    const TYPE = 'UiAttributeTypeMultiSelect';
+    private const TYPE = 'UiAttributeTypeMultiSelect';
 
     /**
      * @inheritdoc
diff --git a/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeSelect.php b/EavGraphQlAux/Model/TypeResolver/UiAttributeTypeSelect.php
@@ -14,7 +14,7 @@
  */
 class UiAttributeTypeSelect implements TypeResolverInterface
 {
-    const TYPE = 'UiAttributeTypeSelect';
+    private const TYPE = 'UiAttributeTypeSelect';
 
     /**
      * @inheritdoc
diff --git a/NewsletterGraphQlPwa/composer.json b/NewsletterGraphQlPwa/composer.json
@@ -11,12 +11,12 @@
     },
     "require": {
         "php": "~7.4.0||~8.1.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-newsletter": "*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-store": "*"
     },
     "autoload": {
         "files": [
diff --git a/QuoteGraphQlPwa/composer.json b/QuoteGraphQlPwa/composer.json
@@ -12,11 +12,11 @@
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-graph-ql": "*"
+        "magento/module-quote": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "*",
+        "magento/module-quote-graph-ql": "*"
     },
     "autoload": {
         "files": [
diff --git a/WeeeGraphQlAux/Model/TypeResolver/UiAttributeTypeFixedProductTax.php b/WeeeGraphQlAux/Model/TypeResolver/UiAttributeTypeFixedProductTax.php
@@ -14,7 +14,7 @@
  */
 class UiAttributeTypeFixedProductTax implements TypeResolverInterface
 {
-    const TYPE = 'UiAttributeTypeFixedProductTax';
+    private const TYPE = 'UiAttributeTypeFixedProductTax';
 
     /**
      * @inheritdoc
diff --git a/WeeeGraphQlAux/composer.json b/WeeeGraphQlAux/composer.json
@@ -4,7 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.4.0||~8.1.0",
-        "magento/framework": "*",
+        "magento/framework": "*"
+    },
+    "suggest": {
         "magento/module-eav-graph-ql-aux": "*"
     },
     "license": [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQlAux/CustomProductAttributesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQlAux/CustomProductAttributesTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CatalogGraphQlAux\Test\GraphQl;
+namespace Magento\GraphQl\CatalogGraphQlAux;
 
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\Config;
@@ -129,7 +129,7 @@ public function testProductWithDropDownAttribute()
             $this->assertEquals($expectedOptions, $actualOption);
         }
 
-        $this->assertEquals(null, $actualAttributes['entered_attribute_value']);
+        $this->assertEquals(null, $actualAttributes['entered_attribute_value']['value']);
         $this->assertEquals(
             'SelectedAttributeOption',
             $actualAttributes['selected_attribute_options']['__typename']
@@ -183,7 +183,10 @@ public function testProductWithDateAttribute()
         $actualAttributes = $response['products']['items'][0]['custom_attributes'][0];
 
         $this->assertEquals('TEXT', $actualAttributes['attribute_metadata']['ui_input']['ui_input_type']);
-        $this->assertEquals(null, $actualAttributes['selected_attribute_options']);
+        $this->assertEquals(
+            ['__typename' => 'SelectedAttributeOption'],
+            $actualAttributes['selected_attribute_options']
+        );
         $this->assertEquals(
             'EnteredAttributeValue',
             $actualAttributes['entered_attribute_value']['__typename']
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQlAux/ProductAttributeMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQlAux/ProductAttributeMetadataTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CatalogGraphQlAux\Test\GraphQl;
+namespace Magento\GraphQl\CatalogGraphQlAux;
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
@@ -74,44 +74,65 @@ public function testAttributesMetadataQuery()
  }
 QUERY;
         $response = $this->graphQlQuery($query);
-        $expectedAttributeUids = [
-            $this->uid->encode('catalog_product/cost'),
-            $this->uid->encode('catalog_product/manufacturer'),
-            $this->uid->encode('catalog_product/color')
-        ];
-        $expectedAttributeCodes = [
-            'cost',
-            'manufacturer',
-            'color'
-        ];
-        $expectedLabels = [
-            "Cost",
-            "Manufacturer",
-            "Color"
-        ];
-        $expectedDataTypes = ['FLOAT', 'INT', 'INT'];
-        $expectedInputTypes = ['PRICE', 'SELECT', 'SELECT'];
-        $expectedIsHtmlTypes = [false, false, false];
-        $expectedInputTypesTypenames = ['UiAttributeTypeAny', 'UiAttributeTypeSelect', 'UiAttributeTypeSelect'];
-        $expectedUseInComponents = [
-            [],
-            ['PRODUCTS_COMPARE', 'PRODUCT_FILTER', 'ADVANCED_CATALOG_SEARCH'],
-            ['PRODUCTS_COMPARE', 'PRODUCT_FILTER', 'ADVANCED_CATALOG_SEARCH']
+        $this->assertArrayNotHasKey('errors', $response);
+        $expectedAttributesMetadata = [
+            'cost' => [
+                "__typename" => 'ProductAttributeMetadata',
+                "uid" => $this->uid->encode('catalog_product/cost'),
+                "code" => 'cost',
+                "label" => 'Cost',
+                "data_type" => 'FLOAT',
+                "entity_type" => "PRODUCT",
+                "is_system" => false,
+                "ui_input" => [
+                    "ui_input_type"=> 'PRICE',
+                    "is_html_allowed"=> false,
+                    "__typename" => 'UiAttributeTypeAny'
+                ],
+                "used_in_components" => []
+            ],
+            'manufacturer' => [
+                "__typename" => 'ProductAttributeMetadata',
+                "uid" => $this->uid->encode('catalog_product/manufacturer'),
+                "code" => 'manufacturer',
+                "label" => 'Manufacturer',
+                "data_type" => 'INT',
+                "entity_type" => "PRODUCT",
+                "is_system" => false,
+                "ui_input" => [
+                    "ui_input_type"=> 'SELECT',
+                    "is_html_allowed"=> false,
+                    "__typename" => 'UiAttributeTypeSelect'
+                ],
+                "used_in_components" => ['PRODUCTS_COMPARE', 'PRODUCT_FILTER', 'ADVANCED_CATALOG_SEARCH']
+            ],
+            'color' => [
+                "__typename" => 'ProductAttributeMetadata',
+                "uid" => $this->uid->encode('catalog_product/color'),
+                "code" => 'color',
+                "label" => 'Color',
+                "data_type" => 'INT',
+                "entity_type" => "PRODUCT",
+                "is_system" => false,
+                "ui_input" => [
+                    "ui_input_type"=> 'SELECT',
+                    "is_html_allowed"=> false,
+                    "__typename" => 'UiAttributeTypeSelect'
+                ],
+                "used_in_components" => ['PRODUCTS_COMPARE', 'PRODUCT_FILTER', 'ADVANCED_CATALOG_SEARCH']
+            ],
         ];
-        $expectedIsSystem = [false, false, false];
-
-        $this->assertAttributeType(
-            $expectedAttributeUids,
-            $expectedAttributeCodes,
-            $expectedLabels,
-            $expectedDataTypes,
-            $expectedInputTypes,
-            $expectedIsHtmlTypes,
-            $expectedInputTypesTypenames,
-            $expectedUseInComponents,
-            $expectedIsSystem,
-            $response
-        );
+        $attributes = [];
+        foreach ($response['attributesMetadata']['items'] as $item) {
+            if (isset($expectedAttributesMetadata[$item['code']])) {
+                $this->assertResponseFields(
+                    $item,
+                    $expectedAttributesMetadata[$item['code']]
+                );
+                $attributes[] = $item['code'];
+            }
+        }
+        $this->assertEqualsCanonicalizing(array_keys($expectedAttributesMetadata), $attributes);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ReCaptchaGraphQlPwa/ConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ReCaptchaGraphQlPwa/ConfigResolverTest.php
@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptchaGraphQlPwa\Test\GraphQl;
+namespace Magento\GraphQl\ReCaptchaGraphQlPwa;
 
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class ConfigResolverTest extends GraphQlAbstract
 {
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_full.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_full.php
      */
     public function testFullyConfigured()
     {
@@ -43,7 +43,7 @@ public function testFullyConfigured()
     }
 
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_reduced_forms.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_reduced_forms.php
      */
     public function testReducedForms()
     {
@@ -69,7 +69,7 @@ public function testReducedForms()
     }
 
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_no_private_key.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_no_private_key.php
      */
     public function testEmptyPrivateKey()
     {
@@ -80,7 +80,7 @@ public function testEmptyPrivateKey()
     }
 
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_no_public_key.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_no_public_key.php
      */
     public function testEmptyPublicKey()
     {
@@ -91,7 +91,7 @@ public function testEmptyPublicKey()
     }
 
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_no_forms.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_no_forms.php
      */
     public function testEmptyForms()
     {
@@ -102,7 +102,7 @@ public function testEmptyForms()
     }
 
     /**
-     * @magentoApiDataFixture Magento_ReCaptchaGraphQlPwa::Test/GraphQl/_files/config_empty.php
+     * @magentoApiDataFixture Magento/ReCaptchaGraphQlPwa/_files/config_empty.php
      */
     public function testEmptyConfiguration()
     {
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_empty.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_empty.php
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_full.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_full.php
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_forms.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_forms.php
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_private_key.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_private_key.php
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_public_key.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_no_public_key.php
diff --git a/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_reduced_forms.php b/dev/tests/integration/testsuite/Magento/ReCaptchaGraphQlPwa/_files/config_reduced_forms.php

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`class ProductAttributeMetadata implements TypeResolverInterface`
`17`	`17`	`{`
`18`		`- const TYPE = 'ProductAttributeMetadata';`
	`18`	`+ private const TYPE = 'ProductAttributeMetadata';`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @inheritdoc`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,8 @@ public function getDefaultValues(): array`
`100`	`100`	`/**`
`101`	`101`	`* Clean input values and set default values`
`102`	`102`	`*`
`103`		`- * @param array<string, string> $input`
`104`		`- *`
`105`		`- * @return array<string, string>`
	`103`	`+ * @param string[] $input`
	`104`	`+ * @return string[]`
`106`	`105`	`*/`
`107`	`106`	`public function cleanInput(array $input): array`
`108`	`107`	`{`
`@@ -130,10 +129,9 @@ public function cleanInput(array $input): array`
`130`	`129`	`/**`
`131`	`130`	`* Validate input data`
`132`	`131`	`*`
`133`		`- * @param array<string, string> $input`
`134`		`- *`
	`132`	`+ * @param string[] $input`
`135`	`133`	`* @return void`
`136`		`- * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException`
	`134`	`+ * @throws GraphQlInputException`
`137`	`135`	`*/`
`138`	`136`	`public function validateInput(array $input): void`
`139`	`137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`class UiAttributeTypeBoolean implements TypeResolverInterface`
`16`	`16`	`{`
`17`		`- const TYPE = 'UiAttributeTypeBoolean';`
	`17`	`+ private const TYPE = 'UiAttributeTypeBoolean';`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @inheritdoc`