From cf10cf196cc6afb5aec940cdfe2e706b31f02bfa Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 15 Nov 2018 00:46:53 +0100 Subject: [PATCH] Update app/Extensions/util/Versions.php --- Changelog | 1 + app/Extensions/util/Versions.php | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Changelog b/Changelog index 25a4b08eb..2dd730ba8 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-11-15 DariusIII + * Chg: Update app/Extensions/util/Versions.php * Chg: Replace nZEDb/Git.php with Cz\Git\GitRepository 2018-11-14 DariusIII * Chg: Use nesbot/carbon 2.5.3 diff --git a/app/Extensions/util/Versions.php b/app/Extensions/util/Versions.php index ac857599d..ad4b70f32 100644 --- a/app/Extensions/util/Versions.php +++ b/app/Extensions/util/Versions.php @@ -37,7 +37,7 @@ class Versions protected $changes = 0; /** - * @var + * @var \App\Extensions\util\Git */ protected $git; @@ -75,9 +75,7 @@ class Versions } /** - * @throws \Symfony\Component\Process\Exception\RuntimeException - * @throws \Symfony\Component\Process\Exception\LogicException - * @throws \RuntimeException + * @throws \Cz\Git\GitException */ public function checkGitTag(): void { @@ -91,9 +89,7 @@ class Versions * @param bool $update * * @return false|string version string if matched or false. - * @throws \Symfony\Component\Process\Exception\RuntimeException - * @throws \Symfony\Component\Process\Exception\LogicException - * @throws \RuntimeException + * @throws \Cz\Git\GitException */ public function checkGitTagInFile($update = false) { @@ -206,6 +202,7 @@ class Versions /** * @return string + * @throws \Cz\Git\GitException */ public function getGitBranch(): string { @@ -216,6 +213,7 @@ class Versions /** * @return string + * @throws \Cz\Git\GitException */ public function getGitHeadHash(): string { @@ -237,8 +235,7 @@ class Versions /** * @return string - * @throws \Symfony\Component\Process\Exception\RuntimeException - * @throws \Symfony\Component\Process\Exception\LogicException + * @throws \Cz\Git\GitException */ public function getGitTagInRepo(): string { @@ -266,7 +263,7 @@ class Versions * @return null|string * @throws \RuntimeException */ - public function getSQLPatchFromFile() + public function getSQLPatchFromFile(): ?string { $this->loadXMLFile(); @@ -293,8 +290,7 @@ class Versions /** * @return string - * @throws \Symfony\Component\Process\Exception\RuntimeException - * @throws \Symfony\Component\Process\Exception\LogicException + * @throws \Cz\Git\GitException */ public function getTagVersion(): string { @@ -407,6 +403,9 @@ class Versions } } + /** + * + */ protected function _init(): void { if ($this->_config['git'] instanceof Git) {