Merge remote-tracking branch 'trigger/imported-SilinMykola-magento2-34450' into ph-delivery

Author: xmav

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

@@ -155,6 +155,7 @@ public function testLoadLayoutWhenLayoutAlreadyLoaded(): void
         $this->expectException('RuntimeException');
         $this->expectExceptionMessage('Layout must be loaded only once.');
         $this->_view->setIsLayoutLoaded(true);
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout();
     }
 
@@ -166,7 +167,8 @@ public function testLoadLayoutWithDefaultSetup(): void
         $this->_layoutProcessor
             ->method('addHandle')
             ->withConsecutive(['default']);
-        $this->_requestMock->expects($this->any())->method('getFullActionName')->willReturn('action_name');
+        $this->_requestMock->method('getFullActionName')->willReturn('action_name');
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout();
     }
 
@@ -175,6 +177,8 @@ public function testLoadLayoutWithDefaultSetup(): void
      */
     public function testLoadLayoutWhenBlocksNotGenerated(): void
     {
+        $this->_requestMock->method('getFullActionName')->willReturn('action_name');
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout('', false, true);
     }
 
@@ -183,6 +187,8 @@ public function testLoadLayoutWhenBlocksNotGenerated(): void
      */
     public function testLoadLayoutWhenXmlNotGenerated(): void
     {
+        $this->_requestMock->method('getFullActionName')->willReturn('action_name');
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout('', true, false);
     }
 
@@ -263,8 +269,12 @@ public function testGenerateLayoutBlocksWhenFlagIsSet(): void
      */
     public function testRenderLayoutIfActionFlagExist(): void
     {
-        $this->_actionFlagMock->expects($this->once())->method('get')->with('', 'no-renderLayout')->willReturn(true);
+        $this->_actionFlagMock->expects($this->once())
+            ->method('get')
+            ->with('', 'no-renderLayout')
+            ->willReturn(true);
         $this->_eventManagerMock->expects($this->never())->method('dispatch');
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->renderLayout();
     }
 
@@ -279,6 +289,7 @@ public function testRenderLayoutWhenOutputNotEmpty(): void
             ->willReturn(false);
         $this->_layoutMock->expects($this->once())->method('addOutputElement')->with('output');
         $this->resultPage->expects($this->once())->method('renderResult')->with($this->response);
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->renderLayout('output');
     }
 
@@ -294,6 +305,7 @@ public function testRenderLayoutWhenOutputEmpty(): void
 
         $this->_layoutMock->expects($this->never())->method('addOutputElement');
         $this->resultPage->expects($this->once())->method('renderResult')->with($this->response);
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->renderLayout();
     }
 }

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

@@ -157,8 +157,7 @@ public function getSourceClassNameWithoutNamespace()
      */
     protected function _getFullyQualifiedClassName($className)
     {
-        $className = ltrim($className, '\\');
-        return $className ? '\\' . $className : '';
+        return $className ? '\\' . ltrim($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/View/Changelog.php

@@ -265,7 +265,7 @@ public function getVersion()
      */
     public function getName()
     {
-        if (strlen($this->viewId) == 0) {
+        if (!$this->viewId || strlen($this->viewId) == 0) {
             throw new \DomainException(
                 new Phrase("View's identifier is not set")
             );

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

@@ -56,10 +56,11 @@ public function testExtendWithCacheMock()
         $cache = $this->getMockForAbstractClass(ConfigCacheInterface::class);
         $cache->expects($this->once())->method('get')->willReturn(false);
 
-        $config = new Config(null, $definitions);
         $serializerMock = $this->getMockForAbstractClass(SerializerInterface::class);
-        $serializerMock->expects($this->exactly(2))
-            ->method('serialize');
+        $serializerMock->expects($this->atLeast(2))
+            ->method('serialize')
+            ->willReturn('[[],[],[],[]]');
+        $config = new Config(null, $definitions, $serializerMock);
         $this->objectManagerHelper->setBackwardCompatibleProperty(
             $config,
             'serializer',

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