typo

[pharext/pharext] / src / pharext / Packager.php

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index b54d2849092adf724d837fe9174b6340e790053f..4d70a0d6c5f748c68acb6179a4a3185823ee5e35 100644 (file)
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -3,8 +3,6 @@
 namespace pharext;
 
 use Phar;
-use pharext\Cli\Args as CliArgs;
-use pharext\Cli\Command as CliCommand;
 use pharext\Exception;
 
 /**
@@ -12,7 +10,7 @@ use pharext\Exception;
  */
 class Packager implements Command
 {
-       use CliCommand;
+       use Cli\Command;
        
        /**
         * Extension source directory
@@ -30,42 +28,42 @@ class Packager implements Command
         * Create the command
         */
        public function __construct() {
-               $this->args = new CliArgs([
+               $this->args = new Cli\Args([
                        ["h", "help", "Display this help",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        ["v", "verbose", "More output",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["q", "quiet", "Less output",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["n", "name", "Extension name",
-                               CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["r", "release", "Extension release version",
-                               CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["s", "source", "Extension source directory",
-                               CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["g", "git", "Use `git ls-tree` to determine file list",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["b", "branch", "Checkout this tag/branch",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["p", "pecl", "Use PECL package.xml to determine file list, name and release",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["d", "dest", "Destination directory",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG,
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG,
                                "."],
                        ["z", "gzip", "Create additional PHAR compressed with gzip",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["Z", "bzip", "Create additional PHAR compressed with bzip",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        ["S", "sign", "Sign the PHAR with a private key",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["E", "zend", "Mark as Zend Extension",
-                               CliArgs::OPTIONAL|CliARgs::SINGLE|CliArgs::NOARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
                        [null, "signature", "Show pharext signature",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "license", "Show pharext license",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "version", "Show pharext version",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                ]);
        }
        
@@ -107,8 +105,8 @@ class Packager implements Command
                }
 
                try {
-                       /* source needs to be evaluated before CliArgs validation, 
-                        * so e.g. name and version can be overriden and CliArgs 
+                       /* source needs to be evaluated before Cli\Args validation, 
+                        * so e.g. name and version can be overriden and Cli\Args 
                         * does not complain about missing arguments
                         */
                        $this->loadSource();
@@ -157,7 +155,7 @@ class Packager implements Command
                                        );
                                        if ($bytes_pct == 1) {
                                                $done = true;
-                                               printf("\n");
+                                               $this->info("\n");
                                        }
                                }
                        });
@@ -247,10 +245,9 @@ class Packager implements Command
                                "name" => $this->args->name,
                                "release" => $this->args->release,
                                "license" => $this->source->getLicense(),
-                               "stub" => "pharext_installer.php",
                                "type" => $this->args->zend ? "zend_extension" : "extension",
                        ]);
-                       $file = (new Task\PharBuild($this->source, $meta))->run($this->verbosity());
+                       $file = (new Task\PharBuild($this->source, __DIR__."/../pharext_installer.php", $meta))->run($this->verbosity());
                } catch (\Exception $e) {
                        $this->error("%s\n", $e->getMessage());
                        exit(self::EBUILD);