Merge pull request #46 from shopware/make-in-memory-the-default

feat: make in-memory the default
shopware · Sep 19, 2024 · f6f2a18 · f6f2a18
2 parents c38347d + 61b7f50
commit f6f2a18
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -20,7 +20,7 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         // @phpstan-ignore-next-line
         $rootNode->children()
-            ->scalarNode('storage')->defaultValue('doctrine')->end()
+            ->scalarNode('storage')->defaultValue('in-memory')->end()
             ->arrayNode('doctrine')
                 ->children()
                     ->scalarNode('shop_class')

diff --git a/src/DependencyInjection/ShopwareAppExtension.php b/src/DependencyInjection/ShopwareAppExtension.php
@@ -7,6 +7,7 @@
 use AsyncAws\DynamoDb\DynamoDbClient;
 use Shopware\App\SDK\Adapter\DynamoDB\DynamoDBRepository;
 use Shopware\App\SDK\Shop\ShopRepositoryInterface;
+use Shopware\App\SDK\Test\MockShopRepository;
 use Shopware\AppBundle\Entity\AbstractShop;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -33,9 +34,11 @@ public function load(array $configs, ContainerBuilder $container): void
             $service->setArgument(0, new Reference(DynamoDbClient::class));
             $service->setArgument(1, $config['dynamodb']['table_name'] ?? 'shops');
             $container->setDefinition(ShopRepositoryInterface::class, $service);
-        } else {
+        } elseif ($config['storage'] === 'doctrine') {
             $container->getDefinition(ShopRepositoryInterface::class)
                 ->replaceArgument(0, $config['doctrine']['shop_class'] ?? AbstractShop::class);
+        } else {
+            $container->setDefinition(ShopRepositoryInterface::class, new Definition(MockShopRepository::class));
         }
 
         $container->getDefinition(AppConfigurationFactory::class)

diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -30,7 +30,7 @@ public static function getComparableTreeBuilder(): TreeBuilder
         $rootNode = $treeBuilder->getRootNode();
 
         $rootNode->children()
-            ->scalarNode('storage')->defaultValue('doctrine')->end()
+            ->scalarNode('storage')->defaultValue('in-memory')->end()
             ->arrayNode('doctrine')
             ->children()
             ->scalarNode('shop_class')

diff --git a/tests/DependencyInjection/ShopwareAppExtensionTest.php b/tests/DependencyInjection/ShopwareAppExtensionTest.php
@@ -4,22 +4,36 @@
 
 namespace Shopware\AppBundle\Test\DependencyInjection;
 
+use AsyncAws\DynamoDb\DynamoDbClient;
 use PHPUnit\Framework\TestCase;
 use Shopware\App\SDK\Adapter\DynamoDB\DynamoDBShop;
 use Shopware\App\SDK\Shop\ShopRepositoryInterface;
+use Shopware\App\SDK\Test\MockShopRepository;
 use Shopware\AppBundle\DependencyInjection\AppConfigurationFactory;
 use Shopware\AppBundle\DependencyInjection\ShopwareAppExtension;
 use Shopware\AppBundle\Entity\AbstractShop;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 class ShopwareAppExtensionTest extends TestCase
 {
-    public function testLoadConfig(): void
+    public function testDefaultConfig(): void
     {
         $extension = new ShopwareAppExtension();
         $container = new ContainerBuilder();
         $extension->load([], $container);
 
+        static::assertTrue($container->hasDefinition(ShopRepositoryInterface::class));
+
+        static::assertSame(MockShopRepository::class, $container->getDefinition(ShopRepositoryInterface::class)->getClass());
+    }
+
+    public function testLoadConfig(): void
+    {
+        $extension = new ShopwareAppExtension();
+        $container = new ContainerBuilder();
+        $extension->load(['my_bundle' => ['storage' => 'doctrine']], $container);
+
         static::assertTrue($container->hasDefinition(ShopRepositoryInterface::class));
         static::assertTrue($container->hasDefinition(AppConfigurationFactory::class));
 
@@ -43,7 +57,7 @@ public function testLoadConfigOverwriteShopClass(): void
     {
         $extension = new ShopwareAppExtension();
         $container = new ContainerBuilder();
-        $extension->load(['my_bundle' => ['doctrine' => ['shop_class' => DynamoDBShop::class]]], $container);
+        $extension->load(['my_bundle' => ['storage' => 'doctrine', 'doctrine' => ['shop_class' => DynamoDBShop::class]]], $container);
 
         static::assertTrue($container->hasDefinition(ShopRepositoryInterface::class));
         static::assertTrue($container->hasDefinition(AppConfigurationFactory::class));
@@ -91,6 +105,11 @@ public function testLoadUseDynamoDBOverwriteTableName(): void
 
         static::assertCount(2, $container->getDefinition(ShopRepositoryInterface::class)->getArguments());
 
+        $client = $container->getDefinition(ShopRepositoryInterface::class)->getArgument(0);
+        static::assertInstanceOf(Reference::class, $client);
+
+        static::assertSame(DynamoDbClient::class, $client->__toString());
+
         $shopClass = $container->getDefinition(ShopRepositoryInterface::class)->getArgument(1);
 
         static::assertSame('foo', $shopClass);