Fixed code by recommendation

Author: anzin

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',

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);

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(

lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php

@@ -1,13 +1,12 @@
 <?php
 /**
+ * Abstract DB helper class
+ *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\DB\Helper;
 
-/**
- * Abstract DB helper class.
- */
 abstract class AbstractHelper
 {
     /**
@@ -64,7 +63,7 @@ protected function getConnection()
      */
     public function escapeLikeValue($value, $options = [])
     {
-        $value = is_string($value) ? str_replace('\\', '\\\\', $value) : '';
+        $value = str_replace('\\', '\\\\', $value);
 
         $replaceFrom = [];
         $replaceTo = [];
@@ -101,7 +100,6 @@ public function escapeLikeValue($value, $options = [])
 
     /**
      * Escapes, quotes and adds escape symbol to LIKE expression.
-     *
      * For options and escaping see escapeLikeValue().
      *
      * @param string $value
@@ -114,7 +112,6 @@ abstract public function addLikeEscape($value, $options = []);
 
     /**
      * Returns case insensitive LIKE construction.
-     *
      * For options and escaping see escapeLikeValue().
      *
      * @param string $field

lib/internal/Magento/Framework/Filter/StripTags.php

@@ -27,7 +27,7 @@ class StripTags implements \Zend_Filter_Interface
 
     /**
      * @param \Magento\Framework\Escaper $escaper
-     * @param string|null $allowableTags
+     * @param null $allowableTags
      * @param bool $escape
      */
     public function __construct(\Magento\Framework\Escaper $escaper, $allowableTags = null, $escape = false)
@@ -45,8 +45,7 @@ public function __construct(\Magento\Framework\Escaper $escaper, $allowableTags
      */
     public function filter($value)
     {
-        $result = $value !== null ? strip_tags($value, $this->allowableTags) : '';
-
+        $result = strip_tags($value, $this->allowableTags);
         return $this->escape ? $this->escaper->escapeHtml($result, $this->allowableTags) : $result;
     }
 }

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

@@ -294,10 +294,7 @@ private function fillBackgroundColor(&$imageResourceTo): void
                 // fallback to default background color
             }
         }
-        list($red, $green, $blue) = $this->_backgroundColor;
-        $red = $red !== null ? $red : 0;
-        $green = $green !== null ? $green : 0;
-        $blue = $blue !== null ? $blue : 0;
+        list($red, $green, $blue) = $this->_backgroundColor ?: [0, 0, 0];
         $color = imagecolorallocate($imageResourceTo, $red, $green, $blue);
 
         if (!imagefill($imageResourceTo, 0, 0, $color)) {

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

@@ -18,14 +18,14 @@ class ImageMagick extends AbstractAdapter
     /**
      * The blur factor where > 1 is blurry, < 1 is sharp
      */
-    const BLUR_FACTOR = 0.7;
+    public const BLUR_FACTOR = 0.7;
 
     /**
      * Error messages
      */
-    const ERROR_WATERMARK_IMAGE_ABSENT = 'Watermark Image absent.';
+    public const ERROR_WATERMARK_IMAGE_ABSENT = 'Watermark Image absent.';
 
-    const ERROR_WRONG_IMAGE = 'Image is not readable or file name is empty.';
+    public const ERROR_WRONG_IMAGE = 'Image is not readable or file name is empty.';
 
     /**
      * Options Container
@@ -90,9 +90,9 @@ public function backgroundColor($color = null)
      */
     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 (!empty($filename) && !$this->validateURLScheme($filename)) {

lib/internal/Magento/Framework/Serialize/Serializer/Json.php

@@ -36,7 +36,7 @@ public function unserialize($string)
     {
         if ($string === null) {
             throw new \InvalidArgumentException(
-                sprintf('Unable to unserialize value. Error: Parameter must be a string type, null given.')
+                'Unable to unserialize value. Error: Parameter must be a string type, null given.'
             );
         }
         $result = json_decode($string, true);

lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php

@@ -94,15 +94,15 @@ public function testSerializeException()
     }
 
     /**
+     * Method to test unserialize exception.
+     *
+     * @param string|bool|null $value
+     * @param string $errorMessage
+     *
      * @dataProvider unserializeExceptionDataProvider
      */
-    public function testUnserializeException($value)
+    public function testUnserializeException($value, $errorMessage)
     {
-        $errorMessage = 'Unable to unserialize value.';
-
-        if ($value === null) {
-            $errorMessage = 'Unable to unserialize value. Error: Parameter must be a string type, null given.';
-        }
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage($errorMessage);
         $this->json->unserialize($value);
@@ -114,10 +114,10 @@ public function testUnserializeException($value)
     public function unserializeExceptionDataProvider()
     {
         return [
-            [''],
-            [false],
-            [null],
-            ['{']
+            ['', 'Unable to unserialize value.'],
+            [false, 'Unable to unserialize value.'],
+            [null, 'Unable to unserialize value. Error: Parameter must be a string type, null given.'],
+            ['{', 'Unable to unserialize value.']
         ];
     }
 }

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -31,30 +31,24 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
     /**
      * Cache group Tag
      */
-    const CACHE_GROUP = \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER;
+    public const CACHE_GROUP = \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER;
 
     /**
      * Prefix for cache key of block
      */
-    const CACHE_KEY_PREFIX = 'BLOCK_';
+    public const CACHE_KEY_PREFIX = 'BLOCK_';
 
     /**
-     * Design
-     *
      * @var \Magento\Framework\View\DesignInterface
      */
     protected $_design;
 
     /**
-     * Session
-     *
      * @var \Magento\Framework\Session\SessionManagerInterface
      */
     protected $_session;
 
     /**
-     * SID Resolver
-     *
      * @var \Magento\Framework\Session\SidResolverInterface
      * @deprecated 102.0.5 Not used anymore.
      */
@@ -82,15 +76,11 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
     protected $jsLayout = [];
 
     /**
-     * Request
-     *
      * @var \Magento\Framework\App\RequestInterface
      */
     protected $_request;
 
     /**
-     * Url Builder
-     *
      * @var \Magento\Framework\UrlInterface
      */
     protected $_urlBuilder;
@@ -125,29 +115,21 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
     protected $_viewConfig;
 
     /**
-     * Cache State
-     *
      * @var \Magento\Framework\App\Cache\StateInterface
      */
     protected $_cacheState;
 
     /**
-     * Logger
-     *
      * @var \Psr\Log\LoggerInterface
      */
     protected $_logger;
 
     /**
-     * Escaper
-     *
      * @var \Magento\Framework\Escaper
      */
     protected $_escaper;
 
     /**
-     * Filter manager
-     *
      * @var \Magento\Framework\Filter\FilterManager
      */
     protected $filterManager;
@@ -954,10 +936,9 @@ public function escapeCss($string)
      */
     public function stripTags($data, $allowableTags = null, $allowHtmlEntities = false)
     {
-        return $this->filterManager->stripTags(
-            $data,
-            ['allowableTags' => $allowableTags, 'escape' => $allowHtmlEntities]
-        );
+        $params = ['allowableTags' => $allowableTags, 'escape' => $allowHtmlEntities];
+
+        return $data ? $this->filterManager->stripTags($data, $params) : '';
     }
 
     /**