MC-30175: UI component rendering config

- Resolved static and unit test failures

Author: Hwashiang Yu

app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php

@@ -11,14 +11,15 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * MassAction test for Component Product
  */
 class MassActionTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContextInterface|MockObject
      */
     private $contextMock;
 
@@ -28,7 +29,7 @@ class MassActionTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AuthorizationInterface|MockObject
      */
     private $authorizationMock;
 

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -186,7 +186,6 @@ private function prepareMeta()
 
         if ($pathField) {
             $fieldsetPath = $this->arrayManager->slicePath($pathField, 0, -4);
-
             $this->meta = $this->arrayManager->merge(
                 $pathField . '/arguments/data/config',
                 $this->meta,
@@ -271,7 +270,6 @@ private function prepareMeta()
                 'qty' => $qty,
                 'advanced_inventory_button' => $advancedInventoryButton,
             ];
-
             $this->meta = $this->arrayManager->merge(
                 $fieldsetPath . '/children',
                 $this->meta,

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php

@@ -11,7 +11,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * BlockActionsTest contains unit tests for \Magento\Cms\Ui\Component\Listing\Column\BlockActions class.

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php

@@ -15,7 +15,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test for Magento\Cms\Ui\Component\Listing\Column\PageActions class.

app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Config\Test\Unit\Model\Config\Source\Email;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * Test class for Template.
  */
@@ -17,12 +19,12 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Registry|MockObject
      */
     protected $_coreRegistry;
 
     /**
-     * @var \Magento\Email\Model\Template\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Email\Model\Template\Config|MockObject
      */
     protected $_emailConfig;
 

app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

@@ -26,7 +26,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Unit tests for \Magento\Customer\Model\Customer\DataProvider class.

app/code/Magento/Customer/Test/Unit/Ui/Component/ColumnFactoryTest.php

@@ -6,28 +6,29 @@
 namespace Magento\Customer\Test\Unit\Ui\Component;
 
 use Magento\Customer\Ui\Component\ColumnFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test ColumnFactory Class
  */
 class ColumnFactoryTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Customer\Api\Data\OptionInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Customer\Api\Data\OptionInterface|MockObject */
     protected $attributeOption;
 
-    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|MockObject */
     protected $context;
 
-    /** @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponentFactory|MockObject */
     protected $componentFactory;
 
-    /** @var \Magento\Customer\Api\Data\AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Customer\Api\Data\AttributeMetadataInterface|MockObject */
     protected $attributeMetadata;
 
-    /** @var \Magento\Ui\Component\Listing\Columns\ColumnInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Ui\Component\Listing\Columns\ColumnInterface|MockObject */
     protected $column;
 
-    /** @var \Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater|MockObject */
     protected $inlineEditUpdater;
 
     /** @var ColumnFactory */

app/code/Magento/Customer/Test/Unit/Ui/Component/FilterFactoryTest.php

@@ -6,25 +6,26 @@
 namespace Magento\Customer\Test\Unit\Ui\Component;
 
 use Magento\Customer\Ui\Component\FilterFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test FilterFactory Class
  */
 class FilterFactoryTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Customer\Api\Data\OptionInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Customer\Api\Data\OptionInterface|MockObject */
     protected $attributeOption;
 
-    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|MockObject */
     protected $context;
 
-    /** @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponentFactory|MockObject */
     protected $componentFactory;
 
-    /** @var \Magento\Customer\Api\Data\AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Customer\Api\Data\AttributeMetadataInterface|MockObject */
     protected $attributeMetadata;
 
-    /** @var \Magento\Ui\Component\Listing\Columns\ColumnInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Ui\Component\Listing\Columns\ColumnInterface|MockObject */
     protected $filter;
 
     /** @var FilterFactory */

app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
 
 use Magento\Customer\Ui\Component\Listing\Column\Actions;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class Actions test for Listing Colummn
@@ -15,13 +16,13 @@ class ActionsTest extends \PHPUnit\Framework\TestCase
     /** @var Actions */
     protected $component;
 
-    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|MockObject */
     protected $context;
 
-    /** @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Element\UiComponentFactory|MockObject */
     protected $uiComponentFactory;
 
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\UrlInterface|MockObject */
     protected $urlBuilder;
 
     public function setup()

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/Status/OptionsTest.php

@@ -8,6 +8,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
 use Magento\Sales\Ui\Component\Listing\Column\Status\Options;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class Options test for Listing Column Status
@@ -20,7 +21,7 @@ class OptionsTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
     protected $collectionFactoryMock;