Merge branch 'MC-23790' into cia-2.4.4-develop-bugfixes-04112021

admanesachin · admanesachin · commit 48ea7d8cbc2c · 2021-11-05T10:42:08.000-07:00
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -102,6 +102,7 @@ public function prepareDataSource(array $dataSource)
     private function getEscaper()
     {
         if (!$this->escaper) {
+            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
         }
         return $this->escaper;
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Select.php b/app/code/Magento/Ui/Component/Filters/Type/Select.php
@@ -22,7 +22,7 @@ class Select extends AbstractFilter
     const COMPONENT = 'select';
 
     /**
-     * Wrapped component
+     * UI Component
      *
      * @var ElementSelect
      */
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
@@ -19,7 +19,7 @@ class Column extends AbstractComponent implements ColumnInterface
     const NAME = 'column';
 
     /**
-     * Wrapped component
+     * UI component
      *
      * @var UiComponentInterface
      */

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public function prepareDataSource(array $dataSource)`
`102`	`102`	`private function getEscaper()`
`103`	`103`	`{`
`104`	`104`	`if (!$this->escaper) {`
	`105`	`+ // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor`
`105`	`106`	`$this->escaper = ObjectManager::getInstance()->get(Escaper::class);`
`106`	`107`	`}`
`107`	`108`	`return $this->escaper;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class Select extends AbstractFilter`
`22`	`22`	`const COMPONENT = 'select';`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * Wrapped component`
	`25`	`+ * UI Component`
`26`	`26`	`*`
`27`	`27`	`* @var ElementSelect`
`28`	`28`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Column extends AbstractComponent implements ColumnInterface`
`19`	`19`	`const NAME = 'column';`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * Wrapped component`
	`22`	`+ * UI component`
`23`	`23`	`*`
`24`	`24`	`* @var UiComponentInterface`
`25`	`25`	`*/`