Run with shop 8.0.x and facts spike

Author: hkreuter

.github/workflows/dispatch_module.yaml

@@ -13,7 +13,7 @@ on:
                     - 'PHP8.3/MySQL5.7'
                     - 'PHP8.3/MySQL8.0'
                     - 'PHP8.3/MariaDb11'
-                default: 'PHP8.2/MySQL5.7'
+                default: 'PHP8.3/MySQL8.0'
                 description: 'Limit to one PHP/MySQL combination'
 
 jobs:
@@ -40,7 +40,7 @@ jobs:
                        ;;
                   esac
                   # shellcheck disable=SC2088
-                  TESTPLAN="~/defaults/7.3.x.yaml,${LIMIT}~/graphql-base.yaml"
+                  TESTPLAN="~/defaults/8.0.x.yaml,${LIMIT}~/graphql-base.yaml"
                   echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
 
     dispatch_stable:

CHANGELOG-v10.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Undecided] - unrelreased
+## [Undecided] - unreleased
+
+## Changed
+- Update module to work with OXID eShop 8.0
+
+## [Undecided] - unreleased
 
 ## Changed
 - Update module to work with OXID eShop 7.3

composer.json

@@ -13,12 +13,13 @@
         "symfony/cache": "*",
         "ecodev/graphql-upload": "^7.0.0",
         "laminas/laminas-diactoros": "^2.5",
-        "myclabs/php-enum": "^1.8"
+        "myclabs/php-enum": "^1.8",
+        "oxid-esales/oxideshop-facts": "dev-b-8.0.x-compatibility-OXDEV-7248"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.4",
         "ext-xdebug": "*",
-        "oxid-esales/oxideshop-ce": "dev-b-7.3.x",
+        "oxid-esales/oxideshop-ce": "dev-b-8.0.x",
         "phpstan/phpstan": "^1.10",
         "squizlabs/php_codesniffer": "3.*",
         "phpmd/phpmd": "^2.11",
@@ -27,7 +28,7 @@
         "codeception/module-phpbrowser": "*",
         "codeception/module-db": "*",
         "codeception/codeception": "^5.0",
-        "oxid-esales/codeception-modules": "dev-b-7.3.x",
+        "oxid-esales/codeception-modules": "dev-b-8.0.x",
         "codeception/module-asserts": "^3.0"
     },
   "conflict": {

tests/Codeception/Acceptance.suite.yml

@@ -1,6 +1,8 @@
 # suite config
 actor: AcceptanceTester
 path: Acceptance
+bootstrap: _bootstrap.php
+
 modules:
   enabled:
     - Asserts

tests/Codeception/Config/CodeceptionParametersProvider.php

@@ -9,15 +9,11 @@
 
 namespace OxidEsales\GraphQL\Base\Tests\Codeception\Config;
 
+use OxidEsales\Codeception\Module\Database;
 use OxidEsales\Codeception\Module\Database\DatabaseDefaultsFileGenerator;
-use OxidEsales\Facts\Config\ConfigFile;
 use OxidEsales\Facts\Facts;
 use Symfony\Component\Filesystem\Path;
 
-if ($shopRootPath = getenv('SHOP_ROOT_PATH')) {
-    require_once(Path::join($shopRootPath, 'source', 'bootstrap.php'));
-}
-
 class CodeceptionParametersProvider {
 
     public function getParameters(): array
@@ -35,7 +31,7 @@ public function getParameters(): array
             'DB_HOST' => $facts->getDatabaseHost(),
             'DB_PORT' => $facts->getDatabasePort(),
             'MODULE_DUMP_PATH' => $this->getModuleTestDataDumpFilePath(),
-            'MYSQL_CONFIG_PATH' => $this->getMysqlConfigPath(),
+            'MYSQL_CONFIG_PATH' => $this->generateMysqlStarUpConfigurationFile(),
             'PHP_BIN' => $php,
         ];
     }
@@ -45,14 +41,16 @@ private function getModuleTestDataDumpFilePath()
         return Path::join(__DIR__, '..', 'Support', 'Data', 'dump.sql');
     }
 
-    private function getMysqlConfigPath()
+    private function generateMysqlStarUpConfigurationFile(): string
     {
         $facts = new Facts();
-        $configFile = new ConfigFile($facts->getSourcePath() . '/config.inc.php');
-
-        $generator = new DatabaseDefaultsFileGenerator($configFile);
 
-        return $generator->generate();
+        return Database::generateStartupOptionsFile(
+            $facts->getDatabaseUserName(),
+            $facts->getDatabasePassword(),
+            $facts->getDatabaseHost(),
+            $facts->getDatabasePort(),
+        );
     }
 }
 

