MC-40538: When entering example.com/0 into browser the homepage is shown (example.com)

Author: dhorytskyi

app/code/Magento/Store/Model/Validation/StoreValidator.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Validator\AbstractValidator;
 use Magento\Framework\Validator\DataObjectFactory;
+use Magento\Framework\Validator\ValidatorInterface;
 
 /**
  * Store model validator.
@@ -21,15 +22,15 @@ class StoreValidator extends AbstractValidator
     private $dataObjectValidatorFactory;
 
     /**
-     * @var array
+     * @var ValidatorInterface[]
      */
     private $rules;
 
     /**
      * @param DataObjectFactory $dataObjectValidatorFactory
-     * @param array $rules
+     * @param ValidatorInterface[] $rules
      */
-    public function __construct(DataObjectFactory $dataObjectValidatorFactory, array $rules)
+    public function __construct(DataObjectFactory $dataObjectValidatorFactory, array $rules = [])
     {
         $this->dataObjectValidatorFactory = $dataObjectValidatorFactory;
         $this->rules = $rules;

app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php

@@ -7,117 +7,81 @@
 
 namespace Magento\Store\Test\Unit\App\Request;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Request\Http;
-use Magento\Framework\App\Request\PathInfo;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\App\Request\PathInfoProcessor;
 use Magento\Store\App\Request\StorePathInfoValidator;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\Validation\StoreCodeValidator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class PathInfoProcessorTest extends TestCase
 {
     /**
-     * @var PathInfoProcessor
-     */
-    private $model;
-
-    /**
-     * @var MockObject|Http
-     */
-    private $requestMock;
-
-    /**
-     * @var MockObject|ScopeConfigInterface
-     */
-    private $validatorConfigMock;
-
-    /**
-     * @var MockObject|PathInfo
+     * @var StorePathInfoValidator|MockObject
      */
-    private $pathInfoMock;
+    private $storePathInfoValidatorMock;
 
     /**
-     * @var MockObject|StoreCodeValidator
+     * @var PathInfoProcessor
      */
-    private $storeCodeValidator;
+    private $model;
 
     /**
-     * @var MockObject|StoreRepositoryInterface
+     * @var Http|MockObject
      */
-    private $storeRepositoryMock;
+    private $requestMock;
 
     /**
-     * @var StorePathInfoValidator
+     * @var string
      */
-    private $storePathInfoValidator;
+    private $storeCode;
 
     /**
      * @var string
      */
-    private $pathInfo = '/storeCode/node_one/';
+    private $pathInfo;
 
     protected function setUp(): void
     {
+        $this->storePathInfoValidatorMock = $this->createMock(StorePathInfoValidator::class);
+        $this->model = new PathInfoProcessor($this->storePathInfoValidatorMock);
+
         $this->requestMock = $this->createMock(Http::class);
+        $this->storeCode = 'storeCode';
+        $this->pathInfo = '/' . $this->storeCode . '/node_one/';
+    }
 
-        $this->validatorConfigMock = $this->createMock(ScopeConfigInterface::class);
-        $this->storeRepositoryMock = $this->createMock(StoreRepositoryInterface::class);
-        $this->pathInfoMock = $this->createMock(PathInfo ::class);
-        $this->storeCodeValidator = $this->createMock(StoreCodeValidator::class);
+    public function testProcessIfStoreIsEmpty(): void
+    {
+        $this->storePathInfoValidatorMock->expects($this->once())
+            ->method('getValidStoreCode')
+            ->willReturn(null);
 
-        $this->storePathInfoValidator = new StorePathInfoValidator(
-            $this->validatorConfigMock,
-            $this->storeRepositoryMock,
-            $this->pathInfoMock,
-            $this->storeCodeValidator
-        );
-        $this->model = new PathInfoProcessor(
-            $this->storePathInfoValidator
-        );
+        $pathInfo = $this->model->process($this->requestMock, $this->pathInfo);
+        $this->assertEquals($this->pathInfo, $pathInfo);
     }
 
-    public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName()
+    public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName(): void
     {
-        $this->validatorConfigMock->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn(true);
-        $this->storeCodeValidator->expects($this->atLeastOnce())
-            ->method('isValid')
-            ->willReturn(true);
-
-        $store = $this->createMock(Store::class);
-        $this->storeRepositoryMock->expects($this->once())
-            ->method('getActiveStoreByCode')
-            ->with('storeCode')
-            ->willReturn($store);
+        $this->storePathInfoValidatorMock->expects($this->once())
+            ->method('getValidStoreCode')
+            ->willReturn($this->storeCode);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('isDirectAccessFrontendName')
-            ->with('storeCode')
+            ->with($this->storeCode)
             ->willReturn(false);
 
         $pathInfo = $this->model->process($this->requestMock, $this->pathInfo);
         $this->assertEquals('/node_one/', $pathInfo);
     }
 
-    public function testProcessIfStoreExistsAndDirectAccessToFrontName()
+    public function testProcessIfStoreExistsAndDirectAccessToFrontName(): void
     {
-        $this->validatorConfigMock->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn(true);
-        $this->storeCodeValidator->expects($this->atLeastOnce())
-            ->method('isValid')
-            ->willReturn(true);
-
-        $this->storeRepositoryMock->expects($this->once())
-            ->method('getActiveStoreByCode');
+        $this->storePathInfoValidatorMock->expects($this->once())
+            ->method('getValidStoreCode')
+            ->willReturn($this->storeCode);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('isDirectAccessFrontendName')
-            ->with('storeCode')
+            ->with($this->storeCode)
             ->willReturn(true);
         $this->requestMock->expects($this->once())
             ->method('setActionName')
@@ -126,45 +90,4 @@ public function testProcessIfStoreExistsAndDirectAccessToFrontName()
         $pathInfo = $this->model->process($this->requestMock, $this->pathInfo);
         $this->assertEquals($this->pathInfo, $pathInfo);
     }
-
-    public function testProcessIfStoreIsEmpty()
-    {
-        $this->validatorConfigMock->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn(true);
-        $this->storeCodeValidator->expects($this->any())
-            ->method('isValid')
-            ->willReturn(true);
-
-        $path = '/0/node_one/';
-        $this->storeRepositoryMock->expects($this->never())
-            ->method('getActiveStoreByCode');
-        $this->requestMock->expects($this->never())
-            ->method('isDirectAccessFrontendName');
-        $this->requestMock->expects($this->never())
-            ->method('setActionName');
-
-        $pathInfo = $this->model->process($this->requestMock, $path);
-        $this->assertEquals($path, $pathInfo);
-    }
-
-    public function testProcessIfStoreCodeIsNotExist()
-    {
-        $this->validatorConfigMock->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn(true);
-        $this->storeCodeValidator->expects($this->atLeastOnce())
-            ->method('isValid')
-            ->willReturn(true);
-
-        $this->storeRepositoryMock->expects($this->once())
-            ->method('getActiveStoreByCode')
-            ->with('storeCode')
-            ->willThrowException(new NoSuchEntityException());
-        $this->requestMock->expects($this->never())
-            ->method('isDirectAccessFrontendName');
-
-        $pathInfo = $this->model->process($this->requestMock, $this->pathInfo);
-        $this->assertEquals($this->pathInfo, $pathInfo);
-    }
 }