Skip to content

Add extra line at the eof to solve phpcs error, DEV-1895 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sprankhub merged 2 commits into from
Aug 20, 2026
Merged

Add extra line at the eof to solve phpcs error, DEV-1895 #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d95f70f
Add extra line at the eof to solve phpcs error, DEV-1895
kapilpandya22 Aug 20, 2026
76913b6
Fix store code URL integration tests on Magento 2.4.9, DEV-1895
kapilpandya22 Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 16 additions & 26 deletions Test/Integration/CheckDefaultStoreCodeHiddenInUrlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@

namespace CustomGento\DefaultStoreCodeRemover\Test\Integration;

use Magento\Framework\App\Config\ReinitableConfigInterface;
use Magento\Store\Api\StoreRepositoryInterface;
use Magento\Store\Model\ScopeInterface;
use Magento\Store\Model\Store;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\AbstractController;

Expand All @@ -18,60 +15,53 @@ class CheckDefaultStoreCodeHiddenInUrlTest extends AbstractController
*/
protected $storeRepository;

/**
* @var ReinitableConfigInterface
*/
protected $config;

protected function setUp(): void
{
parent::setUp();
$objectManager = Bootstrap::getObjectManager();
$this->config = $objectManager->get(ReinitableConfigInterface::class);
$this->storeRepository = $objectManager->get(StoreRepositoryInterface::class);
$this->storeRepository = Bootstrap::getObjectManager()->get(StoreRepositoryInterface::class);
}

/**
* Magento < 2.4.9 reads web/url/use_store in the store scope, Magento >= 2.4.9 in the default scope.
*
* @magentoDataFixture Magento/Store/_files/store.php
* @magentoConfigFixture default/web/url/use_store 1
* @magentoConfigFixture test_store web/url/use_store 1
*/
public function testStoreCodeIsShownInNonDefaultStoreUrl(): void
{
$store = $this->storeRepository->get('test');
$this->config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
$this->assertStringContainsString('test', $store->getBaseUrl());
}

/**
* @magentoDataFixture Magento/Store/_files/store.php
* @magentoConfigFixture default/web/url/use_store 0
* @magentoConfigFixture test_store web/url/use_store 0
*/
public function testStoreCodeIsNotShownInNonDefaultStoreUrl(): void
{
$store = $this->storeRepository->get('test');
$this->config->setValue(
Store::XML_PATH_STORE_IN_URL,
false,
ScopeInterface::SCOPE_STORE,
$store->getCode()
);
$this->assertStringNotContainsString('test', $store->getBaseUrl());
}

/**
* @magentoConfigFixture default/web/url/use_store 0
* @magentoConfigFixture default_store web/url/use_store 0
*/
public function testStoreCodeIsNotShownInDefaultStoreUrl(): void
{
$store = $this->storeRepository->get('default');
$this->config->setValue(
Store::XML_PATH_STORE_IN_URL,
false,
ScopeInterface::SCOPE_STORE,
$store->getCode()
);
$this->assertStringNotContainsString('default', $store->getBaseUrl());
}

/**
* @magentoConfigFixture default/web/url/use_store 1
* @magentoConfigFixture default_store web/url/use_store 1
*/
public function testStoreCodeIsShownInDefaultStoreUrl(): void
{
$store = $this->storeRepository->get('default');
$this->config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode());
$this->assertStringNotContainsString('default', $store->getBaseUrl());
}
}
}