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

Fetch version from constant 

refs #9247
This commit is contained in:
Alexander A. Klimov 2015-06-05 12:38:55 +02:00
parent 91377a4bd7
commit cc4a47506f
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/VERSION
View File

@ -1 +1 @@
$Format:%H%d %ci$
$Format:%H %ci$

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

@ -8,6 +8,8 @@ namespace Icinga\Application;
*/
class Version
{
const VERSION = '2.0.0-rc1';
/**
* Get the version of this instance of Icinga Web 2
*
@ -28,6 +30,7 @@ class Version
if (false !== $gitCommitID) {
$matches = array();
if (@preg_match('/(?<!.)(?P<gitCommitID>[0-9a-f]+)$/ms', $gitCommitID, $matches)) {
$matches['appVersion'] = self::VERSION;
return $matches;
}
}
@ -38,21 +41,11 @@ class Version
}
$matches = array();
if (! @preg_match('/^(?P<gitCommitID>\S+)(?: \((.+?)\))? (?P<gitCommitDate>\S+)/', $appVersion, $matches)) {
if (! @preg_match('/^(?P<gitCommitID>\w+) (?P<gitCommitDate>\S+)/', $appVersion, $matches)) {
return false;
}
if (array_key_exists(1, $matches)) {
$tagMatches = array();
foreach (explode(', ', $matches[1]) as $gitRef) {
if (@preg_match('/^tag: v(.+)/', $gitRef, $tagMatches)) {
$matches['appVersion'] = $tagMatches[1];
break;
}
}
unset($matches[1]);
}
$matches['appVersion'] = self::VERSION;
return $matches;
}
}