Merge remote-tracking branch 'anzin/fix-deprecation-integration-part-2' into ph-delivery

xmav · xmav · commit 1565e5c6d1cd · 2021-12-02T10:40:52.000-06:00
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -26,29 +26,21 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
     protected $messageGroups;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * Catalog product
-     *
      * @var \Magento\Catalog\Helper\Product
      */
     protected $_catalogProduct = null;
 
     /**
-     * Catalog design
-     *
      * @var \Magento\Catalog\Model\Design
      */
     protected $_catalogDesign;
 
     /**
-     * Catalog session
-     *
      * @var \Magento\Catalog\Model\Session
      */
     protected $_catalogSession;
@@ -141,7 +133,9 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
         if ($description) {
             $pageConfig->setDescription($description);
         } else {
-            $pageConfig->setDescription($this->string->substr(strip_tags($product->getDescription()), 0, 255));
+            $productDescription = is_string($product->getDescription()) ?
+                $this->string->substr(strip_tags($product->getDescription()), 0, 255) : '';
+            $pageConfig->setDescription($productDescription);
         }
 
         if ($this->_catalogProduct->canUseCanonicalTag()) {
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Varnish.php
@@ -58,7 +58,7 @@ protected function _afterLoad()
         $currentValue = $this->getValue();
         if (!$currentValue) {
             foreach ($data as $field => $value) {
-                if (strstr($this->getPath(), (string) $field)) {
+                if (is_string($this->getPath()) && strstr($this->getPath(), (string) $field)) {
                     $this->setValue($value);
                     $this->save();
                     break;
diff --git a/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
@@ -14,6 +14,7 @@
 /**
  * Dynamic validator for UI release notification, manage UI component visibility.
  * Return true if the logged in user has not seen the notification.
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CanViewNotification implements VisibilityConditionInterface
 {
@@ -72,15 +73,14 @@ public function __construct(
     }
 
     /**
-     * Validate if notification popup can be shown and set the notification flag
-     *
      * @inheritdoc
      */
     public function isVisible(array $arguments)
     {
         $userId = $this->session->getUser()->getId();
         $cacheKey = self::$cachePrefix . $userId;
         $value = $this->cacheStorage->load($cacheKey);
+
         if ($value === false) {
             $value = version_compare(
                 $this->viewerLogger->get($userId)->getLastViewVersion(),
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
@@ -122,7 +122,7 @@ public function isVisibleProvider()
         return [
             [false, '2.2.1-dev', '999.999.999-alpha'],
             [true, '2.2.1-dev', '2.0.0'],
-            [true, '2.2.1-dev', null],
+            [true, '2.2.1-dev', '2.2.0'],
             [false, '2.2.1-dev', '2.2.1'],
             [true, '2.2.1-dev', '2.2.0'],
             [true, '2.3.0', '2.2.0'],
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
@@ -20,8 +20,6 @@
 class Guest extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $coreRegistry;
@@ -69,17 +67,17 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Cookie key for guest view
      */
-    const COOKIE_NAME = 'guest-view';
+    public const COOKIE_NAME = 'guest-view';
 
     /**
      * Cookie path value
      */
-    const COOKIE_PATH = '/';
+    public const COOKIE_PATH = '/';
 
     /**
      * Cookie lifetime value
      */
-    const COOKIE_LIFETIME = 600;
+    public const COOKIE_LIFETIME = 600;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -227,11 +225,14 @@ private function setGuestViewCookie($cookieValue)
      */
     private function loadFromCookie($fromCookie)
     {
+        if (!is_string($fromCookie)) {
+            throw new InputException(__($this->inputExceptionMessage));
+        }
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $cookieData = explode(':', base64_decode($fromCookie));
-        $protectCode = isset($cookieData[0]) ? $cookieData[0] : null;
-        $incrementId = isset($cookieData[1]) ? $cookieData[1] : null;
-        if (!empty($protectCode) && !empty($incrementId)) {
+        $protectCode = $cookieData[0] ?? null;
+        $incrementId = $cookieData[1] ?? null;
+        if ($protectCode && $incrementId) {
             $order = $this->getOrderRecord($incrementId);
             if (hash_equals((string)$order->getProtectCode(), $protectCode)) {
                 $this->setGuestViewCookie($fromCookie);
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/AdditionalTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/AdditionalTest.php
@@ -41,6 +41,7 @@ public function testToHtml()
             $evaluatedValues
         );
 
+        $block->setNameInLayout('test_block_name');
         $html = $block->toHtml();
         $this->assertStringMatchesFormat(
             '%acustom_class absolute-advice%avalue="value1"%slabel 1%avalue="value2"%slabel 2%a',
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
@@ -77,7 +77,10 @@ public function testInitProductLayout()
         $uniqid = uniqid();
         /** @var $product \Magento\Catalog\Model\Product */
         $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
-        $product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE)->setId(99)->setUrlKey($uniqid);
+        $product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE)
+            ->setId(99)
+            ->setSku('test-sku')
+            ->setUrlKey($uniqid);
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
         $objectManager = $this->objectManager;
         $objectManager->get(\Magento\Framework\Registry::class)->register('product', $product);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -115,9 +115,13 @@ protected function _getFixture($pattern)
      */
     protected function _isFormatSupported($image, $adapter)
     {
+        if ($image === null || !file_exists($image)) {
+            return false;
+        }
         $data = pathinfo($image);
         $supportedTypes = $adapter->getSupportedFormats();
-        return $image && file_exists($image) && in_array(strtolower($data['extension']), $supportedTypes);
+
+        return isset($data['extension']) && in_array(strtolower($data['extension']), $supportedTypes);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Translate;
 
 class InlineTest extends \PHPUnit\Framework\TestCase
@@ -116,10 +117,6 @@ public function processResponseBodyDataProvider()
         $originalText = file_get_contents(__DIR__ . '/_files/_inline_page_original.html');
         $expectedText = file_get_contents(__DIR__ . '/_files/_inline_page_expected.html');
 
-        $package = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\DesignInterface::class
-        )->getDesignTheme()->getPackageCode();
-        $expectedText = str_replace('{{design_package}}', $package, $expectedText);
         return [
             'plain text' => ['text with no translations and tags', 'text with no translations and tags'],
             'html string' => [$originalText, $expectedText],
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/TokensTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/TokensTest.php
@@ -68,6 +68,7 @@ public function testGetFormFields()
 
     public function testToHtml()
     {
+        $this->tokensBlock->setNameInLayout('test_block_name');
         $htmlContent = $this->tokensBlock->toHtml();
 
         $this->assertStringContainsString('name="consumer_key"', $htmlContent);
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php
@@ -24,6 +24,7 @@ public function testCustomerOnForm()
             ->setWebsiteId(1)
             ->loadByEmail('customer@example.com');
         $block = Bootstrap::getObjectManager()->create(Form::class);
+        $block->setNameInLayout('test_block_name');
         /** @var Escaper $escaper */
         $escaper = Bootstrap::getObjectManager()->get(Escaper::class);
         $this->assertStringMatchesFormat(
@@ -49,6 +50,7 @@ public function testStoresOnForm(): void
         $registry = Bootstrap::getObjectManager()->get(Registry::class);
         $review = $registry->registry('review_data');
         $block = Bootstrap::getObjectManager()->create(Form::class);
+        $block->setNameInLayout('test_block_name');
         foreach ($review->getStores() as $storeId) {
             $regex = sprintf('/input id="select_stores" (.*) value="%d" type="hidden"/', $storeId);
             $this->assertMatchesRegularExpression(
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -17,8 +17,6 @@
 class Gd2 extends AbstractAdapter
 {
     /**
-     * Required extensions
-     *
      * @var array
      */
     protected $_requiredExtensions = ["gd"];
@@ -63,9 +61,9 @@ protected function _reset()
      */
     public function open($filename)
     {
-        if (!file_exists($filename)) {
+        if ($filename === null || !file_exists($filename)) {
             throw new FileSystemException(
-                new Phrase('File "%1" does not exist.', [$this->_fileName])
+                new Phrase('File "%1" does not exist.', [$filename])
             );
         }
         if (!$filename || filesize($filename) === 0 || !$this->validateURLScheme($filename)) {
@@ -190,7 +188,7 @@ public function save($destination = null, $newName = null)
                 } else {
                     $newImage = imagecreate($this->_imageSrcWidth, $this->_imageSrcHeight);
                 }
-                $this->_fillBackgroundColor($newImage);
+                $this->fillBackgroundColor($newImage);
                 imagecopy($newImage, $this->_imageHandler, 0, 0, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight);
                 $this->imageDestroy();
                 $this->_imageHandler = $newImage;
@@ -267,62 +265,95 @@ private function _getCallback($callbackType, $fileType = null, $unsupportedText
      * Returns a color identifier.
      *
      * @param resource &$imageResourceTo
-     * @return int
+     *
+     * @return void
      * @throws \InvalidArgumentException
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function _fillBackgroundColor(&$imageResourceTo)
+    private function fillBackgroundColor(&$imageResourceTo): void
     {
         // try to keep transparency, if any
         if ($this->_keepTransparency) {
             $isAlpha = false;
             $transparentIndex = $this->_getTransparency($this->_imageHandler, $this->_fileType, $isAlpha);
+
             try {
-                // fill truecolor png with alpha transparency
+                // fill true color png with alpha transparency
                 if ($isAlpha) {
-                    if (!imagealphablending($imageResourceTo, false)) {
-                        throw new \InvalidArgumentException('Failed to set alpha blending for PNG image.');
-                    }
-                    $transparentAlphaColor = imagecolorallocatealpha($imageResourceTo, 0, 0, 0, 127);
-                    if (false === $transparentAlphaColor) {
-                        throw new \InvalidArgumentException('Failed to allocate alpha transparency for PNG image.');
-                    }
-                    if (!imagefill($imageResourceTo, 0, 0, $transparentAlphaColor)) {
-                        throw new \InvalidArgumentException('Failed to fill PNG image with alpha transparency.');
-                    }
-                    if (!imagesavealpha($imageResourceTo, true)) {
-                        throw new \InvalidArgumentException('Failed to save alpha transparency into PNG image.');
-                    }
-
-                    return $transparentAlphaColor;
-                } elseif (false !== $transparentIndex) {
-                    // fill image with indexed non-alpha transparency
-                    $transparentColor = false;
-                    if ($transparentIndex >= 0 && $transparentIndex <= imagecolorstotal($this->_imageHandler)) {
-                        list($r, $g, $b) = array_values(imagecolorsforindex($this->_imageHandler, $transparentIndex));
-                        $transparentColor = imagecolorallocate($imageResourceTo, $r, $g, $b);
-                    }
-                    if (false === $transparentColor) {
-                        throw new \InvalidArgumentException('Failed to allocate transparent color for image.');
-                    }
-                    if (!imagefill($imageResourceTo, 0, 0, $transparentColor)) {
-                        throw new \InvalidArgumentException('Failed to fill image with transparency.');
-                    }
-                    imagecolortransparent($imageResourceTo, $transparentColor);
-                    return $transparentColor;
+                    $this->applyAlphaTransparency($imageResourceTo);
+
+                    return;
+                }
+
+                if ($transparentIndex !== false) {
+                    $this->applyTransparency($imageResourceTo, $transparentIndex);
+
+                    return;
                 }
                 // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\Exception $e) {
                 // fallback to default background color
             }
         }
-        list($r, $g, $b) = $this->_backgroundColor;
-        $color = imagecolorallocate($imageResourceTo, $r, $g, $b);
+        list($red, $green, $blue) = $this->_backgroundColor ?: [0, 0, 0];
+        $color = imagecolorallocate($imageResourceTo, $red, $green, $blue);
+
         if (!imagefill($imageResourceTo, 0, 0, $color)) {
-            throw new \InvalidArgumentException("Failed to fill image background with color {$r} {$g} {$b}.");
+            throw new \InvalidArgumentException("Failed to fill image background with color {$red} {$green} {$blue}.");
+        }
+    }
+
+    /**
+     * Method to apply alpha transparency for image.
+     *
+     * @param resource $imageResourceTo
+     *
+     * @return void
+     * @SuppressWarnings(PHPMD.LongVariable)
+     */
+    private function applyAlphaTransparency(&$imageResourceTo): void
+    {
+        if (!imagealphablending($imageResourceTo, false)) {
+            throw new \InvalidArgumentException('Failed to set alpha blending for PNG image.');
+        }
+        $transparentAlphaColor = imagecolorallocatealpha($imageResourceTo, 0, 0, 0, 127);
+
+        if (false === $transparentAlphaColor) {
+            throw new \InvalidArgumentException('Failed to allocate alpha transparency for PNG image.');
+        }
+
+        if (!imagefill($imageResourceTo, 0, 0, $transparentAlphaColor)) {
+            throw new \InvalidArgumentException('Failed to fill PNG image with alpha transparency.');
         }
 
-        return $color;
+        if (!imagesavealpha($imageResourceTo, true)) {
+            throw new \InvalidArgumentException('Failed to save alpha transparency into PNG image.');
+        }
+    }
+
+    /**
+     * Method to apply transparency for image.
+     *
+     * @param resource $imageResourceTo
+     * @param int $transparentIndex
+     *
+     * @return void
+     */
+    private function applyTransparency(&$imageResourceTo, $transparentIndex): void
+    {
+        // fill image with indexed non-alpha transparency
+        $transparentColor = false;
+
+        if ($transparentIndex >= 0 && $transparentIndex <= imagecolorstotal($this->_imageHandler)) {
+            list($red, $green, $blue) = array_values(imagecolorsforindex($this->_imageHandler, $transparentIndex));
+            $transparentColor = imagecolorallocate($imageResourceTo, (int) $red, (int) $green, (int) $blue);
+        }
+        if (false === $transparentColor) {
+            throw new \InvalidArgumentException('Failed to allocate transparent color for image.');
+        }
+        if (!imagefill($imageResourceTo, 0, 0, $transparentColor)) {
+            throw new \InvalidArgumentException('Failed to fill image with transparency.');
+        }
+        imagecolortransparent($imageResourceTo, $transparentColor);
     }
 
     /**
@@ -398,7 +429,7 @@ public function resize($frameWidth = null, $frameHeight = null)
         }
 
         // fill new image with required color
-        $this->_fillBackgroundColor($newImage);
+        $this->fillBackgroundColor($newImage);
 
         if ($this->_imageHandler) {
             // resample source image and copy it into new frame
@@ -475,6 +506,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
      * @return false|resource
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function createWatermarkBasedOnPosition(
         $watermark,
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php

Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,13 @@ protected function _getFixture($pattern)`
`115`	`115`	`*/`
`116`	`116`	`protected function _isFormatSupported($image, $adapter)`
`117`	`117`	`{`
	`118`	`+ if ($image === null \|\| !file_exists($image)) {`
	`119`	`+ return false;`
	`120`	`+ }`
`118`	`121`	`$data = pathinfo($image);`
`119`	`122`	`$supportedTypes = $adapter->getSupportedFormats();`
`120`		`- return $image && file_exists($image) && in_array(strtolower($data['extension']), $supportedTypes);`
	`123`	`+`
	`124`	`+ return isset($data['extension']) && in_array(strtolower($data['extension']), $supportedTypes);`
`121`	`125`	`}`
`122`	`126`
`123`	`127`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function testGetFormFields()`
`68`	`68`
`69`	`69`	`public function testToHtml()`
`70`	`70`	`{`
	`71`	`+ $this->tokensBlock->setNameInLayout('test_block_name');`
`71`	`72`	`$htmlContent = $this->tokensBlock->toHtml();`
`72`	`73`
`73`	`74`	`$this->assertStringContainsString('name="consumer_key"', $htmlContent);`