mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
尘缘
2016-05-09 19:37:38 +08:00
parent 6d46bf3276 bd8d09d8e8
commit 5407d18f80
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/console/Input.php
View File

@@ -361,7 +361,7 @@ class Input
}
return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)
->getDefault();
->getDefault();
}
/**
@@ -435,7 +435,7 @@ class Input
*/
public function hasOption($name)
{
return $this->definition->hasOption($name);
return $this->definition->hasOption($name) && isset($this->options[$name]);
}
/**

6
library/think/console/command/Build.php
View File

@@ -24,8 +24,10 @@ class Build extends Command
protected function configure()
{
$this->setName('build')
->setDefinition([new Option('config', null, Option::VALUE_OPTIONAL, "build.php path")])
->setDefinition([new Option('module', null, Option::VALUE_OPTIONAL, "module name")])
->setDefinition([
new Option('config', null, Option::VALUE_OPTIONAL, "build.php path"),
new Option('module', null, Option::VALUE_OPTIONAL, "module name")
])
->setDescription('Build Application Dirs');
}