#4 remove obsolete ->id() checks

Author: Willem Wigman

src/Plugin/CategoryLayoutPlugin.php

@@ -44,8 +44,7 @@ class CategoryLayoutPlugin
     public function __construct(
         FlyweightFactory $themeFactory,
         DesignInterface $design,
-        LayoutProcessorFactory $layoutProcessorFactory
-    )
+        LayoutProcessorFactory $layoutProcessorFactory)
     {
         $this->themeFactory = $themeFactory;
         $this->design = $design;
@@ -66,7 +65,7 @@ private function getLayoutProcessor(): LayoutProcessor
                 [
                     'theme' => $this->themeFactory->create(
                         $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND)
-                    )
+                    ),
                 ]
             );
             $this->themeFactory = null;
@@ -88,32 +87,30 @@ private function getLayoutProcessor(): LayoutProcessor
     public function afterFetchAvailableFiles(
         LayoutUpdateManager $subject,
         array $result,
-        CategoryInterface $category
-    ): array
+        CategoryInterface $category): array
     {
-        if (!$category->getId()) {
-            return $result;
-        }
-
         $handles = $this->getLayoutProcessor()->getAvailableHandles();
 
-        return array_merge($result, array_filter(
-            array_map(
-                function(string $handle) use ($category) : ?string {
-                    preg_match(
-                        '/^catalog\_category\_view\_selectable\_0\_([a-z0-9]+)/i',
-                        $handle,
-                        $selectable
-                    );
-                    if (!empty($selectable[1])) {
-                        return $selectable[1];
-                    }
-
-                    return null;
-                },
-                $handles
+        return array_merge(
+            $result,
+            array_filter(
+                array_map(
+                    function (string $handle): ?string {
+                        preg_match(
+                            '/^catalog\_category\_view\_selectable\_0\_([a-z0-9]+)/i',
+                            $handle,
+                            $selectable
+                        );
+                        if (!empty($selectable[1])) {
+                            return $selectable[1];
+                        }
+
+                        return null;
+                    },
+                    $handles
+                )
             )
-        ));
+        );
     }
 
     /**
@@ -132,8 +129,7 @@ public function afterExtractCustomSettings(
         LayoutUpdateManager $subject,
         $result,
         CategoryInterface $category,
-        DataObject $intoSettings
-    ): void
+        DataObject $intoSettings): void
     {
         if ($category->getId() && $value = $this->extractAttributeValue($category)) {
             $handles = $intoSettings->getPageLayoutHandles() ?? [];

src/Plugin/ProductLayoutPlugin.php

@@ -14,7 +14,8 @@
 use Magento\Framework\View\Model\Layout\Merge as LayoutProcessor;
 use Magento\Framework\View\Model\Layout\MergeFactory as LayoutProcessorFactory;
 
-class ProductLayoutPlugin {
+class ProductLayoutPlugin
+{
 
     /**
      * @var FlyweightFactory
@@ -44,8 +45,8 @@ class ProductLayoutPlugin {
     public function __construct(
         FlyweightFactory $themeFactory,
         DesignInterface $design,
-        LayoutProcessorFactory $layoutProcessorFactory
-    ) {
+        LayoutProcessorFactory $layoutProcessorFactory)
+    {
         $this->themeFactory = $themeFactory;
         $this->design = $design;
         $this->layoutProcessorFactory = $layoutProcessorFactory;
@@ -65,7 +66,7 @@ private function getLayoutProcessor(): LayoutProcessor
                 [
                     'theme' => $this->themeFactory->create(
                         $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND)
-                    )
+                    ),
                 ]
             );
             $this->themeFactory = null;
@@ -87,31 +88,30 @@ private function getLayoutProcessor(): LayoutProcessor
     public function afterFetchAvailableFiles(
         LayoutUpdateManager $subject,
         array $result,
-        ProductInterface $product
-    ): array {
-        if (!$product->getSku()) {
-            return [];
-        }
-
+        ProductInterface $product): array
+    {
         $handles = $this->getLayoutProcessor()->getAvailableHandles();
 
-        return array_merge($result, array_filter(
-            array_map(
-                function(string $handle) : ?string {
-                    preg_match(
-                        '/^catalog\_product\_view\_selectable\_0\_([a-z0-9]+)/i',
-                        $handle,
-                        $selectable
-                    );
-                    if (!empty($selectable[1])) {
-                        return $selectable[1];
-                    }
-
-                    return null;
-                },
-                $handles
+        return array_merge(
+            $result,
+            array_filter(
+                array_map(
+                    function (string $handle): ?string {
+                        preg_match(
+                            '/^catalog\_product\_view\_selectable\_0\_([a-z0-9]+)/i',
+                            $handle,
+                            $selectable
+                        );
+                        if (!empty($selectable[1])) {
+                            return $selectable[1];
+                        }
+
+                        return null;
+                    },
+                    $handles
+                )
             )
-        ));
+        );
     }
 
     /**
@@ -130,8 +130,8 @@ public function afterExtractCustomSettings(
         LayoutUpdateManager $subject,
         $result,
         ProductInterface $product,
-        DataObject $intoSettings
-    ): void {
+        DataObject $intoSettings): void
+    {
         if ($product->getSku() && $value = $this->extractAttributeValue($product)) {
             $handles = $intoSettings->getPageLayoutHandles() ?? [];
             $handles = array_merge_recursive(