merge magento/2.3-develop into magento-qwerty/MAGETWO-96975

Author: magento-cicd2

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php

@@ -17,11 +17,12 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Helper\Data;
 
 /**
  * Catalog product custom option resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Value extends AbstractDb
 {
@@ -51,6 +52,11 @@ class Value extends AbstractDb
      */
     private $localeFormat;
 
+    /**
+     * @var Data
+     */
+    private $dataHelper;
+
     /**
      * Class constructor
      *
@@ -59,17 +65,21 @@ class Value extends AbstractDb
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $config
      * @param string $connectionName
+     * @param Data $dataHelper
      */
     public function __construct(
         Context $context,
         CurrencyFactory $currencyFactory,
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $config,
-        $connectionName = null
+        $connectionName = null,
+        Data $dataHelper = null
     ) {
         $this->_currencyFactory = $currencyFactory;
         $this->_storeManager = $storeManager;
         $this->_config = $config;
+        $this->dataHelper = $dataHelper ?: ObjectManager::getInstance()
+            ->get(Data::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -131,7 +141,7 @@ protected function _saveValuePrices(AbstractModel $object)
             $optionTypeId = $this->getConnection()->fetchOne($select);
 
             if ($optionTypeId) {
-                if ($object->getStoreId() == '0') {
+                if ($object->getStoreId() == '0' || $this->dataHelper->isPriceGlobal()) {
                     $bind = ['price' => $price, 'price_type' => $priceType];
                     $where = [
                         'option_type_id = ?' => $optionTypeId,

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentity.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for multiple resolved categories
+ */
+class CategoriesIdentity implements IdentityInterface
+{
+    /**
+     * Get category IDs from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        $ids = [];
+        if (!empty($resolvedData)) {
+            foreach ($resolvedData as $category) {
+                $ids[] = $category['id'];
+            }
+        }
+        return $ids;
+    }
+}

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentity.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for resolved category
+ */
+class CategoryTreeIdentity implements IdentityInterface
+{
+    /**
+     * Get category ID from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        return empty($resolvedData['id']) ? [] : [$resolvedData['id']];
+    }
+}

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Identity.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for resolved products
+ */
+class Identity implements IdentityInterface
+{
+    /**
+     * Get product ids for cache tag
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        $ids = [];
+        $items = $resolvedData['items'] ?? [];
+        foreach ($items as $item) {
+            $ids[] = $item['entity_id'];
+        }
+
+        return $ids;
+    }
+}

app/code/Magento/CatalogGraphQl/composer.json

@@ -14,6 +14,7 @@
     },
     "suggest": {
         "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-cache": "*",
         "magento/module-store-graph-ql": "*"
     },
     "license": [

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -9,11 +9,11 @@ type Query {
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
      ): Products
-     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes")
+     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity")
     category (
         id: Int @doc(description: "Id of the category")
     ): CategoryTree
-    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
 }
 
 enum CurrencyEnum @doc(description: "The list of available currency codes") {
@@ -275,7 +275,7 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
     gift_message_available: String @doc(description: "Indicates whether a gift message is available")
     manufacturer: Int @doc(description: "A number representing the product's manufacturer")
-    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
+    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
     canonical_url: String @doc(description: "Canonical URL") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
 }
 
@@ -396,7 +396,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
-    ): CategoryProducts @doc(description: "The list of products assigned to the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
+    ): CategoryProducts @doc(description: "The list of products assigned to the category") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
     breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
 }
 

app/code/Magento/CmsGraphQl/Model/Resolver/Block/Identity.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\Block;
+
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for resolved CMS block
+ */
+class Identity implements IdentityInterface
+{
+    /**
+     * Get block identities from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        $ids = [];
+        $items = $resolvedData['items'] ?? [];
+        foreach ($items as $item) {
+            if (is_array($item) && !empty($item[BlockInterface::BLOCK_ID])) {
+                $ids[] = $item[BlockInterface::BLOCK_ID];
+                $ids[] = $item[BlockInterface::IDENTIFIER];
+            }
+        }
+
+        return $ids;
+    }
+}

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -59,6 +59,7 @@ public function getData(string $blockIdentifier): array
         $renderedContent = $this->widgetFilter->filter($block->getContent());
 
         $blockData = [
+            BlockInterface::BLOCK_ID => $block->getId(),
             BlockInterface::IDENTIFIER => $block->getIdentifier(),
             BlockInterface::TITLE => $block->getTitle(),
             BlockInterface::CONTENT => $renderedContent,

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php

@@ -40,6 +40,8 @@ public function __construct(
     }
 
     /**
+     * Get the page data
+     *
      * @param int $pageId
      * @return array
      * @throws NoSuchEntityException
@@ -55,6 +57,7 @@ public function getData(int $pageId): array
         $renderedContent = $this->widgetFilter->filter($page->getContent());
 
         $pageData = [
+            PageInterface::PAGE_ID => $page->getId(),
             'url_key' => $page->getIdentifier(),
             PageInterface::TITLE => $page->getTitle(),
             PageInterface::CONTENT => $renderedContent,

app/code/Magento/CmsGraphQl/Model/Resolver/Page/Identity.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\Page;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for resolved CMS page
+ */
+class Identity implements IdentityInterface
+{
+    /**
+     * Get page ID from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        return empty($resolvedData[PageInterface::PAGE_ID]) ? [] : [$resolvedData[PageInterface::PAGE_ID]];
+    }
+}