refactoring & test fixing

composer.json

@@ -34,8 +34,10 @@
 		"lightopenid/lightopenid": "dev-master",
 		"michelf/php-markdown": "^1.7",
 		"mobiledetect/mobiledetectlib": "2.8.*",
+		"monolog/monolog": "^1.24",
 		"paragonie/random_compat": "^2.0",
 		"pear/text_languageDetect": "1.*",
+		"psr/container": "^1.0",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^3.1",
 		"fxp/composer-asset-plugin": "~1.3",
@@ -49,9 +51,7 @@
 		"npm-asset/jgrowl": "^1.4",
 		"npm-asset/fullcalendar": "^3.0.1",
 		"npm-asset/cropperjs": "1.2.2",
-		"npm-asset/imagesloaded": "4.1.4",
+		"npm-asset/imagesloaded": "4.1.4"
-		"monolog/monolog": "^1.24",
-		"psr/container": "^1.0"
 	},
 	"repositories": [
 		{

src/Util/Profiler.php

@@ -91,6 +91,19 @@ class Profiler implements ContainerInterface
 	public function reset($performance = true, $callstack = true)
 	{
 		if ($performance) {
+			$this->resetPerformance();
+		}
+
+		if ($callstack) {
+			$this->resetCallstack();
+		}
+	}
+
+	/**
+	 * Resets the performance profiling data
+	 */
+	public function resetPerformance()
+	{
 		$this->performance = [];
 		$this->performance['start'] = microtime(true);
 		$this->performance['database'] = 0;
@@ -105,7 +118,12 @@ class Profiler implements ContainerInterface
 		$this->performance['marktime'] = microtime(true);
 	}
 
-		if ($callstack) {
+	/**
+	 * Resets the callstack profiling data
+	 */
+	public function resetCallstack()
+	{
+		$this->callstack = [];
 		$this->callstack['database'] = [];
 		$this->callstack['database_write'] = [];
 		$this->callstack['cache'] = [];
@@ -115,7 +133,6 @@ class Profiler implements ContainerInterface
 		$this->callstack['rendering'] = [];
 		$this->callstack['parser'] = [];
 	}
-	}
 
 	/**
 	 * Save the current profiling data to a log entry
@@ -125,8 +142,10 @@ class Profiler implements ContainerInterface
 	public function saveLog($message = '')
 	{
 		// Write down the performance values into the log
-		if ($this->enabled) {
+		if (!$this->enabled) {
-			$duration = microtime(true)-$this->get('start');
+			return;
+		}
+		$duration = microtime(true) - $this->get('start');
 		$this->logger->info(
 			$message,
 			[
@@ -145,14 +164,17 @@ class Profiler implements ContainerInterface
 			]
 		);
 
+		if (!$this->rendertime) {
+			return;
+		}
+		
 		$o = '';
-			if ($this->rendertime) {
 		if (isset($this->callstack["database"])) {
 			$o .= "\nDatabase Read:\n";
 			foreach ($this->callstack["database"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-							$o .= $func.": ".$time."\n";
+					$o .= $func . ": " . $time . "\n";
 				}
 			}
 		}
@@ -161,7 +183,7 @@ class Profiler implements ContainerInterface
 			foreach ($this->callstack["database_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-							$o .= $func.": ".$time."\n";
+					$o .= $func . ": " . $time . "\n";
 				}
 			}
 		}
@@ -170,7 +192,7 @@ class Profiler implements ContainerInterface
 			foreach ($this->callstack["cache"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-							$o .= $func.": ".$time."\n";
+					$o .= $func . ": " . $time . "\n";
 				}
 			}
 		}
@@ -179,7 +201,7 @@ class Profiler implements ContainerInterface
 			foreach ($this->callstack["cache_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-							$o .= $func.": ".$time."\n";
+					$o .= $func . ": " . $time . "\n";
 				}
 			}
 		}
@@ -188,16 +210,13 @@ class Profiler implements ContainerInterface
 			foreach ($this->callstack["network"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-							$o .= $func.": ".$time."\n";
+					$o .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		$this->logger->info($message . ": " . $o);
 	}
 
-		}
-	}
-
 	/**
 	 * Finds an entry of the container by its identifier and returns it.
 	 *

tests/src/Core/Console/ConsoleTest.php

@@ -3,10 +3,12 @@
 namespace Friendica\Test\src\Core\Console;
 
 use Asika\SimpleConsole\Console;
+use Friendica\Core\Config\ConfigCache;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\Intercept;
 use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\Profiler;
 
 abstract class ConsoleTest extends MockedTest
 {
@@ -29,8 +31,10 @@ abstract class ConsoleTest extends MockedTest
 		Intercept::setUp();
 
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$configMock = \Mockery::mock(ConfigCache::class);
 		$this->mockApp($this->root, $configMock);
+		$profileMock = \Mockery::mock(Profiler::class);
+		$this->app->shouldReceive('getProfiler')->andReturn($profileMock);
 	}
 
 	/**