Merge branch '2.3-develop' into MC-40591

Author: fascinosum

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

@@ -13,26 +13,26 @@
 use Magento\Framework\App\CacheInterface;
 
 /**
- * Class CanViewNotificationTest
+ * Test of CanViewNotification
  */
 class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
 {
     /** @var CanViewNotification */
     private $canViewNotification;
 
-    /** @var  Logger|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Logger|\PHPUnit\Framework\MockObject\MockObject */
     private $viewerLoggerMock;
 
-    /** @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ProductMetadataInterface|\PHPUnit\Framework\MockObject\MockObject */
     private $productMetadataMock;
 
-    /** @var  Log|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Log|\PHPUnit\Framework\MockObject\MockObject */
     private $logMock;
 
-    /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
+    /** @var  $cacheStorageMock \PHPUnit\Framework\MockObject\MockObject|CacheInterface */
     private $cacheStorageMock;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();
@@ -43,7 +43,7 @@ public function setUp()
             ->getMock();
         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -25,7 +25,7 @@ protected function _getBlockInstance($unreadNotifications)
             \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class,
             ['getSize', 'setCurPage', 'setPageSize']
         );
-        $notificationList->expects($this->any())->method('getSize')->will($this->returnValue($unreadNotifications));
+        $notificationList->expects($this->any())->method('getSize')->willReturn($unreadNotifications);
 
         $block = $objectManagerHelper->getObject(
             \Magento\AdminNotification\Block\ToolbarEntry::class,
@@ -63,7 +63,7 @@ public function testGetLatestUnreadNotifications()
         $notificationList->expects($this->atLeastOnce())
             ->method('setPageSize')
             ->with(\Magento\AdminNotification\Block\ToolbarEntry::NOTIFICATIONS_NUMBER)
-            ->will($this->returnSelf());
+            ->willReturnSelf();
 
         // 3. Run tested method
         $result = $model->getLatestUnreadNotifications();

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -20,37 +20,37 @@ class FeedTest extends \PHPUnit\Framework\TestCase
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
 
-    /** @var \Magento\AdminNotification\Model\InboxFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\AdminNotification\Model\InboxFactory|\PHPUnit\Framework\MockObject\MockObject */
     protected $inboxFactory;
 
-    /** @var \Magento\AdminNotification\Model\Inbox|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\AdminNotification\Model\Inbox|\PHPUnit\Framework\MockObject\MockObject */
     protected $inboxModel;
 
-    /** @var \Magento\Framework\HTTP\Adapter\CurlFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\HTTP\Adapter\CurlFactory|\PHPUnit\Framework\MockObject\MockObject */
     protected $curlFactory;
 
-    /** @var \Magento\Framework\HTTP\Adapter\Curl|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\HTTP\Adapter\Curl|\PHPUnit\Framework\MockObject\MockObject */
     protected $curl;
 
-    /** @var \Magento\Backend\App\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Backend\App\ConfigInterface|\PHPUnit\Framework\MockObject\MockObject */
     protected $backendConfig;
 
-    /** @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\CacheInterface|\PHPUnit\Framework\MockObject\MockObject */
     protected $cacheManager;
 
-    /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\State|\PHPUnit\Framework\MockObject\MockObject */
     protected $appState;
 
-    /** @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\DeploymentConfig|\PHPUnit\Framework\MockObject\MockObject */
     protected $deploymentConfig;
 
-    /** @var \Magento\Framework\App\ProductMetadata|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\ProductMetadata|\PHPUnit\Framework\MockObject\MockObject */
     protected $productMetadata;
 
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\UrlInterface|\PHPUnit\Framework\MockObject\MockObject */
     protected $urlBuilder;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->inboxFactory = $this->createPartialMock(
             \Magento\AdminNotification\Model\InboxFactory::class,
@@ -133,19 +133,19 @@ public function testCheckUpdate($callInbox, $curlRequest)
 
         $lastUpdate = 0;
         $this->cacheManager->expects($this->once())->method('load')->will(($this->returnValue($lastUpdate)));
-        $this->curlFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->curl));
+        $this->curlFactory->expects($this->at(0))->method('create')->willReturn($this->curl);
         $this->curl->expects($this->once())->method('setConfig')->with($configValues)->willReturnSelf();
-        $this->curl->expects($this->once())->method('read')->will($this->returnValue($curlRequest));
-        $this->backendConfig->expects($this->at(0))->method('getValue')->will($this->returnValue('1'));
-        $this->backendConfig->expects($this->once())->method('isSetFlag')->will($this->returnValue(false));
+        $this->curl->expects($this->once())->method('read')->willReturn($curlRequest);
+        $this->backendConfig->expects($this->at(0))->method('getValue')->willReturn('1');
+        $this->backendConfig->expects($this->once())->method('isSetFlag')->willReturn(false);
         $this->backendConfig->expects($this->at(1))->method('getValue')
