Merge remote-tracking branch 'trigger/nathan-bug-delivery' into bug_fixes_beta_bugs

Author: cpartica

app/code/Magento/Cms/Block/Widget/Block.php

@@ -3,14 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Block\Widget;
 
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Cms\Model\Block as CmsBlock;
+use Magento\Widget\Block\BlockInterface;
+
 /**
  * Cms Static Block Widget
  *
- * @author     Magento Core Team <[email protected]>
+ * @author Magento Core Team <[email protected]>
  */
-class Block extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
+class Block extends \Magento\Framework\View\Element\Template implements BlockInterface, IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
@@ -31,6 +39,11 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      */
     protected $_blockFactory;
 
+    /**
+     * @var CmsBlock
+     */
+    private $block;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
@@ -49,8 +62,9 @@ public function __construct(
     }
 
     /**
-     * Prepare block text and determine whether block output enabled or not
-     * Prevent blocks recursion if needed
+     * Prepare block text and determine whether block output enabled or not.
+     *
+     * Prevent blocks recursion if needed.
      *
      * @return $this
      */
@@ -65,19 +79,63 @@ protected function _beforeToHtml()
         }
         self::$_widgetUsageMap[$blockHash] = true;
 
-        if ($blockId) {
-            $storeId = $this->_storeManager->getStore()->getId();
-            /** @var \Magento\Cms\Model\Block $block */
-            $block = $this->_blockFactory->create();
-            $block->setStoreId($storeId)->load($blockId);
-            if ($block->isActive()) {
+        $block = $this->getBlock();
+
+        if ($block && $block->isActive()) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
                 $this->setText(
                     $this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
                 );
+            } catch (NoSuchEntityException $e) {
             }
         }
-
         unset(self::$_widgetUsageMap[$blockHash]);
         return $this;
     }
+
+    /**
+     * Get identities of the Cms Block
+     *
+     * @return array
+     */
+    public function getIdentities()
+    {
+        $block = $this->getBlock();
+
+        if ($block) {
+            return $block->getIdentities();
+        }
+
+        return [];
+    }
+
+    /**
+     * Get block
+     *
+     * @return CmsBlock|null
+     */
+    private function getBlock(): ?CmsBlock
+    {
+        if ($this->block) {
+            return $this->block;
+        }
+
+        $blockId = $this->getData('block_id');
+
+        if ($blockId) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
+                /** @var \Magento\Cms\Model\Block $block */
+                $block = $this->_blockFactory->create();
+                $block->setStoreId($storeId)->load($blockId);
+                $this->block = $block;
+
+                return $block;
+            } catch (NoSuchEntityException $e) {
+            }
+        }
+
+        return null;
+    }
 }

dev/tests/integration/phpunit.xml.dist

@@ -51,7 +51,7 @@
         <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
         <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
         <!-- Whether to cleanup the application before running tests or not -->
-        <const name="TESTS_CLEANUP" value="enabled"/>
+        <const name="TESTS_CLEANUP" value="false"/>
         <!-- Memory usage and estimated leaks thresholds -->
         <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
         <const name="TESTS_MEM_LEAK_LIMIT" value=""/>

dev/tests/integration/testsuite/Magento/Cms/Block/Widget/BlockTest.php

@@ -31,5 +31,6 @@ public function testToHtml()
         $this->assertContains('<a href="http://example.com/', $result);
         $this->assertContains('<p>Config value: "http://example.com/".</p>', $result);
         $this->assertContains('<p>Custom variable: "HTML Value".</p>', $result);
+        $this->assertSame($cmsBlock->getIdentities(), $block->getIdentities());
     }
 }

dev/tests/static/framework/Magento/ruleset.xml

@@ -10,6 +10,10 @@
 
     <rule ref="PSR2"/>
 
+    <rule ref="PSR2.Files.ClosingTag">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+
     <rule ref="Magento.Files.LineLength">
         <properties>
             <property name="lineLimit" value="120"/>