Merge pull request #4358 from magento-arcticfoxes/2.3.3-develop-pr

[arcticfoxes] bug fixes

Author: Joan He

app/code/Magento/Theme/Model/Design/BackendModelFactory.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Theme\Model\Design;
 
 use Magento\Framework\App\Config\Value;
@@ -11,6 +14,9 @@
 use Magento\Theme\Model\Design\Config\MetadataProvider;
 use Magento\Theme\Model\ResourceModel\Design\Config\CollectionFactory;
 
+/**
+ * Class BackendModelFactory
+ */
 class BackendModelFactory extends ValueFactory
 {
     /**
@@ -58,13 +64,15 @@ public function __construct(
      */
     public function create(array $data = [])
     {
+        $storedData = $this->getStoredData($data['scope'], $data['scopeId'], $data['config']['path']);
+
         $backendModelData = array_replace_recursive(
-            $this->getStoredData($data['scope'], $data['scopeId'], $data['config']['path']),
+            $storedData,
             [
                 'path' => $data['config']['path'],
                 'scope' => $data['scope'],
                 'scope_id' => $data['scopeId'],
-                'field_config' => $data['config'],
+                'field_config' => $data['config']
             ]
         );
 
@@ -76,6 +84,13 @@ public function create(array $data = [])
         $backendModel = $this->getNewBackendModel($backendType, $backendModelData);
         $backendModel->setValue($data['value']);
 
+        if ($storedData) {
+            foreach ($storedData as $key => $value) {
+                $backendModel->setOrigData($key, $value);
+            }
+            $backendModel->setOrigData('field_config', $data['config']);
+        }
+
         return $backendModel;
     }
 
@@ -166,9 +181,12 @@ protected function getMetadata()
     {
         if (!$this->metadata) {
             $this->metadata = $this->metadataProvider->get();
-            array_walk($this->metadata, function (&$value) {
-                $value = $value['path'];
-            });
+            array_walk(
+                $this->metadata,
+                function (&$value) {
+                    $value = $value['path'];
+                }
+            );
         }
         return $this->metadata;
     }

app/code/Magento/Theme/Model/Design/Config/ValueChecker.php

@@ -8,6 +8,9 @@
 use Magento\Framework\App\Config as AppConfig;
 use Magento\Framework\App\ScopeFallbackResolverInterface;
 
+/**
+ * Class ValueChecker
+ */
 class ValueChecker
 {
     /**
@@ -61,7 +64,7 @@ public function isDifferentFromDefault($value, $scope, $scopeId, array $fieldCon
                     $fieldConfig
                 ),
                 $this->valueProcessor->process(
-                    $this->appConfig->getValue($fieldConfig['path'], $scope, $scopeId),
+                    ($this->appConfig->getValue($fieldConfig['path'], $scope, $scopeId) ?? ""),
                     $scope,
                     $scopeId,
                     $fieldConfig
@@ -80,12 +83,11 @@ public function isDifferentFromDefault($value, $scope, $scopeId, array $fieldCon
      */
     protected function isEqual($value, $defaultValue)
     {
-        switch (gettype($value)) {
-            case 'array':
-                return $this->isEqualArrays($value, $defaultValue);
-            default:
-                return $value === $defaultValue;
+        if (is_array($value)) {
+            return $this->isEqualArrays($value, $defaultValue);
         }
+
+        return $value === $defaultValue;
     }
 
     /**