Merge branch 'master' of ssh://gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle

Command/CRUDDeviceCommand.php

@@ -13,6 +13,8 @@ class CRUDDeviceCommand extends ContainerAwareCommand
 
     protected function configure()
     {
+	$params = array('CMD_USERNAME' => getenv("CMD_USERNAME")?getenv("CMD_USERNAME"):'admin' , 'CMD_PASSWORD' => getenv("CMD_PASSWORD")?getenv("CMD_PASSWORD"):'adminpass');
+
         $this
             ->setName('device:crud')
             ->setDescription('CRUD Device command')
@@ -21,8 +23,8 @@ class CRUDDeviceCommand extends ContainerAwareCommand
             ->addOption('id', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'Device id. e.g. --id=1 --id=2')
             ->addOption('url', null, InputOption::VALUE_OPTIONAL, 'Device POST | PUT | DELETE url for device creation')
             ->addOption('method', null, InputOption::VALUE_OPTIONAL, 'Http method. e.g. POST, PUT, DELETE', HttpRequestInterface::METHOD_POST)
-            ->addOption('username', null, InputOption::VALUE_OPTIONAL, 'Username', 'admin')
-            ->addOption('password', null, InputOption::VALUE_OPTIONAL, 'User password', 'adminpass')
+            ->addOption('username', null, InputOption::VALUE_OPTIONAL, 'Username or specify CMD_USERNAME enviroment variable',      $params["CMD_USERNAME"])
+            ->addOption('password', null, InputOption::VALUE_OPTIONAL, 'User password or specify CMD_PASSWORD enviroment variable', $params["CMD_PASSWORD"])
         ;
     }