packager: allow overrideing package info from cli
authorMichael Wallner <mike@php.net>
Sun, 9 Oct 2016 17:27:58 +0000 (19:27 +0200)
committerMichael Wallner <mike@php.net>
Sun, 9 Oct 2016 17:27:58 +0000 (19:27 +0200)
src/pharext/Packager.php

index 4d70a0d6c5f748c68acb6179a4a3185823ee5e35..a422e972ece90453169560561b84195a6f24817d 100644 (file)
@@ -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;
+                               }
                        }
                }
        }