MINOR Removed function_exists() checks which aren't necessary for PHP…

… 5.2+
silverstripe · Apr 16, 2012 · bbf04ee · bbf04ee
1 parent 3832069
commit bbf04ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/dev/CliTestReporter.php b/dev/CliTestReporter.php
@@ -41,9 +41,7 @@ public function writeResults() {
 
 		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
@@ -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) {