s/CliCommand/Cli\Command/g

[pharext/pharext] / src / pharext / Installer.php

diff --git a/src/pharext/Installer.php b/src/pharext/Installer.php
index 0171eaeb6ce695bd7211ce8faa998ca6f2e17f67..d6b3c671e1f6dc97a61f9e0033225952a985478f 100644 (file)
--- a/src/pharext/Installer.php
+++ b/src/pharext/Installer.php
@@ -2,9 +2,6 @@
 
 namespace pharext;
 
-use pharext\Cli\Args as CliArgs;
-use pharext\Cli\Command as CliCommand;
-
 use Phar;
 use SplObjectStorage;
 
@@ -13,52 +10,52 @@ use SplObjectStorage;
  */
 class Installer implements Command
 {
-       use CliCommand;
-       
+       use Cli\Command;
+
        /**
         * Cleanups
         * @var array
         */
        private $cleanup = [];
-       
+
        /**
         * Create the command
         */
        public function __construct() {
-               $this->args = new CliArgs([
-                       ["h", "help", "Display help", 
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+               $this->args = new Cli\Args([
+                       ["h", "help", "Display help",
+                               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],
                        ["p", "prefix", "PHP installation prefix if phpize is not in \$PATH, e.g. /opt/php7",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
                        ["n", "common-name", "PHP common program name, e.g. php5 or zts-php",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG, 
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG,
                                "php"],
                        ["c", "configure", "Additional extension configure flags, e.g. -c --with-flag",
-                               CliArgs::OPTIONAL|CliArgs::MULTI|CliArgs::REQARG],
+                               Cli\Args::OPTIONAL|Cli\Args::MULTI|Cli\Args::REQARG],
                        ["s", "sudo", "Installation might need increased privileges",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::OPTARG,
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::OPTARG,
                                "sudo -S %s"],
                        ["i", "ini", "Activate in this php.ini instead of loaded default php.ini",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
                        [null, "signature", "Show package signature",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "license", "Show package license",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "name", "Show package name",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "date", "Show package release date",
-                               CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+                               Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
                        [null, "release", "Show package release version",
-                               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],
                ]);
        }
-       
+
        /**
         * Perform cleaniup
         */
@@ -67,13 +64,13 @@ class Installer implements Command
                        $cleanup->run();
                }
        }
-       
+
        private function extract($phar) {
                $temp = (new Task\Extract($phar))->run($this->verbosity());
                $this->cleanup[] = new Task\Cleanup($temp);
                return $temp;
        }
-       
+
        private function hooks(SplObjectStorage $phars) {
                $hook = [];
                foreach ($phars as $phar) {
@@ -90,7 +87,7 @@ class Installer implements Command
 
        private function load() {
                $list = new SplObjectStorage();
-               $phar = extension_loaded("Phar") 
+               $phar = extension_loaded("Phar")
                        ? new Phar(Phar::running(false))
                        : new Archive(PHAREXT_PHAR);
                $temp = $this->extract($phar);
@@ -104,7 +101,7 @@ class Installer implements Command
                                $list[$dep_phar] = $this->extract($dep_phar);
                        }
                }
-               
+
                /* the actual ext.phar at last */
                $list[$phar] = $temp;
                return $list;
@@ -189,7 +186,7 @@ class Installer implements Command
                        exit(self::EINSTALL);
                }
        }
-       
+
        /**
         * Phpize + trinity
         */
@@ -199,7 +196,7 @@ class Installer implements Command
                $phpize->run($this->verbosity());
 
                // configure
-               $configure = new Task\Configure($temp, $this->args->configure, $this->args->prefix, $this->args{"common-name"});
+               $configure = new Task\Configure($temp, $this->args->configure, $this->args->prefix, $this->args->{"common-name"});
                $configure->run($this->verbosity());
 
                // make
@@ -222,7 +219,7 @@ class Installer implements Command
 
                $sudo = isset($this->args->sudo) ? $this->args->sudo : null;
                $type = $this->metadata("type") ?: "extension";
-               
+
                $activate = new Task\Activate($temp, $files, $type, $this->args->prefix, $this->args{"common-name"}, $sudo);
                if (!$activate->run($this->verbosity())) {
                        $this->info("Extension already activated ...\n");