projects
/
pharext
/
pharext
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
packager: allow overrideing package info from cli
[pharext/pharext]
/
src
/
pharext
/
Packager.php
diff --git
a/src/pharext/Packager.php
b/src/pharext/Packager.php
index 4d70a0d6c5f748c68acb6179a4a3185823ee5e35..a422e972ece90453169560561b84195a6f24817d 100644
(file)
--- 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,
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) {
*/
$this->loadSource();
} catch (\Exception $e) {
@@
-231,7
+231,10
@@
class Packager implements Command
}
foreach ($this->source->getPackageInfo() as $key => $val) {
}
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;
+ }
}
}
}
}
}
}