fix php8.1 compatibility for unit tests part 2

Author: silinmykola

lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php

@@ -245,7 +245,7 @@ public function testSetPublicHeadersWithoutTtl(): void
     {
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Time to live is a mandatory parameter for set public headers');
-        $this->model->setPublicHeaders(null);
+        $this->model->setPublicHeaders('');
     }
 
     /**

lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php

@@ -328,6 +328,9 @@ public function testLaunchWrongPathProductionMode()
         $this->responseMock->expects($this->once())
             ->method('setHttpResponseCode')
             ->with(404);
+        $this->driverMock->expects($this->once())
+            ->method('getRealPathSafety')
+            ->willReturnArgument(0);
         $this->object->launch();
     }
 

lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php

@@ -166,7 +166,9 @@ public function testLoadLayoutWithDefaultSetup(): void
         $this->_layoutProcessor
             ->method('addHandle')
             ->withConsecutive(['default']);
-        $this->_requestMock->expects($this->any())->method('getFullActionName')->willReturn('action_name');
+        $this->_requestMock->expects($this->any())
+            ->method('getFullActionName')
+            ->willReturn('action_name');
         $this->_view->loadLayout();
     }
 
@@ -175,6 +177,9 @@ public function testLoadLayoutWithDefaultSetup(): void
      */
     public function testLoadLayoutWhenBlocksNotGenerated(): void
     {
+        $this->_requestMock->expects($this->any())
+            ->method('getFullActionName')
+            ->willReturn('action_name');
         $this->_view->loadLayout('', false, true);
     }
 
@@ -183,6 +188,9 @@ public function testLoadLayoutWhenBlocksNotGenerated(): void
      */
     public function testLoadLayoutWhenXmlNotGenerated(): void
     {
+        $this->_requestMock->expects($this->any())
+            ->method('getFullActionName')
+            ->willReturn('action_name');
         $this->_view->loadLayout('', true, false);
     }
 

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

@@ -157,7 +157,7 @@ public function getSourceClassNameWithoutNamespace()
      */
     protected function _getFullyQualifiedClassName($className)
     {
-        $className = ltrim($className, '\\');
+        $className = $className ? ltrim($className, '\\') : '';
         return $className ? '\\' . $className : '';
     }
 

lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php

@@ -99,7 +99,7 @@ function (string $ip) {
                     return !in_array(trim($ip), $this->trustedProxies, true);
                 }
             );
-            $remoteAddress = trim(array_pop($ipList));
+            $remoteAddress = empty($ipList) ? '' : trim(array_pop($ipList));
         } else {
             $remoteAddress = trim(reset($ipList));
         }

lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php

@@ -111,6 +111,7 @@ public function testGetNameWithException()
     {
         $this->expectException('DomainException');
         $this->expectExceptionMessage('View\'s identifier is not set');
+        $this->model->setViewId('');
         $this->model->getName();
     }
 

lib/internal/Magento/Framework/ObjectManager/Config/Config.php

@@ -5,10 +5,11 @@
  */
 namespace Magento\Framework\ObjectManager\Config;
 
-use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\ObjectManager\ConfigCacheInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Config implements \Magento\Framework\ObjectManager\ConfigInterface
 {
@@ -76,18 +77,23 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
     protected $_mergedArguments;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var SerializerInterface
      */
     private $serializer;
 
     /**
-     * @param RelationsInterface $relations
-     * @param DefinitionInterface $definitions
+     * @param RelationsInterface|null $relations
+     * @param DefinitionInterface|null $definitions
+     * @param SerializerInterface|null $serializer
      */
-    public function __construct(RelationsInterface $relations = null, DefinitionInterface $definitions = null)
-    {
+    public function __construct(
+        RelationsInterface $relations = null,
+        DefinitionInterface $definitions = null,
+        SerializerInterface $serializer = null
+    ) {
         $this->_relations = $relations ?: new \Magento\Framework\ObjectManager\Relations\Runtime();
         $this->_definitions = $definitions ?: new \Magento\Framework\ObjectManager\Definition\Runtime();
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
     }
 
     /**
@@ -275,14 +281,14 @@ public function extend(array $configuration)
                 // md5() here is not for cryptographic use.
                 // phpcs:ignore Magento2.Security.InsecureFunction
                 $this->_currentCacheKey = md5(
-                    $this->getSerializer()->serialize(
+                    $this->serializer->serialize(
                         [$this->_arguments, $this->_nonShared, $this->_preferences, $this->_virtualTypes]
                     )
                 );
             }
             // md5() here is not for cryptographic use.
             // phpcs:ignore Magento2.Security.InsecureFunction
-            $key = md5($this->_currentCacheKey . $this->getSerializer()->serialize($configuration));
+            $key = md5($this->_currentCacheKey . $this->serializer->serialize($configuration));
             $cached = $this->_cache->get($key);
             if ($cached) {
                 list(
@@ -335,19 +341,4 @@ public function getPreferences()
     {
         return $this->_preferences;
     }
-
-    /**
-     * Get serializer
-     *
-     * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 101.0.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(SerializerInterface::class);
-        }
-        return $this->serializer;
-    }
 }

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/ConfigTest.php

@@ -53,10 +53,14 @@ public function testExtendWithCacheMock()
         $definitions = $this->getMockForAbstractClass(DefinitionInterface::class);
         $definitions->expects($this->once())->method('getClasses')->willReturn(['FooType']);
 
+        $serializer = $this->getMockForAbstractClass(SerializerInterface::class);
+        $serializer->expects($this->any())
+            ->method('serialize')
+            ->willReturn('["custom_value"]');
         $cache = $this->getMockForAbstractClass(ConfigCacheInterface::class);
         $cache->expects($this->once())->method('get')->willReturn(false);
 
-        $config = new Config(null, $definitions);
+        $config = new Config(null, $definitions, $serializer);
         $serializerMock = $this->getMockForAbstractClass(SerializerInterface::class);
         $serializerMock->expects($this->exactly(2))
             ->method('serialize');

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

@@ -115,7 +115,6 @@ public function unserializeExceptionDataProvider(): array
         return [
             [''],
             [false],
-            [null],
             ['{']
         ];
     }

setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php

@@ -264,7 +264,7 @@ public function generateAdvancedCondition($ruleId, $categoriesArray)
                 'type'      => \Magento\SalesRule\Model\Rule\Condition\Product::class,
                 'attribute' => 'category_ids',
                 'operator'  => '==',
-                'value'     => $categoriesArray[($ruleId / 4) % count($categoriesArray)][0],
+                'value'     => $categoriesArray[intdiv($ruleId, 4) % count($categoriesArray)][0],
             ];
 
             $subtotal = [0, 5, 10, 15];
@@ -316,7 +316,7 @@ public function generateAdvancedCondition($ruleId, $categoriesArray)
                 'type'      => \Magento\SalesRule\Model\Rule\Condition\Address::class,
                 'attribute' => 'region',
                 'operator'  => '==',
-                'value'     => $regions[($ruleId / 4) % 50],
+                'value'     => $regions[intdiv($ruleId, 4) % 50],
             ];
 
             $subtotals = [0, 5, 10, 15];