X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FInstaller.php;h=4b9f87a674766d7a0a7d4e303e79962b52700ec1;hb=ef9078606945dbc55d85a50614bbc25734aa378a;hp=a90eb28e9acc97350465be252d22d20589568a3d;hpb=337e76964be2ed6724633ac477affc3a28426c97;p=pharext%2Fpharext

diff --git a/src/pharext/Installer.php b/src/pharext/Installer.php
index a90eb28..4b9f87a 100644
--- a/src/pharext/Installer.php
+++ b/src/pharext/Installer.php
@@ -2,7 +2,6 @@
 
 namespace pharext;
 
-use pharext\Cli\Args as CliArgs;
 use pharext\Cli\Command as CliCommand;
 
 use Phar;
@@ -14,51 +13,51 @@ use SplObjectStorage;
 class Installer implements Command
 {
 	use CliCommand;
-	
+
 	/**
 	 * 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 +66,13 @@ class Installer implements Command
 			$cleanup->run();
 		}
 	}
-	
-	private function extract(Phar $phar) {
+
+	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,17 +89,21 @@ class Installer implements Command
 
 	private function load() {
 		$list = new SplObjectStorage();
-		$phar = new Phar(Phar::running(false));
+		$phar = extension_loaded("Phar")
+			? new Phar(Phar::running(false))
+			: new Archive(PHAREXT_PHAR);
 		$temp = $this->extract($phar);
 
 		foreach ($phar as $entry) {
 			$dep_file = $entry->getBaseName();
 			if (fnmatch("*.ext.phar*", $dep_file)) {
-				$dep_phar = new Phar("$temp/$dep_file");
+				$dep_phar = extension_loaded("Phar")
+					? new Phar("$temp/$dep_file")
+					: new Archive("$temp/$dep_file");
 				$list[$dep_phar] = $this->extract($dep_phar);
 			}
 		}
-		
+
 		/* the actual ext.phar at last */
 		$list[$phar] = $temp;
 		return $list;
@@ -185,7 +188,7 @@ class Installer implements Command
 			exit(self::EINSTALL);
 		}
 	}
-	
+
 	/**
 	 * Phpize + trinity
 	 */
@@ -195,7 +198,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
@@ -210,7 +213,7 @@ class Installer implements Command
 
 	private function activate($temp) {
 		if ($this->args->ini) {
-			$files = [realpath($this->args->ini)];
+			$files = [$this->args->ini];
 		} else {
 			$files = array_filter(array_map("trim", explode(",", php_ini_scanned_files())));
 			$files[] = php_ini_loaded_file();
@@ -218,7 +221,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");