MC-18685: Remove custom layout updates from admin

Oleksandr Gorkun · Oleksandr Gorkun · commit 0e82323ff34d · 2019-10-15T10:56:44.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\Proxy $manager
+     * @param LayoutUpdateManager $manager
      */
-    public function __construct(LayoutUpdateManager\Proxy $manager)
+    public function __construct(LayoutUpdateManager $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\Proxy $manager
+     * @param LayoutUpdateManager $manager
      */
-    public function __construct(LayoutUpdateManager\Proxy $manager)
+    public function __construct(LayoutUpdateManager $manager)
     {
         $this->manager = $manager;
     }
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\Proxy $manager
+     * @param LayoutUpdateManager $manager
      */
-    public function __construct(LayoutUpdateManager\Proxy $manager)
+    public function __construct(LayoutUpdateManager $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\Proxy $manager
+     * @param LayoutUpdateManager $manager
      */
-    public function __construct(LayoutUpdateManager\Proxy $manager)
+    public function __construct(LayoutUpdateManager $manager)
     {
         $this->manager = $manager;
     }
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
@@ -1186,4 +1186,24 @@
             <argument name="themeFactory" xsi:type="object">Magento\Framework\View\Design\Theme\FlyweightFactory\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\Source\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Source\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
 </config>

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\Proxy $manager`
	`28`	`+ * @param LayoutUpdateManager $manager`
`29`	`29`	`*/`
`30`		`- public function __construct(LayoutUpdateManager\Proxy $manager)`
	`30`	`+ public function __construct(LayoutUpdateManager $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\Proxy $manager`
	`26`	`+ * @param LayoutUpdateManager $manager`
`27`	`27`	`*/`
`28`		`- public function __construct(LayoutUpdateManager\Proxy $manager)`
	`28`	`+ public function __construct(LayoutUpdateManager $manager)`
`29`	`29`	`{`
`30`	`30`	`$this->manager = $manager;`
`31`	`31`	`}`