#94738 use serializer, catch thrown exception when image is missing

SnowdogApps · Jul 9, 2024 · 9463f36 · 9463f36
1 parent 2bf3811
commit 9463f36
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/Model/Menu/Node.php b/Model/Menu/Node.php
@@ -351,11 +351,12 @@ public function setSelectedItemId($selectedItemId)
     public function getCustomerGroups()
     {
         $customerGroups = $this->_getData(NodeInterface::CUSTOMER_GROUPS);
-        if ($customerGroups !== null) {
-            $customerGroups = explode(',', $customerGroups);
-            if (is_array($customerGroups) && !empty($customerGroups)) {
-                return $customerGroups;
-            }
+        if ($customerGroups == null) {
+            return [];
+        }
+        $customerGroups = explode(',', $customerGroups);
+        if (is_array($customerGroups) && !empty($customerGroups)) {
+            return $customerGroups;
         }
 
         return [];

diff --git a/Model/Menu/Node/Image/File.php b/Model/Menu/Node/Image/File.php
@@ -123,11 +123,7 @@ public function getImageSize(string $file): array
         $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $fileFullPath = $mediaDirectory->getAbsolutePath(self::PATH . $file);
 
-        try {
-            return getimagesize($fileFullPath);
-        } catch (Exception $e) {
-            return [];
-        }
+        return getimagesize($fileFullPath);
     }
 
     private function getAbsolutePath(): string

diff --git a/Model/ResourceModel/Menu/Node.php b/Model/ResourceModel/Menu/Node.php
@@ -4,23 +4,37 @@
 
 namespace Snowdog\Menu\Model\ResourceModel\Menu;
 
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Node extends AbstractDb
 {
+    protected $serializer;
+
+    public function __construct(
+        Context $context,
+        SerializerInterface $serializer,
+        $connectionName = null
+    ) {
+        $this->serializer = $serializer;
+        parent::__construct($context, $connectionName);
+    }
+
     protected function _construct()
     {
         $this->_init('snowmenu_node', 'node_id');
     }
 
-    protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
+    protected function _afterSave(AbstractModel $object)
     {
         $connection = $this->getConnection();
         $connection->delete('snowmenu_customer', ['node_id = ?' => $object->getNodeId()]);
 
         $nodeCustomerGroups = $object->getData('customer_groups');
         if ($nodeCustomerGroups && is_string($nodeCustomerGroups)) {
-            $nodeCustomerGroups = json_decode($nodeCustomerGroups);
+            $nodeCustomerGroups = $this->serializer->unserialize($nodeCustomerGroups);
         }
         $insertData = [];
         foreach ($nodeCustomerGroups ?? [] as $customerGroup) {

diff --git a/Service/Menu/SaveRequestProcessor.php b/Service/Menu/SaveRequestProcessor.php
@@ -226,7 +226,11 @@ private function processImageParameters(array $nodeData, NodeInterface &$nodeObj
         if (empty($nodeData[NodeInterface::IMAGE_WIDTH])
             || empty($nodeData[NodeInterface::IMAGE_HEIGHT])
         ) {
-            $imageSize = $this->nodeImageFile->getImageSize($nodeData[NodeInterface::IMAGE]);
+            try {
+                $imageSize = $this->nodeImageFile->getImageSize($nodeData[NodeInterface::IMAGE]);
+            } catch (\Exception $e) {
+                $imageSize = null;
+            }
 
             if (!empty($imageSize)) {
                 $nodeObject