Merge remote-tracking branch 'origin/MC-33069-CE-6' into MC-33069

zakdma · zakdma · commit 9a3ae42843ae · 2020-05-06T15:18:18.000+03:00
diff --git a/app/code/Magento/PageCache/Controller/Block/Render.php b/app/code/Magento/PageCache/Controller/Block/Render.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\PageCache\Controller\Block;
 
-class Render extends \Magento\PageCache\Controller\Block
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+class Render extends \Magento\PageCache\Controller\Block implements HttpGetActionInterface
 {
     /**
      * Returns block content depends on ajax request
@@ -27,13 +29,15 @@ public function execute()
         $currentRequestUri = $this->getRequest()->getRequestUri();
 
         $origRequest = $this->getRequest()->getParam('originalRequest');
-        if ($origRequest && is_string($origRequest)) {
-            $origRequest = json_decode($origRequest, true);
+        if ($origRequest !== null) {
+            if ($origRequest && is_string($origRequest)) {
+                $origRequest = json_decode($origRequest, true);
+            }
+            $this->getRequest()->setRouteName($origRequest['route']);
+            $this->getRequest()->setControllerName($origRequest['controller']);
+            $this->getRequest()->setActionName($origRequest['action']);
+            $this->getRequest()->setRequestUri($origRequest['uri']);
         }
-        $this->getRequest()->setRouteName($origRequest['route']);
-        $this->getRequest()->setControllerName($origRequest['controller']);
-        $this->getRequest()->setActionName($origRequest['action']);
-        $this->getRequest()->setRequestUri($origRequest['uri']);
 
         /** @var \Magento\Framework\View\Element\BlockInterface[] $blocks */
         $blocks = $this->_getBlocks();
diff --git a/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php b/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php
@@ -140,11 +140,11 @@ public function testExecuteNotAjax()
     public function testExecuteNoParams()
     {
         $this->requestMock->expects($this->once())->method('isAjax')->willReturn(true);
-        $this->requestMock->expects($this->at(10))
+        $this->requestMock->expects($this->at(6))
             ->method('getParam')
             ->with('blocks', '')
             ->willReturn('');
-        $this->requestMock->expects($this->at(11))
+        $this->requestMock->expects($this->at(7))
             ->method('getParam')
             ->with('handles', '')
             ->willReturn('');
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
@@ -16,7 +16,7 @@
 class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
     /**
-     * Tar block size
+     * Define acceptable tar block size.
      *
      * @const int
      */
@@ -447,12 +447,12 @@ protected function _extractFileHeader()
 
         $header = unpack(self::_getFormatParseHeader(), $headerBlock);
 
-        $header['mode'] = octdec($header['mode']);
-        $header['uid'] = octdec($header['uid']);
-        $header['gid'] = octdec($header['gid']);
-        $header['size'] = octdec($header['size']);
-        $header['mtime'] = octdec($header['mtime']);
-        $header['checksum'] = octdec($header['checksum']);
+        $header['mode'] = octdec((int)$header['mode']);
+        $header['uid'] = octdec((int)$header['uid']);
+        $header['gid'] = octdec((int)$header['gid']);
+        $header['size'] = octdec((int)$header['size']);
+        $header['mtime'] = octdec((int)$header['mtime']);
+        $header['checksum'] = octdec((int)$header['checksum']);
 
         if ($header['type'] == "5") {
             $header['size'] = 0;
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
@@ -112,6 +112,9 @@ public function testSave()
             ->method('save')
             ->with($data, $this->anything(), $prefixedTags)
             ->willReturn(true);
+        $backendMock->expects($this->once())
+            ->method('getCapabilities')
+            ->willReturn(['priority' => null]);
         $frontend = new Core([
             'disable_save'              => false,
             'caching'                   => true,
diff --git a/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceApplier.php b/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceApplier.php
@@ -71,7 +71,8 @@ public function apply($entity)
         $entityType = $this->typeResolver->resolve($entity);
 
         /** @var \Magento\Framework\DB\Sequence\SequenceInterface|null $sequence */
-        $sequence = $this->sequenceRegistry->retrieve($entityType)['sequence'];
+        $sequence = $this->sequenceRegistry->retrieve($entityType) ?
+            $this->sequenceRegistry->retrieve($entityType)['sequence'] : null;
 
         if ($sequence) {
             $metadata = $this->metadataPool->getMetadata($entityType);
diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php
@@ -138,7 +138,7 @@ public function testApplyEntityHasIdentifier()
             ->method('resolve')
             ->with($this->entityMock)
             ->willReturn($entityType);
-        $this->sequenceRegistryMock->expects($this->once())
+        $this->sequenceRegistryMock->expects($this->exactly(2))
             ->method('retrieve')
             ->with($entityType)
             ->willReturn($sequenceInfo);
@@ -176,7 +176,7 @@ public function testApplyEntityDoesNotHaveIdentifier()
             ->method('resolve')
             ->with($this->entityMock)
             ->willReturn($entityType);
-        $this->sequenceRegistryMock->expects($this->once())
+        $this->sequenceRegistryMock->expects($this->exactly(2))
             ->method('retrieve')
             ->with($entityType)
             ->willReturn($sequenceInfo);
diff --git a/lib/internal/Magento/Framework/View/Helper/PathPattern.php b/lib/internal/Magento/Framework/View/Helper/PathPattern.php
@@ -39,7 +39,7 @@ public function translatePatternFromGlob($path)
     protected function translateGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\{[^,\\}]+(?:,[^,\\}]*)*\\\\\\}~', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
+        for ($index = count($matches[0]) - 1; $index >= 0; --$index) {
             list($match, $offset) = $matches[0][$index];
             $replacement = substr_replace($match, '(?:', 0, 2);
             $replacement = substr_replace($replacement, ')', -2);
@@ -65,9 +65,9 @@ protected function translateGroupsFromGlob($pattern)
     protected function translateCharacterGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\[(\\\\\\!)?[^\\]]+\\\\\\]~i', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
+        for ($index = count($matches[0]) - 1; $index >= 0; --$index) {
             list($match, $offset) = $matches[0][$index];
-            $exclude = !empty($matches[1][$index]);
+            $exclude = !empty($matches[1][$index][0]);
             $replacement = substr_replace($match, '[' . ($exclude ? '^' : ''), 0, $exclude ? 4 : 2);
             $replacement = substr_replace($replacement, ']', -2);
             $replacement = str_replace('\\-', '-', $replacement);
diff --git a/setup/src/Magento/Setup/Fixtures/Quote/QuoteGenerator.php b/setup/src/Magento/Setup/Fixtures/Quote/QuoteGenerator.php
@@ -583,7 +583,7 @@ private function prepareQueryTemplates()
      * @param array $replacements
      * @return void
      */
-    protected function query($table, ... $replacements)
+    protected function query($table, ...$replacements)
     {
         $query = $this->queryTemplates[$table];
         foreach ($replacements as $data) {
@@ -689,7 +689,7 @@ private function prepareConfigurableProducts(array $productIds = [])
             foreach ($options as $option) {
                 $attributesInfo[] = [
                     "label" => $option->getLabel(),
-                    "value" => $option['options']['0']['label'],
+                    "value" => isset($option['options']) ? $option['options']['0']['label'] : null,
                     "option_id" => $option->getAttributeId(),
                     "option_value" => $option->getValues()[0]->getValueIndex()
                 ];
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php
@@ -99,7 +99,14 @@ public function testStartAction()
     {
         $this->webLogger->expects($this->once())->method('clear');
         $this->installer->expects($this->once())->method('install');
-        $this->installer->expects($this->exactly(2))->method('getInstallInfo');
+        $this->installer->expects($this->exactly(2))
+            ->method('getInstallInfo')
+            ->willReturn(
+                [
+                    'key' => null,
+                    'message' => null,
+                ]
+            );
         $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $jsonModel = $this->controller->startAction();
         $this->assertInstanceOf(JsonModel::class, $jsonModel);
@@ -140,6 +147,14 @@ public function testStartActionWithSampleDataError()
         $this->webLogger->expects($this->never())->method('logError');
         $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $this->installer->method('install');
+        $this->installer->expects($this->exactly(2))
+            ->method('getInstallInfo')
+            ->willReturn(
+                [
+                    'key' => null,
+                    'message' => null,
+                ]
+            );
         $this->sampleDataState->expects($this->once())->method('hasError')->willReturn(true);
         $jsonModel = $this->controller->startAction();
         $this->assertInstanceOf(JsonModel::class, $jsonModel);
diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/CartPriceRulesFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/CartPriceRulesFixtureTest.php
@@ -173,7 +173,7 @@ public function testGenerateAdvancedCondition($ruleId, $categoriesArray, $ruleCo
                 'type' => Product::class,
                 'attribute' => 'category_ids',
                 'operator' => '==',
-                'value' => null,
+                'value' => 0,
             ];
 
             $secondCondition = [
@@ -261,8 +261,8 @@ public function testGenerateAdvancedCondition($ruleId, $categoriesArray, $ruleCo
     public function dataProviderGenerateAdvancedCondition()
     {
         return [
-            [1, [0], 1],
-            [1, [0], 300]
+            [1, [[0]], 1],
+            [1, [[0]], 300]
         ];
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/IndexersStatesApplyFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/IndexersStatesApplyFixtureTest.php
@@ -60,7 +60,12 @@ public function testExecute()
             ->expects($this->once())
             ->method('getValue')
             ->willReturn([
-                'indexer' => ['id' => 1]
+                'indexer' => [
+                    [
+                        'id' => 1,
+                        'set_scheduled' => false,
+                    ]
+                ]
             ]);
         $this->fixtureModelMock
             ->method('getObjectManager')
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Customer/CustomerDataGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Customer/CustomerDataGeneratorTest.php
@@ -11,6 +11,7 @@
 use Magento\Setup\Model\Customer\CustomerDataGenerator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 
 class CustomerDataGeneratorTest extends TestCase
 {
@@ -39,14 +40,20 @@ class CustomerDataGeneratorTest extends TestCase
      */
     private $customerGenerator;
 
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $groupCollectionFactoryMock;
+
     protected function setUp(): void
     {
-        $this->groupCollectionFactoryMock =
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Group\CollectionFactory::class)->addMethods(
+        $this->groupCollectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->addMethods(
                 ['getAllIds']
             )
-                ->onlyMethods(['create'])
-                ->getMock();
+            ->onlyMethods(['create'])
+            ->getMock();
 
         $this->groupCollectionFactoryMock
             ->expects($this->once())
