ACPT-1572: Slow saving of stores/websites

- Remove hard dependency;
- Merge identities and tags;

Author: adifucan

app/code/Magento/Store/Model/Group.php

@@ -518,8 +518,9 @@ public function getIdentities()
     public function getCacheTags()
     {
         $identities = $this->getIdentities();
+        $parentTags = parent::getCacheTags();
 
-        return !empty($identities) ? $identities : parent::getCacheTags();
+        return array_unique(array_merge($identities, $parentTags));
     }
 
     /**

app/code/Magento/Store/Model/Store.php

@@ -1371,8 +1371,9 @@ public function getIdentities()
     public function getCacheTags()
     {
         $identities = $this->getIdentities();
+        $parentTags = parent::getCacheTags();
 
-        return !empty($identities) ? $identities : parent::getCacheTags();
+        return array_unique(array_merge($identities, $parentTags));
     }
 
     /**

app/code/Magento/Store/Model/Website.php

@@ -18,7 +18,6 @@
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
-use Magento\PageCache\Model\Cache\Type;
 use Magento\Store\Model\ResourceModel\Store\CollectionFactory;
 
 /**
@@ -608,7 +607,7 @@ public function afterDelete()
     {
         $this->_storeManager->reinitStores();
         $types = [
-            Type::TYPE_IDENTIFIER,
+            'full_page',
             Config::TYPE_IDENTIFIER
         ];
         foreach ($types as $type) {
@@ -629,7 +628,7 @@ public function afterSave()
         if ($this->isObjectNew()) {
             $this->_storeManager->reinitStores();
         } else {
-            $this->typeList->invalidate([Type::TYPE_IDENTIFIER, Config::TYPE_IDENTIFIER]);
+            $this->typeList->invalidate(['full_page', Config::TYPE_IDENTIFIER]);
         }
         $this->pillPut->put();
         return parent::afterSave();
@@ -725,8 +724,9 @@ public function getIdentities()
     public function getCacheTags()
     {
         $identities = $this->getIdentities();
+        $parentTags = parent::getCacheTags();
 
-        return !empty($identities) ? $identities : parent::getCacheTags();
+        return array_unique(array_merge($identities, $parentTags));
     }
 
     /**

app/code/Magento/Store/Test/Unit/Model/WebsiteTest.php

@@ -10,7 +10,6 @@
 use Magento\Framework\App\Cache\Type\Config;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\PageCache\Model\Cache\Type;
 use Magento\Store\Model\ResourceModel\Website\Collection;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -120,7 +119,7 @@ public function testAfterSaveObject()
 
         $this->typeList->expects($this->once())
             ->method('invalidate')
-            ->with([Type::TYPE_IDENTIFIER, Config::TYPE_IDENTIFIER]);
+            ->with(['full_page', Config::TYPE_IDENTIFIER]);
 
         $this->model->afterSave();
     }
@@ -130,7 +129,7 @@ public function testAfterDelete()
         $this->typeList->expects($this->exactly(2))
             ->method('cleanType')
             ->withConsecutive(
-                [Type::TYPE_IDENTIFIER],
+                ['full_page'],
                 [Config::TYPE_IDENTIFIER]
             );
 

app/code/Magento/Store/composer.json

@@ -14,8 +14,7 @@
         "magento/module-ui": "*",
         "magento/module-customer": "*",
         "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-page-cache": "*"
+        "magento/module-backend": "*"
     },
     "suggest": {
         "magento/module-deploy": "*"