tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #326 from halkyon/function_exists_removal

Browse Source 
MINOR Removed function_exists() checks which aren't necessary for PHP 5.2+
This commit is contained in:
Ingo Schommer 2012-04-16 01:55:23 -07:00
commit 51d4b86f2c
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/CliTestReporter.php
View File

@ -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")); 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 // 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'])) { if((isset($_GET['args']) && is_array($_GET['args']) && in_array('--showslow', $_GET['args'])) || isset($_GET['showslow'])) {

7
dev/install/install.php5
View File

@ -156,12 +156,7 @@ if($req->isIIS()) {
if($req->hasErrors()) { if($req->hasErrors()) {
$hasErrorOtherThanDatabase = true; $hasErrorOtherThanDatabase = true;
if ( function_exists('php_ini_loaded_file')) { $phpIniLocation = php_ini_loaded_file();
// show the location of the php.ini if any issues exist
$phpIniLocation = php_ini_loaded_file();
} else {
$phpIniLocation = null;
}
} }
if($databaseConfig) { if($databaseConfig) {