tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split complex if statements

This commit is contained in:
Alexander A. Klimov 2015-09-23 15:53:10 +02:00
parent abcdc5adb1
commit d6cf6313b9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Icinga/Application/Version.php
View File

@ -15,14 +15,21 @@ class Version
*/ */
public static function get() public static function get()
{ {
if (false !== ($gitHead = @file_get_contents(( $gitDir = Icinga::app()->getBaseDir('.git');
$gitDir = Icinga::app()->getBaseDir('.git') $gitHead = @file_get_contents($gitDir . DIRECTORY_SEPARATOR . 'HEAD');
) . DIRECTORY_SEPARATOR . 'HEAD'))) { if (false !== $gitHead) {
$matches = array(); $matches = array();
if ((1 !== @preg_match('/(?<!.)ref:\s+(?P<gitCommitID>.+?)$/ms', $gitHead, $matches) || false !== ( if (@preg_match('/(?<!.)ref:\s+(.+?)$/ms', $gitHead, $matches)) {
$gitHead = @file_get_contents($gitDir . DIRECTORY_SEPARATOR . $matches['gitCommitID']) $gitCommitID = @file_get_contents($gitDir . DIRECTORY_SEPARATOR . $matches[1]);
)) && 1 === @preg_match('/(?<!.)(?P<gitCommitID>[0-9a-f]+)$/ms', $gitHead, $matches)) { } else {
return $matches; $gitCommitID = $gitHead;
}
if (false !== $gitCommitID) {
$matches = array();
if (@preg_match('/(?<!.)(?P<gitCommitID>[0-9a-f]+)$/ms', $gitCommitID, $matches)) {
return $matches;
}
} }
} }