Skip to content
This repository
Browse code

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

… 5.2+
  • Loading branch information...
commit bbf04ee7eade1fa319ef7c54087e3f2caec8237a 1 parent 3832069
Sean Harvey authored April 16, 2012
4  dev/CliTestReporter.php
@@ -41,9 +41,7 @@ public function writeResults() {
41 41
 
42 42
 		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"));
43 43
 
44  
-		if(function_exists('memory_get_peak_usage')) {
45  
-			echo "Maximum memory usage: " . number_format(memory_get_peak_usage()/(1024*1024), 1) . "M\n\n";
46  
-		}
  44
+		echo "Maximum memory usage: " . number_format(memory_get_peak_usage()/(1024*1024), 1) . "M\n\n";
47 45
 		
48 46
 		// Use sake dev/tests/all --showslow to show slow tests
49 47
 		if((isset($_GET['args']) && is_array($_GET['args']) && in_array('--showslow', $_GET['args'])) || isset($_GET['showslow'])) {
7  dev/install/install.php5
@@ -156,12 +156,7 @@ if($req->isIIS()) {
156 156
 
157 157
 if($req->hasErrors()) {
158 158
 	$hasErrorOtherThanDatabase = true;
159  
-	if ( function_exists('php_ini_loaded_file')) {
160  
-		// show the location of the php.ini if any issues exist
161  
-		$phpIniLocation = php_ini_loaded_file();
162  
-	} else {
163  
-		$phpIniLocation = null;
164  
-	}
  159
+	$phpIniLocation = php_ini_loaded_file();
165 160
 }
166 161
 
167 162
 if($databaseConfig) {

0 notes on commit bbf04ee

Please sign in to comment.
Something went wrong with that request. Please try again.