update some for run git comand

Author: inhere

.php-cs-fixer.php

@@ -0,0 +1,44 @@
+<?php
+
+$header = <<<'EOF'
+This file is part of Kite.
+
+@link     https://github.com/inhere
+@author   https://github.com/inhere
+@license  MIT
+EOF;
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => [
+            'syntax' => 'short'
+        ],
+        'list_syntax' => [
+            'syntax' => 'short'
+        ],
+        'class_attributes_separation' => true,
+        'declare_strict_types' => true,
+        'global_namespace_import' => [
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
+        'header_comment' => [
+            'comment_type' => 'PHPDoc',
+            'header'    => $header,
+            'separate'  => 'bottom'
+        ],
+        'no_unused_imports' => true,
+        'single_quote' => true,
+        'standardize_not_equals' => true,
+        'void_return' => true, // add :void for method
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('test')
+            ->exclude('runtime')
+            ->exclude('vendor')
+            ->in(__DIR__)
+    )
+    ->setUsingCache(false);

.php_cs

@@ -182,7 +182,9 @@ protected function execAndPrint(string $command, string $workDir): void
     public function run(bool $trimOutput = false): string
     {
         $cmdLine = $this->getCommandLine();
-        Color::println("> $cmdLine", 'ylw');
+        if ($this->printCmd) {
+            Color::println("> $cmdLine", 'ylw');
+        }
 
         $process = $this->createProcess();
 

src/CmdBuilder.php

@@ -129,8 +129,8 @@ class Git
     public const PROTO_SSH  = 'ssh';
     public const PROTO_HTTP = 'http';
 
-    public const URL_GIT  = 'git';
-    public const URL_HTTP = 'http';
+    public const URL_GIT   = 'git';
+    public const URL_HTTP  = 'http';
     public const URL_HTTPS = 'https';
 
     public const GITHUB_HOST = 'github.com';
@@ -179,6 +179,9 @@ class Git
     /** @var string The git repo dir path. */
     private $directory;
 
+    /** @var bool see CmdBuilder.printCmd */
+    private $printCmd = true;
+
     /**
      * @param string $repoDir
      *
@@ -231,9 +234,10 @@ public function newCmd(string $cmd, string ...$args): CmdBuilder
     public function getCommandBuilder(string $command = '', ...$args): CmdBuilder
     {
         return CmdBuilder::create($command, ...$args)
-                         ->setBin($this->bin)
-                         ->setWorkDir($this->directory)
-                         ->setTimeout( $this->timeout);
+            ->setBin($this->bin)
+            ->setWorkDir($this->directory)
+            ->setTimeout($this->timeout)
+            ->setPrintCmd($this->printCmd);
     }
 
     /**
@@ -261,6 +265,17 @@ public function getLastTag(): string
         return $this->runCmdLine($cmdLine, true);
     }
 
+    /**
+     * @return string
+     */
+    public function getLastCommit(): string
+    {
+        // latest commit id by: git log --pretty="%h %s" -n1 HEAD
+        $cmdLine = 'git log --pretty="%h %s" -n1 HEAD';
+
+        return $this->runCmdLine($cmdLine, true);
+    }
+
     /**
      * @return string
      */
@@ -300,10 +315,9 @@ public function getGit(): Git
      *
      * @return Git
      */
-    public function setBin($bin): Git
+    public function setBin(string $bin): Git
     {
         $this->bin = $bin;
-
         return $this;
     }
 
@@ -317,7 +331,6 @@ public function setBin($bin): Git
     public function setRepository(string $directory): Git
     {
         $this->directory = $directory;
-
         return $this;
     }
 
@@ -331,7 +344,6 @@ public function setRepository(string $directory): Git
     public function setRepoDir(string $directory): Git
     {
         $this->directory = $directory;
-
         return $this;
     }
 
@@ -374,4 +386,23 @@ public function setTimeout(int $timeout): Git
         $this->timeout = $timeout;
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isPrintCmd(): bool
+    {
+        return $this->printCmd;
+    }
+
+    /**
+     * @param bool $printCmd
+     *
+     * @return Git
+     */
+    public function setPrintCmd(bool $printCmd): Git
+    {
+        $this->printCmd = $printCmd;
+        return $this;
+    }
 }

