improved module to latest yawik version

yawik · Nov 10, 2018 · 0334c08 · 0334c08
1 parent 5b23b92
commit 0334c08
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 37 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -40,8 +40,7 @@ default:
         user:
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Yawik\Behat\CoreContext:
-                    config: "%paths.base%/test/config/config.php"
+                - Yawik\Behat\CoreContext
                 - Yawik\Behat\UserContext
                 - Yawik\Behat\SummaryFormContext
                 - CompanyRegistration\Behat\CompanyRegistrationContext
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,6 @@
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <php>
         <env name="APPLICATION_ENV" value="test"/>
-        <env name="APP_CONFIG_DIR" value="./test/config"/>
     </php>
     <filter>
         <whitelist>

diff --git a/test/config/config.php b/test/config/config.php
diff --git a/test/sandbox/.env.dist b/test/sandbox/.env.dist
@@ -0,0 +1,2 @@
+APPLICATION_ENV=development
+TIMEZONE="Europe/Berlin"
diff --git a/test/sandbox/.gitignore b/test/sandbox/.gitignore
@@ -1,3 +1,4 @@
 public/*
 !public/index.php
-var
+var
+log
diff --git a/test/sandbox/config b/test/sandbox/config
diff --git a/test/sandbox/config/autoload/.gitignore b/test/sandbox/config/autoload/.gitignore
@@ -0,0 +1 @@
+*.local.php
diff --git a/...toload/RegistrationFormOptions.global.php → ...toload/RegistrationFormOptions.global.php b/...toload/RegistrationFormOptions.global.php → ...toload/RegistrationFormOptions.global.php
diff --git a/test/config/autoload/config.global.php → ...sandbox/config/autoload/config.global.php b/test/config/autoload/config.global.php → ...sandbox/config/autoload/config.global.php
diff --git a/test/config/autoload/mail-service.global.php → ...x/config/autoload/mail-service.global.php b/test/config/autoload/mail-service.global.php → ...x/config/autoload/mail-service.global.php
diff --git a/test/sandbox/config/autoload/yawik.config.global.php b/test/sandbox/config/autoload/yawik.config.global.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+  'doctrine' =>
+  array(
+    'connection' =>
+    array(
+      'odm_default' =>
+      array(
+        'connectionString' => 'mongodb://localhost:27017/YAWIK_TEST',
+      ),
+    ),
+    'configuration' =>
+    array(
+      'odm_default' =>
+      array(
+        'default_db' => 'YAWIK_TEST',
+      ),
+    ),
+  ),
+  'core_options' =>
+  array(
+    'system_message_email' => 'me@itstoni.com',
+  ),
+);
diff --git a/test/sandbox/config/config.php b/test/sandbox/config/config.php
@@ -0,0 +1,16 @@
+<?php
+
+chdir(dirname(__DIR__));
+return [
+    'modules' => [
+        'Core',
+        'Cv',
+        'Auth',
+        'Jobs',
+        'Applications',
+        'Organizations',
+        'Geo',
+        'Settings',
+        'CompanyRegistration',
+    ],
+];
diff --git a/test/sandbox/public/index.php b/test/sandbox/public/index.php
@@ -2,8 +2,8 @@
 
 require __DIR__.'/../../../vendor/autoload.php';
 
-use Core\Yawik;
+use Core\Application;
 
 // Retrieve configuration
-$appConfig = include __DIR__.'/../../config/config.php';
-Yawik::runApplication($appConfig);
+$appConfig = include __DIR__.'/../config/config.php';
+Application::init($appConfig)->run();