From cbeb13bbc3e233bd6ff43271ed82d4e582e4d422 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 23 Aug 2021 22:32:43 +0200 Subject: [PATCH] Fix usage of Czproject Git. Closes #1179 --- app/Extensions/util/Git.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Extensions/util/Git.php b/app/Extensions/util/Git.php index b8459416a..29e8164ac 100644 --- a/app/Extensions/util/Git.php +++ b/app/Extensions/util/Git.php @@ -19,20 +19,20 @@ namespace App\Extensions\util; -use Cz\Git\GitRepository; +use CzProject\GitPhp\GitRepository; use Symfony\Component\Process\Process; class Git { /** - * @var \Cz\Git\GitRepository + * @var \CzProject\GitPhp\GitRepository */ - protected $repo; + protected GitRepository $repo; /** * @var array */ - public $_config; + public array $_config; /** * @var @@ -42,13 +42,13 @@ class Git /** * @var string */ - private $branch; + private string $branch; /** * Git constructor. * * @param array $config - * @throws \Cz\Git\GitException + * @throws \CzProject\GitPhp\GitException */ public function __construct(array $config = []) { @@ -78,7 +78,7 @@ class Git * @param $options * * @return string[] - * @throws \Cz\Git\GitException + * @throws \CzProject\GitPhp\GitException */ public function describe($options) { @@ -122,8 +122,8 @@ class Git } /** - * @return null|string - * @throws \Cz\Git\GitException + * @return \CzProject\GitPhp\CommitId + * @throws \CzProject\GitPhp\GitException */ public function getHeadHash() { @@ -198,7 +198,7 @@ class Git * @param array $options * * @return string[] - * @throws \Cz\Git\GitException + * @throws \CzProject\GitPhp\GitException */ public function gitPull(array $options = []) { @@ -216,10 +216,10 @@ class Git * Accepts a git command to run. * * - * @param string $command Command to run + * @param string $command Command to run * - * @return string - * @throws \Cz\Git\GitException + * @return string|string[] + * @throws \CzProject\GitPhp\GitException */ public function gitRun($command) { @@ -247,7 +247,7 @@ class Git * @param bool $cached * * @return string - * @throws \Cz\Git\GitException + * @throws \CzProject\GitPhp\GitException */ public function tagLatest($cached = true) {