Merge remote-tracking branch 'origin/phpunit8' into phpunit8/module-C…

…onfigurableProduct

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -8,9 +8,9 @@
 use Magento\AdminAnalytics\Model\Condition\CanViewNotification;
 use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger;
 use Magento\AdminAnalytics\Model\Viewer\Log;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\App\CacheInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -35,14 +35,9 @@ protected function setUp(): void
     {
         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();
-        $this->logMock = $this->getMockBuilder(Log::class)
-            ->getMock();
-        $this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->logMock = $this->createMock(Log::class);
+        $this->viewerLoggerMock = $this->createMock(Logger::class);
+        $this->productMetadataMock = $this->createMock(ProductMetadataInterface::class);
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/ActionsTest.php

@@ -34,20 +34,20 @@ protected function setUp() : void
         parent::setUp();
 
         /** @var Escaper|MockObject $escaperMock */
-        $escaperMock = $this->getMockBuilder(Escaper::class)->disableOriginalConstructor()->getMock();
+        $escaperMock = $this->createMock(Escaper::class);
         $escaperMock->expects($this->once())->method('escapeUrl')->willReturn('https://magento.com');
 
         /** @var UrlInterface|MockObject $urlBuilder */
-        $urlBuilder = $this->getMockBuilder(UrlInterface::class)->getMock();
+        $urlBuilder = $this->createMock(UrlInterface::class);
         $urlBuilder->expects($this->once())->method('getUrl')->willReturn('http://magento.com');
 
         /** @var Context|MockObject $contextMock */
-        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $contextMock = $this->createMock(Context::class);
         $contextMock->expects($this->once())->method('getEscaper')->willReturn($escaperMock);
         $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($urlBuilder);
 
         /** @var Data|MockObject $urlHelperMock */
-        $urlHelperMock = $this->getMockBuilder(Data::class)->disableOriginalConstructor()->getMock();
+        $urlHelperMock = $this->createMock(Data::class);
         $urlHelperMock->expects($this->once())->method('getEncodedUrl')->willReturn('http://magento.com');
 
         $this->sut = new Actions($contextMock, $urlHelperMock);

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/NoticeTest.php

@@ -12,9 +12,9 @@
 namespace Magento\AdminNotification\Test\Unit\Block\Grid\Renderer;
 
 use Magento\AdminNotification\Block\Grid\Renderer\Notice;
+use Magento\Backend\Block\Context;
 use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
-use Magento\Backend\Block\Context;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -32,11 +32,11 @@ protected function setUp() : void
         parent::setUp();
 
         /** @var Escaper|MockObject $escaperMock */
-        $escaperMock = $this->getMockBuilder(Escaper::class)->disableOriginalConstructor()->getMock();
+        $escaperMock = $this->createMock(Escaper::class);
         $escaperMock->expects($this->exactly(2))->method('escapeHtml')->willReturn('<div>Some random html</div>');
 
         /** @var Context|MockObject $contextMock */
-        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $contextMock = $this->createMock(Context::class);
         $contextMock->expects($this->once())->method('getEscaper')->willReturn($escaperMock);
 
         $this->sut = new Notice($contextMock);

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -16,7 +16,6 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Framework\DataObject;
-use Magento\Framework\Escaper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,10 +33,10 @@ protected function setUp() : void
         parent::setUp();
 
         /** @var Inbox|MockObject $inboxMock */
-        $inboxMock = $this->getMockBuilder(Inbox::class)->disableOriginalConstructor()->getMock();
+        $inboxMock = $this->createMock(Inbox::class);
 
         /** @var Context|MockObject $contextMock */
-        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $contextMock = $this->createMock(Context::class);
 
         $this->sut = new Severity($contextMock, $inboxMock);
     }

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -30,7 +30,7 @@ protected function _getBlockInstance($unreadNotifications)
             Unread::class,
             ['getSize', 'setCurPage', 'setPageSize']
         );
