mirror of
https://github.com/grocy/grocy.git
synced 2025-09-16 09:51:30 +00:00
Applied PHP formatting rules
This commit is contained in:
@@ -6,6 +6,45 @@ class ApplicationService extends BaseService
|
||||
{
|
||||
private $InstalledVersion;
|
||||
|
||||
public function GetChangelog()
|
||||
{
|
||||
$changelogItems = [];
|
||||
|
||||
foreach (glob(__DIR__ . '/../changelog/*.md') as $file)
|
||||
{
|
||||
$fileName = basename($file);
|
||||
$fileNameParts = explode('_', $fileName);
|
||||
|
||||
$fileContent = file_get_contents($file);
|
||||
$version = $fileNameParts[1];
|
||||
$releaseDate = explode('.', $fileNameParts[2])[0];
|
||||
$releaseNumber = intval($fileNameParts[0]);
|
||||
|
||||
$changelogItems[] = [
|
||||
'version' => $version,
|
||||
'release_date' => $releaseDate,
|
||||
'body' => $fileContent,
|
||||
'release_number' => $releaseNumber
|
||||
];
|
||||
}
|
||||
|
||||
// Sort changelog items to have the changelog descending by newest version
|
||||
usort($changelogItems, function ($a, $b)
|
||||
{
|
||||
if ($a['release_number'] == $b['release_number'])
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ($a['release_number'] < $b['release_number']) ? 1 : -1;
|
||||
});
|
||||
|
||||
return [
|
||||
'changelog_items' => $changelogItems,
|
||||
'newest_release_number' => $changelogItems[0]['release_number']
|
||||
];
|
||||
}
|
||||
|
||||
public function GetInstalledVersion()
|
||||
{
|
||||
if ($this->InstalledVersion == null)
|
||||
@@ -20,6 +59,7 @@ class ApplicationService extends BaseService
|
||||
$this->InstalledVersion->Version = "pre-release-$commitHash";
|
||||
$this->InstalledVersion->ReleaseDate = substr($commitDate, 0, 19);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return $this->InstalledVersion;
|
||||
@@ -31,48 +71,11 @@ class ApplicationService extends BaseService
|
||||
$sqliteVersion = $pdo->query('SELECT sqlite_version()')->fetch()[0];
|
||||
$pdo = null;
|
||||
|
||||
return array(
|
||||
return [
|
||||
'grocy_version' => $this->GetInstalledVersion(),
|
||||
'php_version' => phpversion(),
|
||||
'sqlite_version' => $sqliteVersion
|
||||
);
|
||||
'sqlite_version' => $sqliteVersion
|
||||
];
|
||||
}
|
||||
|
||||
public function GetChangelog()
|
||||
{
|
||||
$changelogItems = array();
|
||||
foreach(glob(__DIR__ . '/../changelog/*.md') as $file)
|
||||
{
|
||||
$fileName = basename($file);
|
||||
$fileNameParts = explode('_', $fileName);
|
||||
|
||||
$fileContent = file_get_contents($file);
|
||||
$version = $fileNameParts[1];
|
||||
$releaseDate = explode('.', $fileNameParts[2])[0];
|
||||
$releaseNumber = intval($fileNameParts[0]);
|
||||
|
||||
$changelogItems[] = array(
|
||||
'version' => $version,
|
||||
'release_date' => $releaseDate,
|
||||
'body' => $fileContent,
|
||||
'release_number' => $releaseNumber
|
||||
);
|
||||
}
|
||||
|
||||
// Sort changelog items to have the changelog descending by newest version
|
||||
usort($changelogItems, function($a, $b)
|
||||
{
|
||||
if ($a['release_number'] == $b['release_number'])
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ($a['release_number'] < $b['release_number']) ? 1 : -1;
|
||||
});
|
||||
|
||||
return array(
|
||||
'changelog_items' => $changelogItems,
|
||||
'newest_release_number' => $changelogItems[0]['release_number']
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user