Rely on di container for globals

Explicitely declare all globals

diff --git a/galette/includes/dependencies.php b/galette/includes/dependencies.php
index 1497be4c6a8a0b09cc215bca24773ac4beb85235..3f36d1af3153037ff67435207aa23e2660d51725 100644 (file)
--- a/galette/includes/dependencies.php
+++ b/galette/includes/dependencies.php
@@ -390,16 +390,16 @@ $container['event_manager'] = function ($c) {
 };
 
 //For bad existing globals can be used...
+global $translator, $i18n;
 if (!isset($container['mode']) || ($container['mode'] !== 'INSTALL' && $container['mode'] !== 'NEED_UPDATE')) {
+    global $zdb, $preferences, $login, $hist, $l10n, $emitter;
     $zdb = $container->get('zdb');
     $preferences = $container->get('preferences');
     $login = $container->get('login');
     $hist = $container->get('history');
-    global $l10n;
     $l10n = $container->get('l10n');
     $emitter = $container->get('event_manager');
 }
-global $translator, $i18n;
 $i18n = $container->get('i18n');
 $translator = $container->get('translator');
 

diff --git a/tests/TestsBootstrap.php b/tests/TestsBootstrap.php
index 2743ea506a262f1f0421e0a05774a6e6bbac8ffd..5b1b9c46e4f60a0ab08ab288e05cdda8af09286f 100755 (executable)
--- a/tests/TestsBootstrap.php
+++ b/tests/TestsBootstrap.php
@@ -82,13 +82,12 @@ $app = new \Slim\App(
 );
 session_start();
 
-//Globals... :(
-global $preferences, $emitter;
-$zdb = new \Galette\Core\Db();
-$preferences = new \Galette\Core\Preferences($zdb);
-$emitter = new \Slim\Event\SlimEventManager();
-
 require_once GALETTE_BASE_PATH . '/includes/dependencies.php';
+//Globals... :(
+global $preferences, $emitter, $zdb;
+$zdb = $container->get('zdb');
+$preferences = $container->get('preferences');
+$emitter = $container->get('event_manager');
 $i18n->changeLanguage('en_US');
 
 if (!defined('_CURRENT_THEME_PATH')) {