-        $notificationList->expects($this->any())->method('getSize')->will($this->returnValue($unreadNotifications));
+        $notificationList->method('getSize')->will($this->returnValue($unreadNotifications));
 
         $block = $objectManagerHelper->getObject(
             ToolbarEntry::class,
@@ -52,9 +52,7 @@ public function testGetLatestUnreadNotifications()
         $helper = new ObjectManager($this);
 
         // 1. Create mocks
-        $notificationList = $this->getMockBuilder(Unread::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $notificationList = $this->createMock(Unread::class);
 
         /** @var ToolbarEntry $model */
         $model = $helper->getObject(

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -70,8 +70,7 @@ protected function setUp(): void
             ['create']
         );
         $this->curlFactory = $this->createPartialMock(CurlFactory::class, ['create']);
-        $this->curl = $this->getMockBuilder(Curl::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->curl = $this->createMock(Curl::class);
         $this->appState = $this->createPartialMock(State::class, []);
         $this->inboxModel = $this->createPartialMock(Inbox::class, [
                 '__wakeup',
@@ -96,13 +95,11 @@ protected function setUp(): void
             ]
         );
 
-        $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->productMetadata = $this->getMockBuilder(ProductMetadata::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->productMetadata = $this->createMock(ProductMetadata::class);
 
         $this->urlBuilder = $this->createMock(UrlInterface::class);
 

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -60,9 +60,7 @@ protected function setUp(): void
      */
     public function testGetIdentity($expectedSum, $cacheTypes)
     {
-        $this->_cacheTypeListMock->expects(
-            $this->any()
-        )->method(
+        $this->_cacheTypeListMock->method(
             'getInvalidated'
         )->will(
             $this->returnValue($cacheTypes)
@@ -76,10 +74,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->method('getCacheType')->will($this->returnValue('Simple'));
 
         $cacheTypeMock2 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
-        $cacheTypeMock2->expects($this->any())->method('getCacheType')->will($this->returnValue('Advanced'));
+        $cacheTypeMock2->method('getCacheType')->will($this->returnValue('Advanced'));
 
         return [
             ['c13cfaddc2c53e8d32f59bfe89719beb', [$cacheTypeMock1]],
@@ -96,9 +94,7 @@ public function getIdentityDataProvider()
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
         $this->_authorizationMock->expects($this->once())->method('isAllowed')->will($this->returnValue($allowed));
-        $this->_cacheTypeListMock->expects(
-            $this->any()
-        )->method(
+        $this->_cacheTypeListMock->method(
             'getInvalidated'
         )->will(
             $this->returnValue($cacheTypes)
@@ -112,7 +108,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->method('getCacheType')->will($this->returnValue('someVal'));
         $cacheTypes = [$cacheTypesMock, $cacheTypesMock];
         return [
             [false, false, []],
@@ -126,7 +122,7 @@ public function testGetText()
     {
         $messageText = 'One or more of the Cache Types are invalidated';
 
-        $this->_cacheTypeListMock->expects($this->any())->method('getInvalidated')->will($this->returnValue([]));
+        $this->_cacheTypeListMock->method('getInvalidated')->will($this->returnValue([]));
         $this->_urlInterfaceMock->expects($this->once())->method('getUrl')->will($this->returnValue('someURL'));
         $this->assertContains($messageText, $this->_messageModel->getText());
     }

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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -37,7 +37,7 @@ protected function setUp(): void
         );
 
         $this->_fileStorage = $this->createMock(Flag::class);
-        $this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
+        $this->_fileStorage->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = ['fileStorage' => $this->_fileStorage];
@@ -69,8 +69,8 @@ public function testIsDisplayed($expectedFirstRun, $data)
             $arguments
         );
 
-        $this->_syncFlagMock->expects($this->any())->method('save');
-        $this->_syncFlagMock->expects($this->any())->method('getFlagData')->will($this->returnValue($data));
+        $this->_syncFlagMock->method('save');
+        $this->_syncFlagMock->method('getFlagData')->will($this->returnValue($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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -68,14 +68,14 @@ protected function setUp(): void
      */
     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->method('load')->will($this->returnValue($cached));
+        $this->cacheMock->method('save')->will($this->returnValue(null));
 
         $httpAdapterMock = $this->createMock(Curl::class);
-        $httpAdapterMock->expects($this->any())->method('read')->will($this->returnValue($response));
-        $this->curlFactoryMock->expects($this->any())->method('create')->will($this->returnValue($httpAdapterMock));
+        $httpAdapterMock->method('read')->will($this->returnValue($response));
+        $this->curlFactoryMock->method('create')->will($this->returnValue($httpAdapterMock));
 
-        $this->scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
+        $this->scopeConfigMock->method('getValue')->will($this->returnValue(null));
 
         $this->assertEquals($expectedResult, $this->messageModel->isDisplayed());
     }

app/code/Magento/AdminNotification/Test/Unit/Observer/PredispatchAdminActionControllerObserverTest.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.