Merge remote-tracking branch 'remotes/api/MAGETWO-50551-Cache-Tags' into bug-fixes

Author: Hayder Sharhan

app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php

@@ -48,10 +48,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $tags = [];
                 $pattern = "((^|,)%s(,|$))";
                 foreach ($object->getIdentities() as $tag) {
-                    $tags[] = sprintf($pattern, preg_replace("~_\\d+$~", '', $tag));
                     $tags[] = sprintf($pattern, $tag);
                 }
-                $this->purgeCache->sendPurgeRequest(implode('|', array_unique($tags)));
+                if (!empty($tags)) {
+                    $this->purgeCache->sendPurgeRequest(implode('|', array_unique($tags)));
+                }
             }
         }
     }

app/code/Magento/Catalog/Model/Product.php

@@ -307,6 +307,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_productIdCached;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
     /**
      * List of attributes in ProductInterface
      * @var array
@@ -2263,6 +2268,9 @@ public function getIdentities()
                 $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
             }
         }
+        if ($this->getAppState()->getAreaCode() === \Magento\Framework\App\Area::AREA_FRONTEND) {
+            $identities[] = self::CACHE_TAG;
+        }
         return array_unique($identities);
     }
 
@@ -2548,4 +2556,20 @@ public function setId($value)
     {
         return $this->setData('entity_id', $value);
     }
+
+    /**
+     * Get application state
+     *
+     * @deprecated
+     * @return \Magento\Framework\App\State
+     */
+    private function getAppState()
+    {
+        if (!$this->appState instanceof \Magento\Framework\App\State) {
+            $this->appState = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\App\State::class
+            );
+        }
+        return $this->appState;
+    }
 }

app/code/Magento/PageCache/Observer/FlushCacheByTags.php

@@ -53,9 +53,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $object = $observer->getEvent()->getObject();
             if ($object instanceof \Magento\Framework\DataObject\IdentityInterface) {
                 $tags = $object->getIdentities();
-                foreach ($tags as $tag) {
-                    $tags[] = preg_replace("~_\\d+$~", '', $tag);
-                }
                 if (!empty($tags)) {
                     $this->getCache()->clean(\Zend_Cache::CLEANING_MODE_ALL, array_unique($tags));
                 }