Merge remote-tracking branch 'origin/MC-19316' into 2.2.10-develop-pr112

Author: zakdma

app/code/Magento/Store/Model/ScopeTreeProvider.php

@@ -79,25 +79,30 @@ public function get()
                 'scopes' => [],
             ];
 
-            /** @var Group $group */
-            foreach ($groups[$website->getId()] as $group) {
-                $groupScope = [
-                    'scope' => ScopeInterface::SCOPE_GROUP,
-                    'scope_id' => $group->getId(),
-                    'scopes' => [],
-                ];
-
-                /** @var Store $store */
-                foreach ($stores[$group->getId()] as $store) {
-                    $storeScope = [
-                        'scope' => ScopeInterface::SCOPE_STORES,
-                        'scope_id' => $store->getId(),
+            if (!empty($groups[$website->getId()])) {
+                /** @var Group $group */
+                foreach ($groups[$website->getId()] as $group) {
+                    $groupScope = [
+                        'scope' => ScopeInterface::SCOPE_GROUP,
+                        'scope_id' => $group->getId(),
                         'scopes' => [],
                     ];
-                    $groupScope['scopes'][] = $storeScope;
+
+                    if (!empty($stores[$group->getId()])) {
+                        /** @var Store $store */
+                        foreach ($stores[$group->getId()] as $store) {
+                            $storeScope = [
+                                'scope' => ScopeInterface::SCOPE_STORES,
+                                'scope_id' => $store->getId(),
+                                'scopes' => [],
+                            ];
+                            $groupScope['scopes'][] = $storeScope;
+                        }
+                    }
+                    $websiteScope['scopes'][] = $groupScope;
                 }
-                $websiteScope['scopes'][] = $groupScope;
             }
+
             $defaultScope['scopes'][] = $websiteScope;
         }
 

dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Console\Command;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Tests for \Magento\Indexer\Console\Command\IndexerReindexCommand.
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ */
+class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var InputInterface|Mock
+     */
+    private $inputMock;
+
+    /**
+     * @var OutputInterface|Mock
+     */
+    private $outputMock;
+
+    /**
+     * @var IndexerReindexCommand
+     */
+    private $command;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->inputMock = $this->getMockBuilder(InputInterface::class)->getMockForAbstractClass();
+        $this->outputMock = $this->getMockBuilder(OutputInterface::class)->getMockForAbstractClass();
+
+        $this->command = $this->objectManager->get(IndexerReindexCommand::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
+     */
+    public function testReindexAll()
+    {
+        $status = $this->command->run($this->inputMock, $this->outputMock);
+        $this->assertEquals(
+            \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            $status,
+            'Index wasn\'t success'
+        );
+    }
+}

dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require_once __DIR__ . '/website.php';
+
+/**
+ * @var \Magento\Store\Model\Group $storeGroup
+ */
+$storeGroup = $objectManager->create(\Magento\Store\Model\Group::class);
+$storeGroup->setCode('some_group')
+    ->setName('custom store group')
+    ->setWebsite($website);
+$storeGroup->save($storeGroup);
+
+/* Refresh stores memory cache */
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();

dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website_rollback.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require_once __DIR__ . '/website_rollback.php';