Merge branch 'sanpii-fix-default-builder'

pomm-project · Jun 12, 2017 · d6d89cb · d6d89cb
2 parents 4311ccb + d6fced2
commit d6d89cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -50,3 +50,4 @@ install:
 script:
     - ../vendor/bin/phpcs --standard=psr2 --runtime-set ignore_warnings_on_exit true --report=summary ../sources
     - ./bin/behat
+    - ./app/console pomm:generate:schema-all default_session_builder
diff --git a/sources/lib/DependencyInjection/Configuration.php b/sources/lib/DependencyInjection/Configuration.php
@@ -65,7 +65,7 @@ public function getConfigTreeBuilder()
                             ->always()
                             ->then(function ($v) {
                                 if (!isset($v['session_builder']) && !isset($v['class:session_builder'])) {
-                                    $v['session_builder'] = 'pomm.session_builder';
+                                    $v['session_builder'] = 'pomm.model_manager.session_builder';
                                 }
                                 return $v;
                             })

diff --git a/tests/app/config/config.yml b/tests/app/config/config.yml
@@ -43,5 +43,7 @@ pomm:
         service_db:
             dsn: "pgsql://%database_user%:%database_password%@%database_host%:%database_port%/%database_name%"
             session_builder: "pomm.session_builder"
+        default_session_builder:
+            dsn: "pgsql://%database_user%:%database_password%@%database_host%:%database_port%/%database_name%"
     logger:
         service: "@logger"