ACP2E-3063: [Cloud] Cache is not getting invalidated.

- without test

Author: arnobsh

app/code/Magento/Cms/Observer/InvalidateLayoutCacheObserver.php

@@ -18,14 +18,13 @@
 
 namespace Magento\Cms\Observer;
 
-use Magento\Catalog\Model\Product;
 use Magento\Cms\Model\Page;
 use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
 use Magento\Framework\App\Cache\StateInterface as CacheState;
 use Magento\Framework\App\Cache\Tag\Resolver;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Widget\Model\Widget\Instance;
+use Magento\Framework\Model\AbstractModel;
 
 /**
  * Invalidates layout cache.
@@ -81,7 +80,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        if (!$object->dataHasChangedFor(Page::PAGE_LAYOUT)) {
+        if (!$object instanceof Page || !$object->dataHasChangedFor(Page::PAGE_LAYOUT)) {
             return;
         }
 
@@ -95,25 +94,19 @@ public function execute(Observer $observer)
 
     /**
      * Get additional tags
+     *
+     * @param AbstractModel $object
+     * @return string
      */
-    public function getAdditionalTags($object): string
+    public function getAdditionalTags(AbstractModel $object): string
     {
         $tag = '';
         if ($object instanceof Page) {
             $tag = sprintf(
-                    '%s_%s',
-                    'CMS_PAGE_VIEW_ID',
-                    str_replace('-', '_', strtoupper($object->getIdentifier()))
-                    );
-        } elseif ($object instanceof Product) {
-            $tag = sprintf(
-                    '%s',
-                    str_replace(
-                        '{{ID}}',
-                        (string) $object->getId(),
-                        Instance::SINGLE_PRODUCT_LAYOUT_HANDLE
-                    ),
-                 );
+                '%s_%s',
+                'CMS_PAGE_VIEW_ID',
+                str_replace('-', '_', strtoupper($object->getIdentifier()))
+            );
         }
         return $tag;
     }