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

改进make命令

Browse Source
This commit is contained in:
yunwuxin
2016-07-14 18:05:30 +08:00
parent 2b88407f7a
commit d3c5c6f166
9 changed files with 227 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/Console.php
View File

@@ -50,7 +50,6 @@ class Console
"think\\console\\command\\Lists",
"think\\console\\command\\Build",
"think\\console\\command\\make\\Controller",
"think\\console\\command\\make\\File",
"think\\console\\command\\make\\Model",
"think\\console\\command\\optimize\\Autoload",
];

146
library/think/console/command/Make.php
View File

@@ -11,82 +11,110 @@
namespace think\console\command;
use think\App;
use think\Exception;
use think\Config;
use think\console\Input;
use think\console\input\Argument;
use think\console\Output;
class Make extends Command
abstract class Make extends Command
{
/** @var Input */
protected $input;
/** @var Output */
protected $output;
protected $type;
abstract protected function getStub();
protected function configure()
{
$this->addArgument('name', Argument::REQUIRED, "The name of the class");
}
public function run(Input $input, Output $output)
{
$this->input = $input;
$this->output = $output;
return parent::run($input, $output);
}
protected function execute(Input $input, Output $output)
{
// 创建文件
protected static function buildFile($file, $content)
$name = trim($input->getArgument('name'));
$classname = $this->getClassName($name);
$pathname = $this->getPathName($classname);
if (is_file($pathname)) {
$output->writeln('<error>' . $this->type . ' already exists!</error>');
return false;
}
if (!is_dir(dirname($pathname))) {
mkdir(strtolower(dirname($pathname)), 0755, true);
}
file_put_contents($pathname, $this->buildClass($name));
$output->writeln('<info>' . $this->type . ' created successfully.</info>');
}
protected function buildClass($name)
{
if (is_file($file)) {
throw new Exception('file already exists');
$stub = file_get_contents($this->getStub());
$namespace = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
$class = str_replace($namespace . '\\', '', $name);
return str_replace(['{%className%}', '{%namespace%}', '{%app_namespace%}'], [
$class,
$namespace,
Config::get('app_namespace')
], $stub);
}
if (!is_dir(dirname($file))) {
mkdir(strtolower(dirname($file)), 0755, true);
}
file_put_contents($file, $content);
}
// 生成类库文件
protected function build($namespace, $extend, $content = '')
protected function getPathName($name)
{
$tpl = file_get_contents(THINK_PATH . 'tpl' . DS . 'make.tpl');
$name = str_replace(Config::get('app_namespace') . '\\', '', $name);
// comminute namespace
$namespace = explode('\\', $namespace);
$className = array_pop($namespace);
if ($extend) {
$extend = 'extends \\' . ltrim($extend, '\\');
}
// 处理内容
$content = str_replace(['{%extend%}', '{%className%}', '{%namespace%}', '{%content%}'],
[$extend, $className, implode('\\', $namespace), $content],
$tpl);
// 处理文件名
array_shift($namespace);
$file = APP_PATH . implode(DS, $namespace) . DS . $className . '.php';
// 生成类库文件
self::buildFile($file, $content);
return realpath($file);
return APP_PATH . str_replace('\\', '/', $name) . '.php';
}
protected function getResult($layer, $namespace, $module, $extend, $content = '')
protected function getClassName($name)
{
$appNamespace = Config::get('app_namespace');
// 处理命名空间
if (!empty($module)) {
$namespace = App::$namespace . "\\" . $module . "\\" . $layer . "\\" . $namespace;
if (strpos($name, $appNamespace . '\\') === 0) {
return $name;
}
// 处理继承
if (empty($extend)) {
switch ($layer) {
case 'model':
$extend = '\\think\\Model';
break;
case 'validate':
$extend = '\\think\\Validate';
break;
case 'controller':
default:
$extend = '';
break;
if (Config::get('app_multi_module')) {
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name, 2);
} else {
$module = 'common';
}
} else {
if (!preg_match("/\\\/", $extend)) {
if (!empty($module)) {
$extend = "\\" . App::$namespace . "\\" . $module . "\\" . $layer . "\\" . $extend;
}
}
$module = null;
}
return $this->build($namespace, $extend, $content);
if (strpos($name, '/') !== false) {
$name = str_replace('/', '\\', $name);
}
return $this->getNamespace($appNamespace, $module) . '\\' . $name;
}
protected function getNamespace($appNamespace, $module)
{
return $module ? ($appNamespace . '\\' . $module) : $appNamespace;
}
}

42
library/think/console/command/make/Controller.php
View File

@@ -11,34 +11,40 @@
namespace think\console\command\make;
use think\Config;
use think\console\command\Make;
use think\console\Input;
use think\console\input\Argument;
use think\console\input\Option;
use think\console\Output;
class Controller extends Make
{
/**
* {@inheritdoc}
*/
protected $type = "Controller";
protected function configure()
{
$this
->setName('make:controller')
->setDescription('Create a new controller class')
->addArgument('namespace', Argument::REQUIRED)
->addOption('module', 'm', Option::VALUE_OPTIONAL, 'Module Name', 'index')
->addOption('extend', 'e', Option::VALUE_OPTIONAL, 'Base on Controller class', null);
parent::configure();
$this->setName('make:controller')
->addOption('plain', null, Option::VALUE_NONE, 'Generate an empty controller class.')
->setDescription('Create a new resource controller class');
}
protected function execute(Input $input, Output $output)
protected function getStub()
{
$namespace = $input->getArgument('namespace');
$module = $input->getOption('module');
$extend = $input->getOption('extend');
$result = $this->getResult('controller', $namespace, $module, $extend);
$output->writeln("output:" . $result);
if ($this->input->getOption('plain')) {
return __DIR__ . '/stubs/controller.plain.stub';
}
return __DIR__ . '/stubs/controller.stub';
}
protected function getClassName($name)
{
return parent::getClassName($name) . (Config::get('controller_suffix') ? ucfirst(Config::get('url_controller_layer')) : '');
}
protected function getNamespace($appNamespace, $module)
{
return parent::getNamespace($appNamespace, $module) . '\controller';
}
}

49
library/think/console/command/make/File.php
View File

@@ -1,49 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: 刘志淳 <chun@engineer.com>
// +----------------------------------------------------------------------
namespace think\console\command\make;
use think\console\command\Make;
use think\console\Input;
use think\console\input\Argument;
use think\console\input\Option;
use think\console\Output;
class File extends Make
{
/**
* {@inheritdoc}
*/
protected function configure()
{
$this
->setName('make:file')
->setDescription('Create a new applcation class')
->addArgument('namespace', Argument::REQUIRED)
->addOption('layer', 'l', Option::VALUE_OPTIONAL, 'Layer Name', null)
->addOption('extend', 'e', Option::VALUE_OPTIONAL, 'Extend Base class', null);
}
protected function execute(Input $input, Output $output)
{
$namespace = $input->getArgument('namespace');
$extend = $input->getOption('extend');
if (!$layer = $input->getOption('layer')) {
// 自动识别layer
$item = explode('\\', $namespace);
$layer = basename(dirname(implode(DS, $item)));
}
$result = $this->getResult($layer, $namespace, '', $extend);
$output->writeln("output:" . $result);
}
}

30
library/think/console/command/make/Model.php
View File

@@ -12,33 +12,25 @@
namespace think\console\command\make;
use think\console\command\Make;
use think\console\Input;
use think\console\input\Argument;
use think\console\input\Option;
use think\console\Output;
class Model extends Make
{
/**
* {@inheritdoc}
*/
protected $type = "Model";
protected function configure()
{
$this
->setName('make:model')
->setDescription('Create a new model class')
->addArgument('namespace', Argument::REQUIRED)
->addOption('module', 'm', Option::VALUE_OPTIONAL, 'Module Name', 'index')
->addOption('extend', 'e', Option::VALUE_OPTIONAL, 'Base on Model class', null);
parent::configure();
$this->setName('make:model')
->setDescription('Create a new model class');
}
protected function execute(Input $input, Output $output)
protected function getStub()
{
$namespace = $input->getArgument('namespace');
$module = $input->getOption('module');
$extend = $input->getOption('extend');
$result = $this->getResult('model', $namespace, $module, $extend);
$output->writeln("output:" . $result);
return __DIR__ . '/stubs/model.stub';
}
protected function getNamespace($appNamespace, $module)
{
return parent::getNamespace($appNamespace, $module) . '\model';
}
}

10
library/think/console/command/make/stubs/controller.plain.stub Normal file
View File

@@ -0,0 +1,10 @@
<?php
namespace {%namespace%};
use think\Controller;
class {%className%} extends Controller
{
//
}

84
library/think/console/command/make/stubs/controller.stub Normal file
View File

@@ -0,0 +1,84 @@
<?php
namespace {%namespace%};
use think\Controller;
class {%className%} extends Controller
{
/**
* 显示资源列表
*
* @return \think\Response
*/
public function index()
{
//
}
/**
* 显示创建资源表单页.
*
* @return \think\Response
*/
public function create()
{
//
}
/**
* 保存新建的资源
*
* @param \think\Request $request
* @return \think\Response
*/
public function save(Request $request)
{
//
}
/**
* 显示指定的资源
*
* @param int $id
* @return \think\Response
*/
public function read($id)
{
//
}
/**
* 显示编辑资源表单页.
*
* @param int $id
* @return \think\Response
*/
public function edit($id)
{
//
}
/**
* 保存更新的资源
*
* @param \think\Request $request
* @param int $id
* @return \think\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* 删除指定资源
*
* @param int $id
* @return \think\Response
*/
public function delete($id)
{
//
}
}

10
library/think/console/command/make/stubs/model.stub Normal file
View File

@@ -0,0 +1,10 @@
<?php
namespace {%namespace%};
use think\Model;
class {%className%} extends Model
{
//
}

17
tpl/make.tpl
View File

@@ -1,17 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace {%namespace%};
class {%className%} {%extend%}
{
{%content%}
}