From: Michael Wallner <mike@php.net>
Date: Sun, 9 Oct 2016 17:27:58 +0000 (+0200)
Subject: packager: allow overrideing package info from cli
X-Git-Tag: v4.1.2~12
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f136c13716ebb8be746e4be36b27745cafb5618c;p=pharext%2Fpharext

packager: allow overrideing package info from cli
---

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index 4d70a0d..a422e97 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -106,8 +106,8 @@ class Packager implements Command
 
 		try {
 			/* 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
+			 * so Cli\Args does not complain about missing arguments,
+			 * which come from SourceDir::getPackageInfo()
 			 */
 			$this->loadSource();
 		} catch (\Exception $e) {
@@ -231,7 +231,10 @@ class Packager implements Command
 			}
 
 			foreach ($this->source->getPackageInfo() as $key => $val) {
-				$this->args->$key = $val;
+				/* do not override command line arguments */
+				if (!isset($this->args->$key)) {
+					$this->args->$key = $val;
+				}
 			}
 		}
 	}