tests/Integration/Framework/GraphQLQueryHandlerFileUploadTest.php

@@ -9,6 +9,7 @@
 
 namespace OxidEsales\GraphQL\Base\Tests\Integration\Framework;
 
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Container\BootstrapContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\Dao\ProjectYamlDao;
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\Service\ProjectYamlImportService;
@@ -34,6 +35,8 @@ public static function tearDownAfterClass(): void
 
     public function testFileUpload(): void
     {
+        ContainerFactory::resetContainer();
+
         $expected = file_get_contents(self::UPLOAD_FILE);
         $result = $this->uploadFile(self::UPLOAD_FILE, $this->getMutationData());
 

tests/Integration/Infrastructure/RefreshTokenRepositoryTest.php

@@ -11,8 +11,8 @@
 
 use DateTime;
 use DateTimeImmutable;
-use Doctrine\DBAL\Connection;
-use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionProviderInterface;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
+use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionFactoryInterface;
 use OxidEsales\GraphQL\Base\DataType\UserInterface;
 use OxidEsales\GraphQL\Base\Exception\InvalidRefreshToken;
 use OxidEsales\GraphQL\Base\Infrastructure\RefreshTokenRepository;
@@ -23,6 +23,13 @@
 #[CoversClass(RefreshTokenRepository::class)]
 class RefreshTokenRepositoryTest extends TestCase
 {
+    protected function tearDown(): void
+    {
+        $this->cleanUp();
+
+        parent::tearDown();
+    }
+
     public function testGetNewRefreshTokenGivesCorrectlyFilledDataType(): void
     {
         $sut = $this->getSut();
@@ -172,21 +179,18 @@ public function testInvalidateRefreshTokensWrongUserId(): void
         $this->assertTrue($sut->getTokenUser($token) instanceof UserInterface);
     }
 
-    private function getDbConnection(): Connection
-    {
-        return $this->get(ConnectionProviderInterface::class)->get();
-    }
-
     public function getSut(): RefreshTokenRepositoryInterface
     {
-        return $this->get(RefreshTokenRepositoryInterface::class);
+        return self::$container->get(RefreshTokenRepositoryInterface::class);
     }
 
     private function checkRefreshTokenWithIdExists(string $oxid): bool
     {
-        $result = $this->getDbConnection()->executeQuery(
-            "select count(*) from `oegraphqlrefreshtoken` where OXID=:oxid",
-            ['oxid' => $oxid]
+        $result = ContainerFacade::get(ConnectionFactoryInterface::class)
+            ->create()
+            ->executeQuery(
+                "select count(*) from `oegraphqlrefreshtoken` where OXID=:oxid",
+                ['oxid' => $oxid]
         );
 
         return $result->fetchOne() > 0;
@@ -200,11 +204,22 @@ public function addToken(
     ): void {
         $insertTokensQuery = "insert into `oegraphqlrefreshtoken` (OXID, OXUSERID, TOKEN, EXPIRES_AT)
             values (:oxid, :oxuserid, :token, :expires)";
-        $this->getDbConnection()->executeQuery($insertTokensQuery, [
+        ContainerFacade::get(ConnectionFactoryInterface::class)
+            ->create()
+            ->executeQuery($insertTokensQuery, [
             "oxid" => $oxid,
             "oxuserid" => $userId ?? uniqid(),
             'token' => $token ?? uniqid(),
             "expires" => $expires,
         ]);
     }
+
+    private function cleanUp(): void
+    {
+        ContainerFacade::get(ConnectionFactoryInterface::class)
+            ->create()
+            ->executeQuery(
+                'truncate table `oegraphqlrefreshtoken`'
+            );
+    }
 }

tests/Integration/Infrastructure/TokenTest.php

@@ -13,16 +13,19 @@
 use Lcobucci\JWT\Token\DataSet;
 use Lcobucci\JWT\UnencryptedToken;
 use OxidEsales\Eshop\Application\Model\User;
-use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
+use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionFactoryInterface;
 use OxidEsales\EshopCommunity\Tests\TestContainerFactory;
 use OxidEsales\GraphQL\Base\DataType\Token as TokenDataType;
 use OxidEsales\GraphQL\Base\DataType\User as UserDataType;
 use OxidEsales\GraphQL\Base\Infrastructure\Model\Token as TokenModel;
 use OxidEsales\GraphQL\Base\Infrastructure\Token as TokenInfrastructure;
 use OxidEsales\GraphQL\Base\Service\Token;
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
+use OxidEsales\EshopCommunity\Tests\ContainerTrait;
+use PHPUnit\Framework\TestCase;
 
-class TokenTest extends IntegrationTestCase
+class TokenTest extends TestCase
 {
     private const TEST_TOKEN_ID = '_my_test_token';
 
@@ -31,15 +34,33 @@ class TokenTest extends IntegrationTestCase
     /** @var TokenInfrastructure */
     private $tokenInfrastructure;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
         $containerFactory = new TestContainerFactory();
         $container = $containerFactory->create();
+
+        $container->setParameter(
+            'oxid_esales.db.replicate',
+            false
+        );
+        $container->setParameter(
+            'oxid_esales.db.replicas',
+            []
+        );
+
         $container->compile();
         $this->tokenInfrastructure = $container->get(TokenInfrastructure::class);
     }
 
+    protected function tearDown(): void
+    {
+        $this->cleanUp();
+
+        parent::tearDown();
+    }
+
+
     public function testRegisterToken(): void
     {
         $this->tokenInfrastructure->registerToken(
@@ -311,7 +332,7 @@ public function testUserHasToken(): void
     public function testInvalidateTokenAfterDeleteUser(): void
     {
         $userModel = oxNew(User::class);
-        $userModel->setId('_testUser');
+        $userModel->setId(self::TEST_USER_ID);
         $userModel->setPassword('_testPassword');
         $userModel->assign(['oxusername' => '_testUsername']);
         $userModel->save();
@@ -379,4 +400,13 @@ private function getTokenMock(
 
         return $token;
     }
+
+    private function cleanUp(): void
+    {
+        ContainerFacade::get(ConnectionFactoryInterface::class)
+            ->create()
+            ->executeQuery(
+                'truncate table `oegraphqltoken`'
+            );
+    }
 }

tests/Integration/TestCase.php

@@ -12,8 +12,8 @@
 use DateTimeImmutable;
 use Lcobucci\JWT\UnencryptedToken;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
-use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
+use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionFactoryInterface;
 use OxidEsales\EshopCommunity\Tests\TestContainerFactory;
 use OxidEsales\Facts\Facts;
 use OxidEsales\GraphQL\Base\DataType\UserInterface;
@@ -30,8 +30,10 @@
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use PHPUnit\Framework\TestCase as FrameworkTestCase;
 
-abstract class TestCase extends IntegrationTestCase
+
+abstract class TestCase extends FrameworkTestCase
 {
     protected static $queryResult;
 
@@ -42,17 +44,13 @@ abstract class TestCase extends IntegrationTestCase
 
     protected static $query;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
-        $connection = ContainerFactory::getInstance()
-            ->getContainer()
-            ->get(QueryBuilderFactoryInterface::class)
+        ContainerFacade::get(ConnectionFactoryInterface::class)
             ->create()
-            ->getConnection();
-
-        $connection->executeStatement(
+            ->executeStatement(
             file_get_contents(
                 __DIR__ . '/../Fixtures/dump.sql'
             )
@@ -63,6 +61,9 @@ public function setUp(): void
         if (static::$container !== null) {
             return;
         }
+
+      #  ContainerFactory::resetContainer();
+
         $containerFactory = new TestContainerFactory();
         static::$container = $containerFactory->create();
 
@@ -97,13 +98,21 @@ public function setUp(): void
             'oxidesales.graphqlbase.cacheadapter',
             $cache
         );
+        static::$container->setParameter(
+            'oxid_esales.db.replicate',
+            false
+        );
+        static::$container->setParameter(
+            'oxid_esales.db.replicas',
+            []
+        );
 
         static::beforeContainerCompile();
 
         static::$container->compile();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
         static::$queryResult = null;
@@ -116,6 +125,8 @@ public function tearDown(): void
             }
             unset($_SERVER['HTTP_AUTHORIZATION']);
         }
+
+      #  ContainerFactory::resetContainer();
     }
 
     protected function setAuthToken(string $token): void

tests/phpunit.xml

@@ -5,6 +5,7 @@
          cacheDirectory=".phpunit.cache"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         processIsolation="true"
 >
   <testsuites>
     <testsuite name="Unit">