34441: CR fixes

Author: karyna-t

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php

@@ -18,17 +18,15 @@ public function isValid($value)
         if (!empty($value['qty']) && (!is_numeric($value['qty'])
             && $value['qty'] !== $this->context->getEmptyAttributeValueConstant())
         ) {
-            if ($this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE) !== null) {
-                $this->_addMessages(
-                    [
-                        sprintf(
-                            $this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE),
-                            'qty',
-                            'decimal'
-                        ),
-                    ]
-                );
-            }
+            $this->_addMessages(
+                [
+                    sprintf(
+                        $this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE),
+                        'qty',
+                        'decimal'
+                    ),
+                ]
+            );
             return false;
         }
         return true;

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php

@@ -18,17 +18,15 @@ public function isValid($value)
         if (!empty($value['weight']) && (!is_numeric($value['weight']) || $value['weight'] < 0)
             && $value['weight'] !== $this->context->getEmptyAttributeValueConstant()
         ) {
-            if ($this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE) !== null) {
-                $this->_addMessages(
-                    [
-                        sprintf(
-                            $this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE),
-                            'weight',
-                            'decimal'
-                        )
-                    ]
-                );
-            }
+            $this->_addMessages(
+                [
+                    sprintf(
+                        $this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE),
+                        'weight',
+                        'decimal'
+                    )
+                ]
+            );
             return false;
         }
         return true;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
             ->method('getEmptyAttributeValueConstant')
             ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
 
-        $contextStub->method('retrieveMessageTemplate')->willReturn(null);
+        $contextStub->method('retrieveMessageTemplate')->willReturn('some template');
         $this->quantity->init($contextStub);
     }
 

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
             ->method('getEmptyAttributeValueConstant')
             ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
 
-        $contextStub->method('retrieveMessageTemplate')->willReturn(null);
+        $contextStub->method('retrieveMessageTemplate')->willReturn('some template');
         $this->weight->init($contextStub);
     }
 

app/code/Magento/Checkout/Model/DefaultConfigProvider.php

@@ -97,7 +97,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
     private $configurationPool;
 
     /**
-     * @param QuoteIdMaskFactory
+     * @var QuoteIdMaskFactory
      */
     protected $quoteIdMaskFactory;
 
@@ -338,17 +338,17 @@ public function getConfig()
         $output['imageData'] = $this->imageProvider->getImages($quoteId);
 
         $output['totalsData'] = $this->getTotalsData();
+
+        $policyContent = $this->scopeConfig->getValue(
+            'shipping/shipping_policy/shipping_policy_content',
+            ScopeInterface::SCOPE_STORE
+        );
         $output['shippingPolicy'] = [
             'isEnabled' => $this->scopeConfig->isSetFlag(
                 'shipping/shipping_policy/enable_shipping_policy',
                 ScopeInterface::SCOPE_STORE
             ),
-            'shippingPolicyContent' => nl2br(
-                $this->scopeConfig->getValue(
-                    'shipping/shipping_policy/shipping_policy_content',
-                    ScopeInterface::SCOPE_STORE
-                )
-            )
+            'shippingPolicyContent' => $policyContent ? nl2br($policyContent) : ''
         ];
         $output['useQty'] = $this->scopeConfig->isSetFlag(
             'checkout/cart_link/use_qty',

app/code/Magento/Checkout/Test/Unit/Model/DefaultConfigProviderTest.php

@@ -39,7 +39,6 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Shipping\Model\Config;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -123,13 +122,6 @@ protected function setUp(): void
         $this->addressMetadata = $this->createMock(AddressMetadataInterface::class);
         $attributeOptionManager = $this->createMock(AttributeOptionManagementInterface::class);
         $customerAddressData = $this->createMock(CustomerAddressDataProvider::class);
-
-        // PHP 8.1 compatibility; The real code returns '', not null.
-        $scopeConfig->method('getValue')
-            ->withConsecutive(
-                ['shipping/shipping_policy/shipping_policy_content', ScopeInterface::SCOPE_STORE]
-            )->willReturn('');
-
         $this->model = new DefaultConfigProvider(
             $checkoutHelper,
             $this->checkoutSession,

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php

@@ -183,6 +183,7 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
     {
         $this->backendUrlMock->expects($this->atLeastOnce())
             ->method('getUrl')
+            ->with('cms/wysiwyg/directive')
             ->willReturn('some_link');
         $this->backendUrlMock->expects($this->once())
             ->method('getBaseUrl')

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

@@ -87,8 +87,7 @@ public function testGetAfterElementHtml()
         $afterHtmlCode = 'after html';
         $this->_object->setData('after_element_html', $afterHtmlCode);
         $this->_object->setForm($this->_formMock);
-        $this->_object->setId('test');
-        $this->_object->setData('html_id', 'spec_element');
+        $this->_object->setId('spec_element');
 
         $actual = $this->_object->getAfterElementHtml();
 

app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php

@@ -13,7 +13,6 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\App\Request\Http;
-use Magento\Framework\App\Request\HttpRequest;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\Result\RedirectFactory;
@@ -50,7 +49,7 @@ class PostTest extends TestCase
     private $urlMock;
 
     /**
-     * @var HttpRequest|MockObject
+     * @var Http|MockObject
      */
     private $requestStub;
 

lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php

@@ -228,7 +228,7 @@ public function getNamespaceName()
     {
         $namespaceName = parent::getNamespaceName();
         if ($namespaceName !== null) {
-            $namespaceName = ltrim(parent::getNamespaceName(), '\\') ?: null;
+            $namespaceName = ltrim($namespaceName, '\\') ?: null;
         }
         return $namespaceName;
     }