diff --git a/dev/CliTestReporter.php b/dev/CliTestReporter.php index a633edb4a..d614cae20 100644 --- a/dev/CliTestReporter.php +++ b/dev/CliTestReporter.php @@ -41,9 +41,7 @@ class CliTestReporter extends SapphireTestReporter { echo sprintf("\n\n%d tests run: %s, %s, and %s\n", $testCount, SS_Cli::text("$passCount passes"), SS_Cli::text("$failCount failures"), SS_Cli::text("$incompleteCount incomplete")); - if(function_exists('memory_get_peak_usage')) { - echo "Maximum memory usage: " . number_format(memory_get_peak_usage()/(1024*1024), 1) . "M\n\n"; - } + echo "Maximum memory usage: " . number_format(memory_get_peak_usage()/(1024*1024), 1) . "M\n\n"; // Use sake dev/tests/all --showslow to show slow tests if((isset($_GET['args']) && is_array($_GET['args']) && in_array('--showslow', $_GET['args'])) || isset($_GET['showslow'])) { diff --git a/dev/install/install.php5 b/dev/install/install.php5 index 5067788d1..ea81e6372 100644 --- a/dev/install/install.php5 +++ b/dev/install/install.php5 @@ -156,12 +156,7 @@ if($req->isIIS()) { if($req->hasErrors()) { $hasErrorOtherThanDatabase = true; - if ( function_exists('php_ini_loaded_file')) { - // show the location of the php.ini if any issues exist - $phpIniLocation = php_ini_loaded_file(); - } else { - $phpIniLocation = null; - } + $phpIniLocation = php_ini_loaded_file(); } if($databaseConfig) {