Merge remote-tracking branch 'anzin/fix-deprecation-unit' into ph-delivery

Author: xmav

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php

@@ -72,7 +72,7 @@ protected function setUp(): void
 
         $this->_curLocatorMock = $this->createMock(DefaultLocator::class);
         $this->_columnMock = $this->getMockBuilder(Column::class)
-            ->addMethods(['getIndex'])
+            ->addMethods(['getIndex', 'getCurrency', 'getRateField'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->_columnMock->expects($this->any())->method('getIndex')->willReturn('columnIndex');
@@ -115,45 +115,25 @@ protected function tearDown(): void
      */
     public function testRenderWithDefaultCurrency()
     {
-        $this->_currencyMock->expects(
-            $this->once()
-        )->method(
-            'getRate'
-        )->with(
-            'defaultCurrency'
-        )->willReturn(
-            1.5
-        );
-
-        $this->_curLocatorMock->expects(
-            $this->any()
-        )->method(
-            'getDefaultCurrency'
-        )->with(
-            $this->_requestMock
-        )->willReturn(
-            'defaultCurrency'
-        );
-
+        $this->_currencyMock->expects($this->once())
+            ->method('getRate')
+            ->with('defaultCurrency')
+            ->willReturn(1.5);
+        $this->_curLocatorMock->expects($this->any())
+            ->method('getDefaultCurrency')
+            ->with($this->_requestMock)
+            ->willReturn('defaultCurrency');
         $currLocaleMock = $this->createMock(\Zend_Currency::class);
-        $currLocaleMock->expects(
-            $this->once()
-        )->method(
-            'toCurrency'
-        )->with(
-            15.0000
-        )->willReturn(
-            '15USD'
-        );
-        $this->_localeMock->expects(
-            $this->once()
-        )->method(
-            'getCurrency'
-        )->with(
-            'defaultCurrency'
-        )->willReturn(
-            $currLocaleMock
-        );
+        $currLocaleMock->expects($this->once())
+            ->method('toCurrency')
+            ->with(15.0000)
+            ->willReturn('15USD');
+        $this->_localeMock->expects($this->once())
+            ->method('getCurrency')
+            ->with('defaultCurrency')
+            ->willReturn($currLocaleMock);
+        $this->_columnMock->method('getCurrency')->willReturn('USD');
+        $this->_columnMock->method('getRateField')->willReturn('test_rate_field');
 
         $this->assertEquals('15USD', $this->_blockCurrency->render($this->_row));
     }

app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

@@ -2786,7 +2786,9 @@ public function notAvailableOptionProvider(): array
     private function expectProductEntityMetadata(): void
     {
         $entityMetadataMock = $this->getMockBuilder(EntityMetadataInterface::class)
+            ->onlyMethods(['getLinkField'])
             ->getMockForAbstractClass();
+        $entityMetadataMock->method('getLinkField')->willReturn('test_link_field');
         $this->metadataPool->expects($this->any())->method('getMetadata')
             ->with(ProductInterface::class)
             ->willReturn($entityMetadataMock);

app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\ResourceModel\AbstractResource;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url;
 use Magento\Framework\Url\ModifierInterface;
@@ -178,6 +179,7 @@ public function testStoreCodeShouldBeIncludedInURLOnlyIfItIsConfiguredSo(
             ->willReturnMap(
                 [
                     [Store::XML_PATH_USE_REWRITES, ReinitableConfigInterface::SCOPE_TYPE_DEFAULT, null, true],
+                    [Store::XML_PATH_UNSECURE_BASE_LINK_URL, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, ''],
                     [
                         Store::XML_PATH_STORE_IN_URL,
                         ReinitableConfigInterface::SCOPE_TYPE_DEFAULT,

app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php

@@ -325,6 +325,7 @@ public function testBeforeSaveTemporaryAttribute()
      */
     public function testBeforeSaveAttributeStringValue()
     {
+        $this->attribute->method('getName')->willReturn('test_attribute_name');
         $model = $this->objectManager->getObject(Image::class);
         $model->setAttribute($this->attribute);
 
@@ -392,6 +393,7 @@ public function attributeValueDataProvider()
      */
     public function testBeforeSaveWithAdditionalData($value)
     {
+        $this->attribute->method('getName')->willReturn('test_attribute_name');
         $model = $this->setUpModelForTests();
 
         $this->imageUploader->expects($this->never())
@@ -416,6 +418,7 @@ public function testBeforeSaveWithAdditionalData($value)
      */
     public function testBeforeSaveWithoutAdditionalData($value)
     {
+        $this->attribute->method('getName')->willReturn('test_attribute_name');
         $model = $this->setUpModelForTests();
 
         $this->imageUploader->expects($this->never())

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php

@@ -59,7 +59,7 @@ function (string $tag, array $attributes, string $content): string {
                 'secureRenderer' => $secureRendererMock
             ]
         );
-        $this->_object->setData('html_id', 'spec_element');
+        $this->_object->setId('spec_element');
         $this->_formMock = $this->getMockBuilder(Form::class)
             ->addMethods(['getHtmlIdPrefix', 'getHtmlIdSuffix'])
             ->onlyMethods(['getElement'])

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php

@@ -131,6 +131,8 @@ public function testSaveWithReservedId()
             ->willReturn([]);
         $this->groupModel->expects($this->once())->method('setId')
             ->with($expectedId);
+        $this->groupModel->expects($this->once())->method('getCode')
+            ->willReturn('customer_group_code');
 
         $dbAdapter = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()

app/code/Magento/Usps/Model/Carrier.php

@@ -28,45 +28,45 @@
 class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
 {
     /** @deprecated Redundant dependency */
-    const CONTAINER_VARIABLE = 'VARIABLE';
+    public const CONTAINER_VARIABLE = 'VARIABLE';
 
     /** @deprecated Redundant dependency */
-    const CONTAINER_FLAT_RATE_BOX = 'FLAT RATE BOX';
+    public const CONTAINER_FLAT_RATE_BOX = 'FLAT RATE BOX';
 
     /** @deprecated Redundant dependency */
-    const CONTAINER_FLAT_RATE_ENVELOPE = 'FLAT RATE ENVELOPE';
+    public const CONTAINER_FLAT_RATE_ENVELOPE = 'FLAT RATE ENVELOPE';
 
     /** @deprecated Redundant dependency */
-    const CONTAINER_RECTANGULAR = 'RECTANGULAR';
+    public const CONTAINER_RECTANGULAR = 'RECTANGULAR';
 
     /** @deprecated Redundant dependency */
-    const CONTAINER_NONRECTANGULAR = 'NONRECTANGULAR';
+    public const CONTAINER_NONRECTANGULAR = 'NONRECTANGULAR';
 
     /**
      * USPS size
      */
-    const SIZE_REGULAR = 'REGULAR';
+    public const SIZE_REGULAR = 'REGULAR';
 
-    const SIZE_LARGE = 'LARGE';
+    public const SIZE_LARGE = 'LARGE';
 
     /**
      * Default api revision
      *
      * @var int
      */
-    const DEFAULT_REVISION = 2;
+    public const DEFAULT_REVISION = 2;
 
     /**
      * Code of the carrier
      *
      * @var string
      */
-    const CODE = 'usps';
+    public const CODE = 'usps';
 
     /**
      * Ounces in one pound for conversion
      */
-    const OUNCES_POUND = 16;
+    public const OUNCES_POUND = 16;
 
     /**
      * Code of the carrier
@@ -492,7 +492,10 @@ protected function _getXmlQuotes()
             }
             $package->addChild('ZipOrigination', $r->getOrigPostal());
             //only 5 chars available
-            $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
+            $package->addChild(
+                'ZipDestination',
+                is_string($r->getDestPostal()) ? substr($r->getDestPostal(), 0, 5) : ''
+            );
             $package->addChild('Pounds', $r->getWeightPounds());
             $package->addChild('Ounces', $r->getWeightOunces());
             // Because some methods don't accept VARIABLE and (NON)RECTANGULAR containers
@@ -1195,11 +1198,8 @@ public function getResponse()
                 }
             }
         }
-        if (empty($statuses)) {
-            $statuses = __('Empty response');
-        }
 
-        return $statuses;
+        return $statuses ?: __('Empty response');
     }
 
     /**

app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Catalog/Category/ChooserTest.php

@@ -83,12 +83,12 @@ protected function setUp(): void
 
         $this->childNode = $this->getMockBuilder(Node::class)
             ->addMethods(['getLevel'])
-            ->onlyMethods(['hasChildren'])
+            ->onlyMethods(['hasChildren', 'getIdField'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->rootNode = $this->getMockBuilder(Node::class)
             ->addMethods(['getLevel'])
-            ->onlyMethods(['hasChildren', 'getChildren'])
+            ->onlyMethods(['hasChildren', 'getChildren', 'getIdField'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->categoryTree = $this->createMock(Tree::class);
@@ -115,6 +115,8 @@ public function testGetTreeHasLevelField()
             ]
         );
 
+        $this->rootNode->method('getIdField')->willReturn('test_id_field');
+        $this->childNode->method('getIdField')->willReturn('test_id_field');
         $this->childNode->expects($this->atLeastOnce())->method('getLevel')->willReturn($level);
 
         $this->rootNode->expects($this->atLeastOnce())->method('getLevel')->willReturn($rootLevel);

app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php

@@ -233,7 +233,8 @@ public function testLoadByCustomerId()
         $this->eventDispatcher->expects($this->any())
             ->method('dispatch');
         $this->resource->expects($this->any())
-            ->method('getCustomerIdFieldName');
+            ->method('getCustomerIdFieldName')
+            ->willReturn('test_customer_id');
         $this->resource->expects($this->once())
             ->method('load')
             ->with($this->logicalOr($this->wishlist, $customerId, $customerIdFieldName));

lib/internal/Magento/Framework/App/Response/Http.php

@@ -23,13 +23,13 @@
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 {
     /** Cookie to store page vary string */
-    const COOKIE_VARY_STRING = 'X-Magento-Vary';
+    public const COOKIE_VARY_STRING = 'X-Magento-Vary';
 
     /** Format for expiration timestamp headers */
-    const EXPIRATION_TIMESTAMP_FORMAT = 'D, d M Y H:i:s T';
+    public const EXPIRATION_TIMESTAMP_FORMAT = 'D, d M Y H:i:s T';
 
     /** X-FRAME-OPTIONS Header name */
-    const HEADER_X_FRAME_OPT = 'X-Frame-Options';
+    public const HEADER_X_FRAME_OPT = 'X-Frame-Options';
 
     /**
      * @var \Magento\Framework\App\Request\Http
@@ -131,7 +131,7 @@ public function sendVary()
      */
     public function setPublicHeaders($ttl)
     {
-        if ($ttl < 0 || !preg_match('/^[0-9]+$/', $ttl)) {
+        if ($ttl === null || $ttl < 0 || !preg_match('/^[0-9]+$/', $ttl)) {
             throw new \InvalidArgumentException('Time to live is a mandatory parameter for set public headers');
         }
         $this->setHeader('pragma', 'cache', true);