Remove debugging code, remove no longer needed property from config.i…

…ni.travis.php, and always check if the local config.ini.php file exists.
matomo-org · Mar 3, 2014 · 0195bb5 · 0195bb5
1 parent 85fb9a4
commit 0195bb5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/core/Config.php b/core/Config.php
@@ -167,16 +167,9 @@ public static function getLocalConfigPath()
     {
         $path = self::getByDomainConfigPath();
         if ($path) {
-        $fd = fopen(PIWIK_INCLUDE_PATH . '/tmp/logs/piwik.log', 'a');
-        fwrite($fd, "Found config by domain '$path'.");
-        fclose($fd);
             return $path;
         }
-        $r = PIWIK_USER_PATH . self::$defaultLocalConfigPath;
-        $fd = fopen(PIWIK_INCLUDE_PATH . '/tmp/logs/piwik.log', 'a');
-        fwrite($fd, "Found config file local path: '$r'.");
-        fclose($fd);
-        return $r;
+        return PIWIK_USER_PATH . self::$defaultLocalConfigPath;
     }
 
     private static function getLocalConfigInfoForHostname($hostname)
@@ -298,9 +291,8 @@ public function init()
 
         $this->configCommon = _parse_ini_file($this->pathCommon, true);
 
-        if ($reportError) {
-            $this->checkLocalConfigFound();
-        }
+        $this->checkLocalConfigFound();
+
         $this->configLocal = _parse_ini_file($this->pathLocal, true);
         if (empty($this->configLocal) && $reportError) {
             Piwik_ExitWithMessage(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()")));

diff --git a/core/FrontController.php b/core/FrontController.php
@@ -213,7 +213,7 @@ static public function createConfigObject()
     {
         $exceptionToThrow = false;
         try {
-            Config::getInstance();
+            Config::getInstance()->database; // access property to check if the local file exists
         } catch (Exception $exception) {
 
             /**

diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
@@ -86,9 +86,6 @@ public static function addHooks()
         $testingEnvironment = new Piwik_TestingEnvironment();
 
         if ($testingEnvironment->configFileLocal) {
-        $fd = fopen(PIWIK_INCLUDE_PATH . '/tmp/logs/piwik.log', 'a');
-        fwrite($fd, "Found config file local environment override.");
-        fclose($fd);
             \Piwik\Config::$defaultLocalConfigPath = $testingEnvironment->configFileLocal;
         }
 

diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php
@@ -22,6 +22,3 @@
 [log]
 log_writers[] = file
 log_level = debug
-
-[Tests]
-persist_fixture_data = 1
diff --git a/tests/lib/screenshot-testing/run-tests.js b/tests/lib/screenshot-testing/run-tests.js
@@ -27,8 +27,6 @@ if (options['help']) {
     app.printHelpAndExit();
 }
 
-options['tests'] = ['Installation']; // TODO: remove after debugging testing done
-
 app.init();
 app.loadTestModules();
 app.runTests();