Merge branch '1.3'

ezsystems · Oct 6, 2021 · 7e7130a · 7e7130a
2 parents e207a1c + 7d9f1e8
commit 7e7130a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/Resources/config/doctrine.php b/eZ/Bundle/EzPublishCoreBundle/Tests/Resources/config/doctrine.php
@@ -11,8 +11,12 @@
 use EzSystems\DoctrineSchema\Database\DbPlatform\SqliteDbPlatform;
 
 return static function (ContainerConfigurator $container): void {
+    if (!isset($_ENV['DATABASE_URL'])) {
+        $_ENV['DATABASE_URL'] = 'sqlite://:memory:';
+    }
+
     $platform = null;
-    if (substr(getenv('DATABASE_URL'), 0, strlen('sqlite://')) === 'sqlite://') {
+    if (substr($_ENV['DATABASE_URL'], 0, strlen('sqlite://')) === 'sqlite://') {
         $platform = SqliteDbPlatform::class;
     }
 

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/Resources/config/ezpublish.yaml b/eZ/Bundle/EzPublishCoreBundle/Tests/Resources/config/ezpublish.yaml
@@ -1,3 +1,6 @@
+parameters:
+    env(SEARCH_ENGINE): 'legacy'
+
 ezpublish:
     siteaccess:
           default_siteaccess: '__default_site_access__'
@@ -12,5 +15,5 @@ ezpublish:
         default:
             storage: ~
             search:
-                engine: legacy
+                engine: '%env(SEARCH_ENGINE)%'
                 connection: default