src/Git.php

@@ -76,6 +76,11 @@ class Repo
      */
     private $currentBranch;
 
+    /**
+     * @var string 'commitId message'
+     */
+    private $lastCommit;
+
     /**
      * @var string
      */
@@ -159,7 +164,7 @@ public function exec(string $cmd, ...$args)
     public function getRemoteInfo(string $name = '', string $type = 'fetch'): RemoteInfo
     {
         $name = $name ?: $this->defaultRemote;
-        $key = $name . '.' . $type;
+        $key  = $name . '.' . $type;
         if (isset($this->remoteInfos[$key])) {
             return $this->remoteInfos[$key];
         }
@@ -245,14 +250,17 @@ protected function loadDefaultRemoteInfo(): void
     }
 
     /**
+     * @param bool $refresh
+     *
      * @return string
      */
-    public function getLastTagName(): string
+    public function getLastTagName(bool $refresh = false): string
     {
         $git = $this->ensureGit();
 
-        $cmdLine = 'git fetch --tags';
-        $git->runCmdLine($cmdLine);
+        if ($refresh) {
+            $git->runCmdLine('git fetch --tags');
+        }
 
         // $cmdLine = 'git describe --tags $(git rev-list --tags --max-count=1)';
         $cmdLine = 'git describe --abbrev=0 --tags';
@@ -276,6 +284,22 @@ public function getCurrentBranch(bool $refresh = false): string
         return $this->currentBranch;
     }
 
+    /**
+     * @param bool $refresh
+     *
+     * @return string
+     */
+    public function getLastCommit(bool $refresh = false): string
+    {
+        if (false === $refresh && null !== $this->lastCommit) {
+            return $this->lastCommit;
+        }
+
+        $this->lastCommit = $this->ensureGit()->getLastCommit();
+
+        return $this->lastCommit;
+    }
+
     /**
      * @param bool $refresh
      *
@@ -316,31 +340,33 @@ public function getChangedFiles(): ?Generator
             } elseif (strpos($file, 'D ') === 0) {
                 yield substr($file, 3);
 
-              // new files
+                // new files
             } elseif (strpos($file, '?? ') === 0) {
                 yield substr($file, 3);
             }
         }
     }
 
     /**
+     * @param bool $refresh
+     *
      * @return string[]
      */
-    public function getInfo(): array
+    public function getInfo(bool $refresh = false): array
     {
         $remoteUrls = [];
         foreach ($this->getRemotes() as $name => $urls) {
             $remoteUrls[$name] = $urls['fetch'];
         }
 
         $repoInfo = [
-            'platformName' => $this->getPlatform(),
-            'currentBranch' => $this->getCurrentBranch(),
-            'lastCommitId'  => $this->getLastCommitId(),
+            'platformName'  => $this->getPlatform(),
+            'currentBranch' => $this->getCurrentBranch($refresh),
+            'lastCommit'    => $this->getLastCommit($refresh),
             'remoteList'    => $remoteUrls,
         ];
 
-        if ($tagName = $this->getLastTagName()) {
+        if ($tagName = $this->getLastTagName($refresh)) {
             $repoInfo['lastTagName'] = $tagName;
         }
 
@@ -386,6 +412,14 @@ public function getGit(): Git
         return $this->ensureGit();
     }
 
+    /**
+     * @param bool $printCmd
+     */
+    public function setPrintCmd(bool $printCmd): void
+    {
+        $this->ensureGit()->setPrintCmd($printCmd);
+    }
+
     /**
      * @return string
      */