fixed: should not display 'isAlone' command. some update for Phar compiler

Author: inhere

examples/app

@@ -1,5 +1,10 @@
 #!/usr/bin/env php
 <?php
+/**
+ * @version {@package_version}
+ * @branch {@package_branch_alias_version}
+ * @release-date {@release_date}
+ */
 
 define('BASE_PATH', dirname(__DIR__));
 

src/Base/AbstractCommand.php

@@ -208,7 +208,7 @@ protected function showHelp(): bool
         $help['usage'] = sprintf('%s %s %s', $this->input->getScript(), $this->input->getCommand(), $help['usage']);
         $help['global options:'] = FormatUtil::alignmentOptions(Application::getInternalOptions());
 
-        if (empty($help['description']) && $this->isAloneCommand()) {
+        if (empty($help['description']) && $this->isAlone()) {
             $help['description'] = self::getDefinition();
         }
 
@@ -390,7 +390,7 @@ protected function parseAnnotationVars(string $str): string
     /**
      * @return bool
      */
-    public function isAloneCommand(): bool
+    public function isAlone(): bool
     {
         return $this instanceof CommandInterface;
     }

src/Components/PharCompiler.php

@@ -55,9 +55,9 @@ class PharCompiler
      * 记录上面三个信息的文件, 相对于basePath
      * 当里面存在下面的占位符时会自动替换为获取到的信息
      * [
-     * 'version' => '@package_version@',
-     * 'tag' => '@package_branch_alias_version@',
-     * 'releaseDate' => '@release_date@',
+     * 'version' => '{@package_version}',
+     * 'tag' => '{@package_branch_alias_version}',
+     * 'releaseDate' => '{@release_date}',
      * ]
      * @var string
      */
@@ -88,6 +88,11 @@ class PharCompiler
      */
     private $files = [];
 
+    /**
+     * @var array Want to include files suffix name list
+     */
+    private $suffixes = ['.php'];
+
     /**
      * @var array Want to exclude directory name list
      */
@@ -185,6 +190,17 @@ public function __construct(string $basePath)
         }
     }
 
+    /**
+     * @param string|array $suffixes
+     * @return $this
+     */
+    public function addSuffix($suffixes): self
+    {
+        $this->suffixes = array_merge($this->suffixes, (array)$suffixes);
+
+        return $this;
+    }
+
     /**
      * @param string|array $dirs
      * @return $this
@@ -280,6 +296,7 @@ public function pack(string $pharFile, $refresh = true): string
 
         $this->pharFile = $pharFile;
         $this->pharName = $pharName = basename($this->pharFile);
+        $this->excludes = array_flip($this->excludes);
 
         $this->collectInformation();
 
@@ -380,9 +397,9 @@ private function packFile(\Phar $phar, \SplFileInfo $file)
         // have versionFile
         if ($path === $this->versionFile) {
             $content = str_replace([
-                '@package_version@',
-                '@package_branch_alias_version@',
-                '@release_date@',
+                '{@package_version}',
+                '{@package_branch_alias_version}',
+                '{@release_date}',
             ], [
                 $this->version,
                 $this->branchAliasVersion,
@@ -494,17 +511,22 @@ private function createIteratorFilter(): \Closure
                     return false;
                 }
 
+                // skip exclude directories.
                 if ($file->isDir()) {
-                    // Only recurse into intended subdirectories.
-                    return !\in_array($name, $this->excludes, true);
+                    return !isset($this->excludes[$name]);
                 }
 
-                // if (\in_array($name, $this->options['fileInclude'], true)) {
-                //     return true;
-                // }
+                if ($this->suffixes) {
+                    foreach ($this->suffixes as $suffix) {
+                        if (stripos($name, $suffix)) {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
 
-                // Only consume files of interest.
-                return (bool)stripos($name, '.php');
+                return true;
             };
         }
 
@@ -581,7 +603,7 @@ private function collectInformation()
             $this->version = trim($ret);
         } else {
             list($code, $ret,) = CliUtil::run('git branch', $basePath);
-            $this->branchAliasVersion = $code === 0 ? trim($ret): 'UNKNOWN';
+            $this->branchAliasVersion = $code === 0 ? trim($ret, '* '): 'UNKNOWN';
         }
     }