added fallbacks to avoid errors

Author: aknollmann

composer.json

@@ -2,7 +2,7 @@
     "name": "infrangible/m2-cache-usage",
     "description": "Infrangible Magento 2 Cache Usage",
     "type": "magento2-module",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "license": "MIT",
     "keywords": [
         "Magento"

src/Model/Cache.php

@@ -138,27 +138,45 @@ public function setBlocksData(array $blocks): void
         foreach ($blocks as $blockName => $blockData) {
             $block = new Block();
 
-            if (array_key_exists('layout_name', $blockData)) {
+            if (array_key_exists(
+                'layout_name',
+                $blockData
+            )) {
                 $block->setLayoutName($blockData[ 'layout_name' ]);
             }
 
-            if (array_key_exists('class_name', $blockData)) {
+            if (array_key_exists(
+                'class_name',
+                $blockData
+            )) {
                 $block->setClassName($blockData[ 'class_name' ]);
             }
 
-            if (array_key_exists('template_name', $blockData)) {
+            if (array_key_exists(
+                'template_name',
+                $blockData
+            )) {
                 $block->setTemplateName($blockData[ 'template_name' ]);
             }
 
-            if (array_key_exists('uncacheable', $blockData)) {
+            if (array_key_exists(
+                'uncacheable',
+                $blockData
+            )) {
                 $block->setUncacheable($blockData[ 'uncacheable' ]);
             }
 
-            if (array_key_exists('cached', $blockData)) {
+            if (array_key_exists(
+                'cached',
+                $blockData
+            )) {
                 $block->setCached($blockData[ 'cached' ]);
             }
 
-            if (array_key_exists('uncached', $blockData)) {
+            if (array_key_exists(
+                'uncached',
+                $blockData
+            )) {
                 $block->setUncached($blockData[ 'uncached' ]);
             }
 
@@ -174,7 +192,7 @@ public function getDefaultBlocks(): array
         $blocks = [];
 
         foreach ($this->getBlocks() as $block) {
-            if ( ! $block->isUncacheable() && ! $block->isCached() && ! $block->isUncached()) {
+            if (! $block->isUncacheable() && ! $block->isCached() && ! $block->isUncached()) {
                 $blocks[ $block->getLayoutName() ] = $block;
             }
         }
@@ -234,11 +252,16 @@ public function addBlockData(
         LayoutInterface $layout,
         string $name,
         string $className,
-        string $templateName): Block
-    {
+        string $templateName
+    ): Block {
         $cacheBlock = $this->getBlock($name);
 
-        $cacheBlock->setLayoutName($this->getLayoutName($layout, $name));
+        $cacheBlock->setLayoutName(
+            $this->getLayoutName(
+                $layout,
+                $name
+            )
+        );
         $cacheBlock->setClassName($className);
         $cacheBlock->setTemplateName($templateName);
 
@@ -263,12 +286,21 @@ public function addBlock(AbstractBlock $block): Block
         if ($block instanceof Template) {
             $template = $block->getTemplate();
 
-            if ( ! empty($template)) {
+            if (! empty($template)) {
                 $templateName = $block->getTemplateFile();
             }
         }
 
-        return $this->addBlockData($block->getLayout(), $blockName, get_class($block), $templateName);
+        if ($templateName === false) {
+            $templateName = '-';
+        }
+
+        return $this->addBlockData(
+            $block->getLayout(),
+            $blockName,
+            get_class($block),
+            $templateName
+        );
     }
 
     public function generateBlockName(AbstractBlock $block): string
@@ -322,7 +354,10 @@ public function addUncachedBlock(AbstractBlock $block): Block
 
     public function getBlock(string $blockName): Block
     {
-        if (array_key_exists($blockName, $this->blocks)) {
+        if (array_key_exists(
+            $blockName,
+            $this->blocks
+        )) {
             return $this->blocks[ $blockName ];
         }
 
@@ -337,7 +372,14 @@ protected function getLayoutName(LayoutInterface $layout, string $nameInLayout):
             return $nameInLayout;
         }
 
-        return sprintf('%s/%s', $this->getLayoutName($layout, $parentName), $nameInLayout);
+        return sprintf(
+            '%s/%s',
+            $this->getLayoutName(
+                $layout,
+                $parentName
+            ),
+            $nameInLayout
+        );
     }
 
     public function getStarted(): float

src/Plugin/Framework/View/Layout.php

@@ -4,9 +4,10 @@
 
 namespace Infrangible\CacheUsage\Plugin\Framework\View;
 
+use Infrangible\CacheUsage\Model\Cache;
+use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout\Element;
-use Infrangible\CacheUsage\Model\Cache;
 
 /**
  * @author      Andreas Knollmann
@@ -18,17 +19,11 @@ class Layout
     /** @var Cache */
     protected $cache;
 
-    /**
-     * @param Cache $cache
-     */
     public function __construct(Cache $cache)
     {
         $this->cache = $cache;
     }
 
-    /**
-     * @param \Magento\Framework\View\Layout $subject
-     */
     public function afterGenerateElements(\Magento\Framework\View\Layout $subject)
     {
         if ($subject->isCacheable()) {
@@ -45,6 +40,10 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject)
                 $blockName = $element->getBlockName();
                 $className = $element->getAttribute('class');
 
+                if ($className === null) {
+                    $className = AbstractBlock::class;
+                }
+
                 $templateName = '-';
 
                 if ($subject->isBlock($blockName)) {
@@ -53,13 +52,18 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject)
                     if ($block instanceof Template) {
                         $template = $block->getTemplate();
 
-                        if ( ! empty($template)) {
+                        if (! empty($template)) {
                             $templateName = $block->getTemplateFile();
                         }
                     }
                 }
 
-                $cacheBlock = $this->cache->addBlockData($subject, $blockName, $className, $templateName);
+                $cacheBlock = $this->cache->addBlockData(
+                    $subject,
+                    $blockName,
+                    $className,
+                    $templateName
+                );
 
                 $cacheBlock->setUncacheable(true);
             }