OXDEV-7822 Remove getCurrentShopId method from BasicContext

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>
OXID-eSales · Mar 28, 2024 · 3764448 · 3764448
1 parent 42d98d3
commit 3764448
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/source/Internal/Transition/Utility/BasicContext.php b/source/Internal/Transition/Utility/BasicContext.php
@@ -124,14 +124,6 @@ public function getDefaultShopId(): int
         return ShopIdCalculator::BASE_SHOP_ID;
     }
 
-    /**
-     * @return int
-     */
-    public function getCurrentShopId(): int
-    {
-        return $this->getDefaultShopId();
-    }
-
     /**
      * @return array
      */

diff --git a/tests/Integration/Internal/Container/Dao/ProjectYamlDaoTest.php b/tests/Integration/Internal/Container/Dao/ProjectYamlDaoTest.php
@@ -16,8 +16,9 @@
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\DataObject\DIConfigWrapper;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContext;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
-use OxidEsales\EshopCommunity\Tests\Integration\Internal\Container\Fixtures\CE\DummyExecutor;
+use OxidEsales\EshopCommunity\Internal\Transition\Utility\Context;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
+use OxidEsales\EshopCommunity\Tests\Integration\Internal\Container\Fixtures\CE\DummyExecutor;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Path;
 
@@ -123,7 +124,7 @@ public function testWriting()
 
     public function testClearingCacheOnWriting()
     {
-        $container = (new ContainerBuilder(new BasicContext()))->getContainer();
+        $container = (new ContainerBuilder(new Context()))->getContainer();
         $container->getDefinition(ProjectYamlDaoInterface::class)->setPublic(true);
         $container->compile();