-            ->will($this->returnValue('http://feed.magento.com'));
+            ->willReturn('http://feed.magento.com');
         $this->deploymentConfig->expects($this->once())->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
-            ->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
+            ->willReturn('Sat, 6 Sep 2014 16:46:11 UTC');
         if ($callInbox) {
             $this->inboxFactory->expects($this->once())->method('create')
-                ->will($this->returnValue($this->inboxModel));
+                ->willReturn($this->inboxModel);
             $this->inboxModel->expects($this->once())
                 ->method('parse')
                 ->with(
@@ -165,7 +165,7 @@ function ($initialValue, $item) use ($data) {
                         }
                     )
                 )
-                ->will($this->returnSelf());
+                ->willReturnSelf();
         } else {
             $this->inboxFactory->expects($this->never())->method('create');
             $this->inboxModel->expects($this->never())->method('parse');

app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -21,7 +21,7 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
     {
         /**
          * @var
-         *  $notificationFactory \PHPUnit_Framework_MockObject_MockObject|\Magento\AdminNotification\Model\InboxFactory
+         *  $notificationFactory \PHPUnit\Framework\MockObject\MockObject|\Magento\AdminNotification\Model\InboxFactory
          */
         $notificationFactory = $this->createPartialMock(
             \Magento\AdminNotification\Model\InboxFactory::class,
@@ -31,16 +31,16 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
             \Magento\AdminNotification\Model\Inbox::class,
             ['load', 'getId', 'save', 'setIsRead', '__sleep', '__wakeup']
         );
-        $notification->expects($this->once())->method('load')->with($notificationId)->will($this->returnSelf());
-        $notification->expects($this->once())->method('getId')->will($this->returnValue($notificationId));
+        $notification->expects($this->once())->method('load')->with($notificationId)->willReturnSelf();
+        $notification->expects($this->once())->method('getId')->willReturn($notificationId);
 
         // when notification Id is valid, add additional expectations
         if ($notificationId) {
-            $notification->expects($this->once())->method('save')->will($this->returnSelf());
-            $notification->expects($this->once())->method('setIsRead')->with(1)->will($this->returnSelf());
+            $notification->expects($this->once())->method('save')->willReturnSelf();
+            $notification->expects($this->once())->method('setIsRead')->with(1)->willReturnSelf();
         }
 
-        $notificationFactory->expects($this->once())->method('create')->will($this->returnValue($notification));
+        $notificationFactory->expects($this->once())->method('create')->willReturn($notification);
         return new \Magento\AdminNotification\Model\NotificationService($notificationFactory);
     }
 
@@ -52,11 +52,12 @@ public function testMarkAsRead()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Wrong notification ID specified.
      */
     public function testMarkAsReadThrowsExceptionWhenNotificationIdIsInvalid()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Wrong notification ID specified.');
+
         $notificationId = null;
         $service = $this->_getServiceInstanceForMarkAsReadTest($notificationId);
         $service->markAsRead($notificationId);

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -8,17 +8,17 @@
 class CacheOutdatedTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_authorizationMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_cacheTypeListMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_urlInterfaceMock;
 
@@ -27,7 +27,7 @@ class CacheOutdatedTest extends \PHPUnit\Framework\TestCase
      */
     protected $_messageModel;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->_authorizationMock = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
         $this->_urlInterfaceMock = $this->createMock(\Magento\Framework\UrlInterface::class);
@@ -56,8 +56,8 @@ public function testGetIdentity($expectedSum, $cacheTypes)
             $this->any()
         )->method(
             'getInvalidated'
-        )->will(
-            $this->returnValue($cacheTypes)
+        )->willReturn(
+            $cacheTypes
         );
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
@@ -68,10 +68,10 @@ public function testGetIdentity($expectedSum, $cacheTypes)
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypeMock1->expects($this->any())->method('getCacheType')->will($this->returnValue('Simple'));
+        $cacheTypeMock1->expects($this->any())->method('getCacheType')->willReturn('Simple');
 
         $cacheTypeMock2 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypeMock2->expects($this->any())->method('getCacheType')->will($this->returnValue('Advanced'));
