MC-18685: Remove custom layout updates from admin

Oleksandr Gorkun · Oleksandr Gorkun · commit 1ea2179bb328 · 2019-10-14T17:58:56.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/LayoutUpdate.php
@@ -25,9 +25,9 @@ class LayoutUpdate extends AbstractLayoutUpdate
     private $manager;
 
     /**
-     * @param LayoutUpdateManager $manager
+     * @param LayoutUpdateManager\Proxy $manager
      */
-    public function __construct(LayoutUpdateManager $manager)
+    public function __construct(LayoutUpdateManager\Proxy $manager)
     {
         $this->manager = $manager;
     }
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/LayoutUpdate.php
@@ -23,9 +23,9 @@ class LayoutUpdate extends AbstractLayoutUpdate
     private $manager;
 
     /**
-     * @param LayoutUpdateManager $manager
+     * @param LayoutUpdateManager\Proxy $manager
      */
-    public function __construct(LayoutUpdateManager $manager)
+    public function __construct(LayoutUpdateManager\Proxy $manager)
     {
         $this->manager = $manager;
     }
diff --git a/app/code/Magento/Catalog/Model/Category/Authorization.php b/app/code/Magento/Catalog/Model/Category/Authorization.php
@@ -77,15 +77,16 @@ private function extractAttributeValue(CategoryModel $category, AttributeInterfa
      * Find values to compare the new one.
      *
      * @param AttributeInterface $attribute
-     * @param CategoryModel|null $oldCategory
+     * @param array|null $oldCategory
      * @return mixed[]
      */
-    private function fetchOldValue(AttributeInterface $attribute, ?CategoryModel $oldCategory): array
+    private function fetchOldValue(AttributeInterface $attribute, ?array $oldCategory): array
     {
         $oldValues = [null];
+        $attrCode = $attribute->getAttributeCode();
         if ($oldCategory) {
             //New value must match saved value exactly
-            $oldValues = [$oldCategory->getData($attribute->getAttributeCode())];
+            $oldValues = [!empty($oldCategory[$attrCode]) ? $oldCategory[$attrCode] : null];
             if (empty($oldValues[0])) {
                 $oldValues[0] = null;
             }
@@ -101,10 +102,10 @@ private function fetchOldValue(AttributeInterface $attribute, ?CategoryModel $ol
      * Determine whether a category has design properties changed.
      *
      * @param CategoryModel $category
-     * @param CategoryModel|null $oldCategory
+     * @param array|null $oldCategory
      * @return bool
      */
-    private function hasChanges(CategoryModel $category, ?CategoryModel $oldCategory): bool
+    private function hasChanges(CategoryModel $category, ?array $oldCategory): bool
     {
         foreach ($category->getDesignAttributes() as $designAttribute) {
             $oldValues = $this->fetchOldValue($designAttribute, $oldCategory);
@@ -134,21 +135,22 @@ private function hasChanges(CategoryModel $category, ?CategoryModel $oldCategory
     public function authorizeSavingOf(CategoryInterface $category): void
     {
         if (!$this->authorization->isAllowed('Magento_Catalog::edit_category_design')) {
-            $savedCategory = null;
+            $oldData = null;
             if ($category->getId()) {
-                /** @var CategoryModel $savedCategory */
-                $savedCategory = $this->categoryFactory->create();
                 if ($category->getOrigData()) {
-                    $savedCategory->setData($category->getOrigData());
+                    $oldData = $category->getOrigData();
                 } else {
+                    /** @var CategoryModel $savedCategory */
+                    $savedCategory = $this->categoryFactory->create();
                     $savedCategory->load($category->getId());
                     if (!$savedCategory->getName()) {
                         throw NoSuchEntityException::singleField('id', $category->getId());
                     }
+                    $oldData = $savedCategory->getData();
                 }
             }
 
-            if ($this->hasChanges($category, $savedCategory)) {
+            if ($this->hasChanges($category, $oldData)) {
                 throw new AuthorizationException(__('Not allowed to edit the category\'s design attributes'));
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/LayoutUpdate.php
@@ -25,9 +25,9 @@ class LayoutUpdate extends AbstractLayoutUpdate
     private $manager;
 
     /**
-     * @param LayoutUpdateManager $manager
+     * @param LayoutUpdateManager\Proxy $manager
      */
-    public function __construct(LayoutUpdateManager $manager)
+    public function __construct(LayoutUpdateManager\Proxy $manager)
     {
         $this->manager = $manager;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/LayoutUpdate.php
@@ -23,9 +23,9 @@ class LayoutUpdate extends AbstractLayoutUpdate
     private $manager;
 
     /**
-     * @param LayoutUpdateManager $manager
+     * @param LayoutUpdateManager\Proxy $manager
      */
-    public function __construct(LayoutUpdateManager $manager)
+    public function __construct(LayoutUpdateManager\Proxy $manager)
     {
         $this->manager = $manager;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Authorization.php b/app/code/Magento/Catalog/Model/Product/Authorization.php
@@ -77,14 +77,15 @@ private function extractAttributeValue(ProductModel $product, AttributeInterface
      * Prepare old values to compare to.
      *
      * @param AttributeInterface $attribute
-     * @param ProductModel|null $oldProduct
+     * @param array|null $oldProduct
      * @return array
      */
-    private function fetchOldValues(AttributeInterface $attribute, ?ProductModel $oldProduct): array
+    private function fetchOldValues(AttributeInterface $attribute, ?array $oldProduct): array
     {
+        $attrCode = $attribute->getAttributeCode();
         if ($oldProduct) {
             //New value may only be the saved value
-            $oldValues = [$oldProduct->getData($attribute->getAttributeCode())];
+            $oldValues = [!empty($oldProduct[$attrCode]) ? $oldProduct[$attrCode] : null];
             if (empty($oldValues[0])) {
                 $oldValues[0] = null;
             }
@@ -100,10 +101,10 @@ private function fetchOldValues(AttributeInterface $attribute, ?ProductModel $ol
      * Check whether the product has changed.
      *
      * @param ProductModel $product
-     * @param ProductModel|null $oldProduct
+     * @param array|null $oldProduct
      * @return bool
      */
-    private function hasProductChanged(ProductModel $product, ?ProductModel $oldProduct = null): bool
+    private function hasProductChanged(ProductModel $product, ?array $oldProduct = null): bool
     {
         $designAttributes = [
             'custom_design',
@@ -147,20 +148,21 @@ private function hasProductChanged(ProductModel $product, ?ProductModel $oldProd
     public function authorizeSavingOf(ProductInterface $product): void
     {
         if (!$this->authorization->isAllowed('Magento_Catalog::edit_product_design')) {
-            $savedProduct = null;
+            $oldData = null;
             if ($product->getId()) {
-                /** @var ProductModel $savedProduct */
-                $savedProduct = $this->productFactory->create();
                 if ($product->getOrigData()) {
-                    $savedProduct->setData($product->getOrigData());
+                    $oldData = $product->getOrigData();
                 } else {
+                    /** @var ProductModel $savedProduct */
+                    $savedProduct = $this->productFactory->create();
                     $savedProduct->load($product->getId());
                     if (!$savedProduct->getSku()) {
                         throw NoSuchEntityException::singleField('id', $product->getId());
                     }
+                    $oldData = $product->getOrigData();
                 }
             }
-            if ($this->hasProductChanged($product, $savedProduct)) {
+            if ($this->hasProductChanged($product, $oldData)) {
                 throw new AuthorizationException(__('Not allowed to edit the product\'s design attributes'));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ class LayoutUpdate extends AbstractLayoutUpdate`
`25`	`25`	`private $manager;`
`26`	`26`
`27`	`27`	`/**`
`28`		`- * @param LayoutUpdateManager $manager`
	`28`	`+ * @param LayoutUpdateManager\Proxy $manager`
`29`	`29`	`*/`
`30`		`- public function __construct(LayoutUpdateManager $manager)`
	`30`	`+ public function __construct(LayoutUpdateManager\Proxy $manager)`
`31`	`31`	`{`
`32`	`32`	`$this->manager = $manager;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ class LayoutUpdate extends AbstractLayoutUpdate`
`23`	`23`	`private $manager;`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * @param LayoutUpdateManager $manager`
	`26`	`+ * @param LayoutUpdateManager\Proxy $manager`
`27`	`27`	`*/`
`28`		`- public function __construct(LayoutUpdateManager $manager)`
	`28`	`+ public function __construct(LayoutUpdateManager\Proxy $manager)`
`29`	`29`	`{`
`30`	`30`	`$this->manager = $manager;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,15 +77,16 @@ private function extractAttributeValue(CategoryModel $category, AttributeInterfa`
`77`	`77`	`* Find values to compare the new one.`
`78`	`78`	`*`
`79`	`79`	`* @param AttributeInterface $attribute`
`80`		`- * @param CategoryModel\|null $oldCategory`
	`80`	`+ * @param array\|null $oldCategory`
`81`	`81`	`* @return mixed[]`
`82`	`82`	`*/`
`83`		`- private function fetchOldValue(AttributeInterface $attribute, ?CategoryModel $oldCategory): array`
	`83`	`+ private function fetchOldValue(AttributeInterface $attribute, ?array $oldCategory): array`
`84`	`84`	`{`
`85`	`85`	`$oldValues = [null];`
	`86`	`+ $attrCode = $attribute->getAttributeCode();`
`86`	`87`	`if ($oldCategory) {`
`87`	`88`	`//New value must match saved value exactly`
`88`		`- $oldValues = [$oldCategory->getData($attribute->getAttributeCode())];`
	`89`	`+ $oldValues = [!empty($oldCategory[$attrCode]) ? $oldCategory[$attrCode] : null];`
`89`	`90`	`if (empty($oldValues[0])) {`
`90`	`91`	`$oldValues[0] = null;`
`91`	`92`	`}`
`@@ -101,10 +102,10 @@ private function fetchOldValue(AttributeInterface $attribute, ?CategoryModel $ol`
`101`	`102`	`* Determine whether a category has design properties changed.`
`102`	`103`	`*`
`103`	`104`	`* @param CategoryModel $category`
`104`		`- * @param CategoryModel\|null $oldCategory`
	`105`	`+ * @param array\|null $oldCategory`
`105`	`106`	`* @return bool`
`106`	`107`	`*/`
`107`		`- private function hasChanges(CategoryModel $category, ?CategoryModel $oldCategory): bool`
	`108`	`+ private function hasChanges(CategoryModel $category, ?array $oldCategory): bool`
`108`	`109`	`{`
`109`	`110`	`foreach ($category->getDesignAttributes() as $designAttribute) {`
`110`	`111`	`$oldValues = $this->fetchOldValue($designAttribute, $oldCategory);`
`@@ -134,21 +135,22 @@ private function hasChanges(CategoryModel $category, ?CategoryModel $oldCategory`
`134`	`135`	`public function authorizeSavingOf(CategoryInterface $category): void`
`135`	`136`	`{`
`136`	`137`	`if (!$this->authorization->isAllowed('Magento_Catalog::edit_category_design')) {`
`137`		`- $savedCategory = null;`
	`138`	`+ $oldData = null;`
`138`	`139`	`if ($category->getId()) {`
`139`		`- /** @var CategoryModel $savedCategory */`
`140`		`- $savedCategory = $this->categoryFactory->create();`
`141`	`140`	`if ($category->getOrigData()) {`
`142`		`- $savedCategory->setData($category->getOrigData());`
	`141`	`+ $oldData = $category->getOrigData();`
`143`	`142`	`} else {`
	`143`	`+ /** @var CategoryModel $savedCategory */`
	`144`	`+ $savedCategory = $this->categoryFactory->create();`
`144`	`145`	`$savedCategory->load($category->getId());`
`145`	`146`	`if (!$savedCategory->getName()) {`
`146`	`147`	`throw NoSuchEntityException::singleField('id', $category->getId());`
`147`	`148`	`}`
	`149`	`+ $oldData = $savedCategory->getData();`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`
`151`		`- if ($this->hasChanges($category, $savedCategory)) {`
	`153`	`+ if ($this->hasChanges($category, $oldData)) {`
`152`	`154`	`throw new AuthorizationException(__('Not allowed to edit the category\'s design attributes'));`
`153`	`155`	`}`
`154`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,15 @@ private function extractAttributeValue(ProductModel $product, AttributeInterface`
`77`	`77`	`* Prepare old values to compare to.`
`78`	`78`	`*`
`79`	`79`	`* @param AttributeInterface $attribute`
`80`		`- * @param ProductModel\|null $oldProduct`
	`80`	`+ * @param array\|null $oldProduct`
`81`	`81`	`* @return array`
`82`	`82`	`*/`
`83`		`- private function fetchOldValues(AttributeInterface $attribute, ?ProductModel $oldProduct): array`
	`83`	`+ private function fetchOldValues(AttributeInterface $attribute, ?array $oldProduct): array`
`84`	`84`	`{`
	`85`	`+ $attrCode = $attribute->getAttributeCode();`
`85`	`86`	`if ($oldProduct) {`
`86`	`87`	`//New value may only be the saved value`
`87`		`- $oldValues = [$oldProduct->getData($attribute->getAttributeCode())];`
	`88`	`+ $oldValues = [!empty($oldProduct[$attrCode]) ? $oldProduct[$attrCode] : null];`
`88`	`89`	`if (empty($oldValues[0])) {`
`89`	`90`	`$oldValues[0] = null;`
`90`	`91`	`}`
`@@ -100,10 +101,10 @@ private function fetchOldValues(AttributeInterface $attribute, ?ProductModel $ol`
`100`	`101`	`* Check whether the product has changed.`
`101`	`102`	`*`
`102`	`103`	`* @param ProductModel $product`
`103`		`- * @param ProductModel\|null $oldProduct`
	`104`	`+ * @param array\|null $oldProduct`
`104`	`105`	`* @return bool`
`105`	`106`	`*/`
`106`		`- private function hasProductChanged(ProductModel $product, ?ProductModel $oldProduct = null): bool`
	`107`	`+ private function hasProductChanged(ProductModel $product, ?array $oldProduct = null): bool`
`107`	`108`	`{`
`108`	`109`	`$designAttributes = [`
`109`	`110`	`'custom_design',`
`@@ -147,20 +148,21 @@ private function hasProductChanged(ProductModel $product, ?ProductModel $oldProd`
`147`	`148`	`public function authorizeSavingOf(ProductInterface $product): void`
`148`	`149`	`{`
`149`	`150`	`if (!$this->authorization->isAllowed('Magento_Catalog::edit_product_design')) {`
`150`		`- $savedProduct = null;`
	`151`	`+ $oldData = null;`
`151`	`152`	`if ($product->getId()) {`
`152`		`- /** @var ProductModel $savedProduct */`
`153`		`- $savedProduct = $this->productFactory->create();`
`154`	`153`	`if ($product->getOrigData()) {`
`155`		`- $savedProduct->setData($product->getOrigData());`
	`154`	`+ $oldData = $product->getOrigData();`
`156`	`155`	`} else {`
	`156`	`+ /** @var ProductModel $savedProduct */`
	`157`	`+ $savedProduct = $this->productFactory->create();`
`157`	`158`	`$savedProduct->load($product->getId());`
`158`	`159`	`if (!$savedProduct->getSku()) {`
`159`	`160`	`throw NoSuchEntityException::singleField('id', $product->getId());`
`160`	`161`	`}`
	`162`	`+ $oldData = $product->getOrigData();`
`161`	`163`	`}`
`162`	`164`	`}`
`163`		`- if ($this->hasProductChanged($product, $savedProduct)) {`
	`165`	`+ if ($this->hasProductChanged($product, $oldData)) {`
`164`	`166`	`throw new AuthorizationException(__('Not allowed to edit the product\'s design attributes'));`
`165`	`167`	`}`
`166`	`168`	`}`