+        $cacheTypeMock2->expects($this->any())->method('getCacheType')->willReturn('Advanced');
 
         return [
             ['c13cfaddc2c53e8d32f59bfe89719beb', [$cacheTypeMock1]],
@@ -87,13 +87,13 @@ public function getIdentityDataProvider()
      */
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
-        $this->_authorizationMock->expects($this->once())->method('isAllowed')->will($this->returnValue($allowed));
+        $this->_authorizationMock->expects($this->once())->method('isAllowed')->willReturn($allowed);
         $this->_cacheTypeListMock->expects(
             $this->any()
         )->method(
             'getInvalidated'
-        )->will(
-            $this->returnValue($cacheTypes)
+        )->willReturn(
+            $cacheTypes
         );
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
@@ -104,7 +104,7 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypesMock->expects($this->any())->method('getCacheType')->will($this->returnValue('someVal'));
+        $cacheTypesMock->expects($this->any())->method('getCacheType')->willReturn('someVal');
         $cacheTypes = [$cacheTypesMock, $cacheTypesMock];
         return [
             [false, false, []],
@@ -118,15 +118,15 @@ public function testGetText()
     {
         $messageText = 'One or more of the Cache Types are invalidated';
 
-        $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->will($this->returnValue([]));
-        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->will($this->returnValue('someURL'));
-        $this->assertContains($messageText, $this->_messageModel->getText());
+        $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->willReturn([]);
+        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->willReturn('someURL');
+        $this->assertStringContainsString($messageText, $this->_messageModel->getText());
     }
 
     public function testGetLink()
     {
         $url = 'backend/admin/cache';
-        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->will($this->returnValue($url));
+        $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->willReturn($url);
         $this->assertEquals($url, $this->_messageModel->getLink());
     }
 }

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -8,12 +8,12 @@
 class ErrorTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_syncFlagMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_fileStorage;
 
@@ -22,15 +22,15 @@ class ErrorTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->_syncFlagMock = $this->createPartialMock(
             \Magento\MediaStorage\Model\File\Storage\Flag::class,
             ['setState', 'save', 'getFlagData']
         );
 
         $this->_fileStorage = $this->createMock(\Magento\MediaStorage\Model\File\Storage\Flag::class);
-        $this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
+        $this->_fileStorage->expects($this->any())->method('loadSelf')->willReturn($this->_syncFlagMock);
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $arguments = ['fileStorage' => $this->_fileStorage];
@@ -44,7 +44,7 @@ public function testGetText()
     {
         $messageText = 'We were unable to synchronize one or more media files.';
 
-        $this->assertContains($messageText, (string)$this->_model->getText());
+        $this->assertStringContainsString($messageText, (string)$this->_model->getText());
     }
 
     /**
@@ -65,7 +65,7 @@ public function testIsDisplayed($expectedFirstRun, $data)
 
         $this->_syncFlagMock->expects($this->any())->method('setState');
         $this->_syncFlagMock->expects($this->any())->method('save');
-        $this->_syncFlagMock->expects($this->any())->method('getFlagData')->will($this->returnValue($data));
+        $this->_syncFlagMock->expects($this->any())->method('getFlagData')->willReturn($data);
         //check first call
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
         //check second call(another branch of if operator)

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -8,22 +8,22 @@
 class SecurityTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_cacheMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_scopeConfigMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_configMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_curlFactoryMock;
 
@@ -32,7 +32,7 @@ class SecurityTest extends \PHPUnit\Framework\TestCase
      */
     protected $_messageModel;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         //Prepare objects for constructor
         $this->_cacheMock = $this->createMock(\Magento\Framework\App\CacheInterface::class);
@@ -64,14 +64,14 @@ protected function setUp()
      */
     public function testIsDisplayed($expectedResult, $cached, $response)
     {
-        $this->_cacheMock->expects($this->any())->method('load')->will($this->returnValue($cached));
-        $this->_cacheMock->expects($this->any())->method('save')->will($this->returnValue(null));
+        $this->_cacheMock->expects($this->any())->method('load')->willReturn($cached);
+        $this->_cacheMock->expects($this->any())->method('save')->willReturn(null);
 
         $httpAdapterMock = $this->createMock(\Magento\Framework\HTTP\Adapter\Curl::class);
-        $httpAdapterMock->expects($this->any())->method('read')->will($this->returnValue($response));
-        $this->_curlFactoryMock->expects($this->any())->method('create')->will($this->returnValue($httpAdapterMock));
+        $httpAdapterMock->expects($this->any())->method('read')->willReturn($response);
+        $this->_curlFactoryMock->expects($this->any())->method('create')->willReturn($httpAdapterMock);
 
-        $this->_scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
+        $this->_scopeConfigMock->expects($this->any())->method('getValue')->willReturn(null);
 
         $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
     }