diff --git a/.travis.yml b/.travis.yml index 700a0c8..d921542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ language: php php: - - 7.0 - 7.1 - 7.2 - master matrix: allow_failures: - - php: 7.2 - php: master install: # Composer diff --git a/composer.json b/composer.json index bfb7973..2f31d24 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ } ], "require": { - "php": ">=7.0", + "php": ">=7.1", + "bluzphp/framework": "~7.8", "codeception/codeception": "~2.3", "composer/composer": "~1.5", "robmorgan/phinx": "~0.9", @@ -20,8 +21,7 @@ "symfony/filesystem": "~3.0", "symfony/finder": "~3.0", "symfony/process": "~3.0", - "symfony/yaml": "~3.0", - "bluzphp/framework": "~7.7" + "symfony/yaml": "~3.0" }, "require-dev": { "phpunit/phpunit": "~6.4", diff --git a/src/Application/Application.php b/src/Application/Application.php index a82222c..0ab4ae0 100644 --- a/src/Application/Application.php +++ b/src/Application/Application.php @@ -37,6 +37,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN') * init * * @return void + * @throws \Bluz\Config\ConfigException */ public function init() { @@ -98,6 +99,7 @@ protected function registerCommands() new Command\Generate\CrudCommand, new Command\Generate\GridCommand, new Command\Generate\RestCommand, + new Command\Generate\ScaffoldCommand, new Command\Module\InstallCommand, new Command\Module\ListCommand, new Command\Module\RemoveCommand, @@ -113,7 +115,7 @@ protected function registerCommands() * * @return string */ - public function getWorkingPath() + public function getWorkingPath() : string { return getcwd(); } @@ -124,7 +126,7 @@ public function getWorkingPath() * @param string $name * @return string */ - public function getModulePath($name) + public function getModulePath($name) : string { return $this->getWorkingPath() . DIRECTORY_SEPARATOR . 'application' . DIRECTORY_SEPARATOR @@ -138,7 +140,7 @@ public function getModulePath($name) * @param string $name * @return string */ - public function getModelPath($name) + public function getModelPath($name) : string { return $this->getWorkingPath() . DIRECTORY_SEPARATOR . 'application' . DIRECTORY_SEPARATOR @@ -150,7 +152,7 @@ public function getModelPath($name) * @param string $name * @return bool */ - public function isModuleExists($name) + public function isModuleExists($name) : bool { return is_dir($this->getModulePath($name)); } @@ -159,7 +161,7 @@ public function isModuleExists($name) * @param string $name * @return bool */ - public function isModelExists($name) + public function isModelExists($name) : bool { return is_dir($this->getModelPath($name)); } diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php index 1fbda26..ac7d4cb 100644 --- a/src/Command/AbstractCommand.php +++ b/src/Command/AbstractCommand.php @@ -6,9 +6,11 @@ namespace Bluzman\Command; -use Bluz\Validator\Validator as v; +use Bluz\Proxy\Config; +use Bluz\Validator\Validator; use Bluzman\Application\Application; use Bluzman\Input\InputArgument; +use Bluzman\Input\InputException; use Symfony\Component\Console; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -43,7 +45,7 @@ abstract class AbstractCommand extends Console\Command\Command /** * @param InputInterface $input */ - public function setInput(InputInterface $input) + public function setInput(InputInterface $input) : void { $this->input = $input; } @@ -59,7 +61,7 @@ public function getInput() /** * @param OutputInterface $output */ - public function setOutput(OutputInterface $output) + public function setOutput(OutputInterface $output) : void { $this->output = $output; } @@ -75,7 +77,7 @@ public function getOutput() /** * @param \Symfony\Component\Filesystem\Filesystem $fs */ - public function setFs($fs) + public function setFs($fs) : void { $this->fs = $fs; } @@ -92,9 +94,11 @@ public function getFs() } /** - * @param InputInterface $input + * @param InputInterface $input * @param OutputInterface $output + * * @return void + * @throws \Bluz\Config\ConfigException */ final public function initialize(InputInterface $input, OutputInterface $output) { @@ -110,14 +114,14 @@ final public function initialize(InputInterface $input, OutputInterface $output) $config->setEnvironment($input->getOption('env')); $config->init(); - \Bluz\Proxy\Config::setInstance($config); + Config::setInstance($config); } /** * @param $message * @return void */ - public function write($message) + public function write($message) : void { $this->getOutput()->writeln($message); } @@ -126,7 +130,7 @@ public function write($message) * @param $message * @return void */ - public function info($message) + public function info($message) : void { $this->write("$message"); } @@ -135,7 +139,7 @@ public function info($message) * @param $message * @return void */ - public function comment($message) + public function comment($message) : void { $this->write("$message"); } @@ -144,7 +148,7 @@ public function comment($message) * @param $message * @return void */ - public function question($message) + public function question($message) : void { $this->write("$message:"); } @@ -153,7 +157,7 @@ public function question($message) * @param $message * @return void */ - public function error($message) + public function error($message) : void { $this->write("$message"); } @@ -170,42 +174,68 @@ public function callForContribute() } /** - * addModuleArgument + * Add Module Argument * * @param int $required - * @return AbstractCommand + * @return void */ - protected function addModuleArgument($required = InputArgument::REQUIRED) + protected function addModuleArgument($required = InputArgument::REQUIRED) : void { $module = new InputArgument('module', $required, 'Module name is required'); - $module->setValidator( - v::create()->string()->alphaNumeric('-_')->noWhitespace() - ); - $this->getDefinition()->addArgument($module); + } - return $this; + /** + * Validate Module Argument + * + * @return void + * @throws \Bluzman\Input\InputException + */ + protected function validateModuleArgument() : void + { + $module = $this->getInput()->getArgument('module'); + + $validator = Validator::create() + ->string() + ->alphaNumeric('-_') + ->noWhitespace(); + + if ($this->getDefinition()->getArgument('module')->isRequired() + && !$validator->validate($module)) { + throw new InputException($validator->getError()); + } } /** - * addControllerArgument + * Add Controller Argument * * @param int $required - * @return AbstractCommand + * @return void */ - protected function addControllerArgument($required = InputArgument::REQUIRED) + protected function addControllerArgument($required = InputArgument::REQUIRED) : void { - $controller = new InputArgument( - 'controller', - $required, - 'Controller name is required' - ); - $controller->setValidator( - v::create()->string()->alphaNumeric('-_')->noWhitespace() - ); - + $controller = new InputArgument('controller', $required, 'Controller name is required'); $this->getDefinition()->addArgument($controller); + } - return $this; + /** + * Validate Module Argument + * + * @return void + * @throws \Bluzman\Input\InputException + */ + protected function validateControllerArgument() : void + { + $controller = $this->getInput()->getArgument('controller'); + + $validator = Validator::create() + ->string() + ->alphaNumeric('-_') + ->noWhitespace(); + + if ($this->getDefinition()->getArgument('controller')->isRequired() + && !$validator->validate($controller)) { + throw new InputException($validator->getError()); + } } } diff --git a/src/Command/Db/AbstractDbCommand.php b/src/Command/Db/AbstractDbCommand.php index 96bfe2b..31688ca 100644 --- a/src/Command/Db/AbstractDbCommand.php +++ b/src/Command/Db/AbstractDbCommand.php @@ -43,6 +43,13 @@ protected function execute(InputInterface $input, OutputInterface $output) $phinxArguments['command'] = $commandName; $phinxArguments['--configuration'] = PATH_APPLICATION . DS . 'configs' . DS . 'phinx.php'; + + // write database name to console + // to avoid any mistakes + $config = include $phinxArguments['--configuration']; + $this->write('host ' . $config['environments']['default']['host']); + $this->write('name ' . $config['environments']['default']['name']); + if ($command->getDefinition()->hasOption('environment')) { $phinxArguments['--environment'] = 'default'; } diff --git a/src/Command/Db/StatusCommand.php b/src/Command/Db/StatusCommand.php index 831e707..05669e2 100644 --- a/src/Command/Db/StatusCommand.php +++ b/src/Command/Db/StatusCommand.php @@ -30,9 +30,5 @@ protected function configure() // the "--help" option ->setHelp('This command is shorthand to phinx tool') ; - - $env = new InputArgument('--environment', InputArgument::OPTIONAL, 'Environment', 'default'); - - $this->getDefinition()->addArgument($env); } } diff --git a/src/Command/Generate/AbstractGenerateCommand.php b/src/Command/Generate/AbstractGenerateCommand.php index 428c866..a15a662 100644 --- a/src/Command/Generate/AbstractGenerateCommand.php +++ b/src/Command/Generate/AbstractGenerateCommand.php @@ -6,9 +6,14 @@ namespace Bluzman\Command\Generate; -use Bluz\Validator\Validator as v; +use Bluz\Db\Table; +use Bluz\Proxy\Db; +use Bluz\Validator\Validator; use Bluzman\Command\AbstractCommand; +use Bluzman\Generator\Generator; +use Bluzman\Generator\GeneratorException; use Bluzman\Input\InputArgument; +use Bluzman\Input\InputException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -24,23 +29,94 @@ abstract class AbstractGenerateCommand extends AbstractCommand * @param OutputInterface $output * @return mixed */ - abstract public function verify(InputInterface $input, OutputInterface $output); + abstract public function verify(InputInterface $input, OutputInterface $output) : void; /** - * addModelArguments + * Add Model Argument * - * @return self + * @return void */ - protected function addModelArgument() + protected function addModelArgument() : void { $model = new InputArgument('model', InputArgument::REQUIRED, 'Model name is required'); - $model->setValidator( - v::create()->string()->alphaNumeric()->noWhitespace() - ); - $this->getDefinition()->addArgument($model); + } + + /** + * Validate Model Argument + * + * @return void + * @throws \Bluzman\Input\InputException + */ + protected function validateModelArgument() : void + { + $model = $this->getInput()->getArgument('model'); + + $validator = Validator::create() + ->string() + ->alphaNumeric() + ->noWhitespace(); + + if ($this->getDefinition()->getArgument('model')->isRequired() + && !$validator->validate($model)) { + throw new InputException($validator->getError()); + } + } - return $this; + /** + * Add Table Argument + * + * @return void + */ + protected function addTableArgument() : void + { + $table = new InputArgument('table', InputArgument::REQUIRED, 'Table name is required'); + $this->getDefinition()->addArgument($table); + } + + /** + * Validate Table Argument + * + * @return void + * @throws \Bluzman\Input\InputException + */ + protected function validateTableArgument() : void + { + $table = $this->getInput()->getArgument('table'); + + $validator = Validator::create() + ->string() + ->alphaNumeric('_') + ->noWhitespace(); + + if ($this->getDefinition()->getArgument('table')->isRequired() + && !$validator->validate($table)) { + throw new InputException($validator->getError()); + } + } + + /** + * Get Table instance + * + * @param string $model + * + * @return Table + * @throws \Bluzman\Generator\GeneratorException + */ + protected function getTableInstance($model) : Table + { + $file = $this->getApplication()->getModelPath($model) . DS . 'Table.php'; + if (!file_exists($file)) { + throw new GeneratorException( + "Model $model is not exist, run command `bluzman generate:model $model` before" + ); + } + include_once $file; + $class = '\\Application\\' . ucfirst($model) . '\\Table'; + if (!class_exists($class)) { + throw new GeneratorException("Bluzman can't found `Table` class for model `$model`"); + } + return $class::getInstance(); } /** @@ -55,10 +131,33 @@ protected function getTemplate($class) return new $class; } + /** + * Small wrapper for simplify code + * + * @param string $class + * @param string $file + * @param array $data + * + * @return void + */ + protected function generateFile($class, $file, array $data = []) : void + { + if (file_exists($file)) { + $this->comment(" |> File $file already exists"); + } + + $template = $this->getTemplate($class); + $template->setFilePath($file); + $template->setTemplateData($data); + + $generator = new Generator($template); + $generator->make(); + } + /** * @return string */ - protected function getControllerPath($module, $controller) + protected function getControllerPath($module, $controller) : string { return $this->getApplication()->getModulePath($module) . DS . 'controllers' @@ -69,11 +168,52 @@ protected function getControllerPath($module, $controller) /** * @return string */ - protected function getViewPath($module, $controller) + protected function getViewPath($module, $controller) : string { return $this->getApplication()->getModulePath($module) . DS . 'views' . DS . $controller . '.phtml'; } + + /** + * @todo move it to DB class + * @return array + */ + protected function getPrimaryKey($table) + { + $connect = Db::getOption('connect'); + + return Db::fetchColumn( + ' + SELECT COLUMN_NAME + FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE + WHERE TABLE_SCHEMA = ? + AND TABLE_NAME = ? + AND CONSTRAINT_NAME = ? + ', + [$connect['name'], $table, 'PRIMARY'] + ); + } + + /** + * @todo move it to DB class + * @return array + */ + protected function getColumns($table) + { + $connect = Db::getOption('connect'); + + return Db::fetchAll( + ' + SELECT + COLUMN_NAME as name, + COLUMN_TYPE as type + FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_SCHEMA = ? + AND TABLE_NAME = ? + ', + [$connect['name'], $table] + ); + } } diff --git a/src/Command/Generate/ControllerCommand.php b/src/Command/Generate/ControllerCommand.php index 1f69354..1063013 100644 --- a/src/Command/Generate/ControllerCommand.php +++ b/src/Command/Generate/ControllerCommand.php @@ -7,7 +7,6 @@ namespace Bluzman\Command\Generate; use Bluzman\Generator; -use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -33,10 +32,8 @@ protected function configure() ->setHelp('This command allows you to generate controller files') ; - $this - ->addModuleArgument() - ->addControllerArgument() - ; + $this->addModuleArgument(); + $this->addControllerArgument(); } /** @@ -44,39 +41,19 @@ protected function configure() * @param OutputInterface $output * @return void */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output) : void { + $this->write('Running generate:controller command'); try { - $this->write("Running generate:controller command"); - - $module = $input->getArgument('module'); - $this->getDefinition()->getArgument('module')->validate($module); - - if (!$this->getApplication()->isModuleExists($module)) { - $command = $this->getApplication()->find('generate:module'); - - $arguments = [ - 'command' => 'generate:module', - 'module' => $module - ]; - - $greetInput = new ArrayInput($arguments); - $command->run($greetInput, $output); - } - - $controller = $input->getArgument('controller'); - $this->getDefinition()->getArgument('controller')->validate($controller); + // validate + $this->validateModuleArgument(); + $this->validateControllerArgument(); // generate directories and files $this->generate($input, $output); // verify it $this->verify($input, $output); - - $this->write( - "Controller {$controller} has been successfully created " . - "in the module {$controller}." - ); } catch (\Exception $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -85,37 +62,18 @@ protected function execute(InputInterface $input, OutputInterface $output) /** * @param InputInterface $input * @param OutputInterface $output - * @return $this + * @return void */ - protected function generate(InputInterface $input, OutputInterface $output) + protected function generate(InputInterface $input, OutputInterface $output) : void { $module = $input->getArgument('module'); $controller = $input->getArgument('controller'); $controllerFile = $this->getControllerPath($module, $controller); - if (file_exists($controllerFile)) { - $this->comment("Controller file $module/$controller already exists"); - } else { - $template = new Generator\Template\ControllerTemplate; - $template->setFilePath($controllerFile); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $this->generateFile('ControllerTemplate', $controllerFile); $viewFile = $this->getViewPath($module, $controller); - if (file_exists($viewFile)) { - $this->comment("View file $module/$controller already exists"); - } else { - $template = new Generator\Template\ViewTemplate; - $template->setFilePath($viewFile); - $template->setTemplateData(['name' => $controller]); - - $generator = new Generator\Generator($template); - $generator->make(); - } - - return $this; + $this->generateFile('ViewTemplate', $viewFile, ['name' => $controller]); } /** @@ -124,16 +82,19 @@ protected function generate(InputInterface $input, OutputInterface $output) * @return void * @throws \Bluzman\Generator\GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modulePath = $this->getApplication()->getModulePath($input->getArgument('module')); + $module = $input->getArgument('module'); + $controller = $input->getArgument('controller'); + + $modulePath = $this->getApplication()->getModulePath($module); $paths = [ $modulePath, $modulePath . DS . 'controllers', - $modulePath . DS . 'controllers' . DS . $input->getArgument('controller') . '.php', + $modulePath . DS . 'controllers' . DS . $controller . '.php', $modulePath . DS . 'views', - $modulePath . DS . 'views' . DS . $input->getArgument('controller') . '.phtml', + $modulePath . DS . 'views' . DS . $controller . '.phtml', ]; @@ -142,5 +103,10 @@ public function verify(InputInterface $input, OutputInterface $output) throw new Generator\GeneratorException("File or directory `$path` is not exists"); } } + + $this->write( + " |> Controller {$controller} has been successfully created " . + "in the module {$module}." + ); } } diff --git a/src/Command/Generate/CrudCommand.php b/src/Command/Generate/CrudCommand.php index d376770..1cda8dd 100644 --- a/src/Command/Generate/CrudCommand.php +++ b/src/Command/Generate/CrudCommand.php @@ -33,55 +33,30 @@ protected function configure() // the "--help" option ->setHelp('This command allows you to generate CRUD files'); - $this - ->addModelArgument() - ->addModuleArgument(InputArgument::OPTIONAL) - ; + $this->addModelArgument(); + $this->addModuleArgument(InputArgument::OPTIONAL); } /** - * @param InputInterface $input + * @param InputInterface $input * @param OutputInterface $output + * * @return void + * @throws \Bluzman\Generator\GeneratorException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output) : void { + $this->write('Running generate:crud command'); try { - $this->write("Running generate:crud command"); - - $model = $input->getArgument('model'); - $this->getDefinition()->getArgument('model')->validate($model); - - if (!$this->getApplication()->isModelExists($model)) { - throw new InputException( - "Model $model is not exist, " . - "run command bluzman generate:model $model before" - ); - } - - if ($module = $input->getArgument('module')) { - $this->getDefinition()->getArgument('module')->validate($module); - - if (!$this->getApplication()->isModuleExists($module)) { - throw new InputException( - "Module $module is not exist, " . - "run command bluzman generate:module $module before" - ); - } - } + // validate + $this->validateModelArgument(); + $this->validateModuleArgument(); // generate directories and files $this->generate($input, $output); // verify it $this->verify($input, $output); - - $this->write("CRUD for {$model} has been successfully created."); - if ($module = $input->getArgument('module')) { - $this->write( - "Open page /acl in your browser and set permissions for {$module}" - ); - } } catch (InputException $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -93,61 +68,42 @@ protected function execute(InputInterface $input, OutputInterface $output) * @return void * @throws InputException */ - protected function generate(InputInterface $input, OutputInterface $output) + protected function generate(InputInterface $input, OutputInterface $output) : void { $model = ucfirst($input->getArgument('model')); + $module = $input->getArgument('module'); - // generate CRUD - $crudFile = $this->getApplication()->getModelPath($model) . DS . 'Crud.php'; + // template data + $data = [ + 'model' => $model, + 'module' => $module + ]; - if (file_exists($crudFile)) { - $this->comment("Crud file $model/Crud.php already exists"); - } else { - $template = $this->getTemplate('CrudTemplate'); - $template->setFilePath($crudFile); - $template->setTemplateData( - [ - 'model' => $model - ] - ); + // generate CRUD class + $this->write(" |> Generate CRUD class $model\\Crud"); + $crudFile = $this->getApplication()->getModelPath($model) . DS . 'Crud.php'; + $this->generateFile('CrudTemplate', $crudFile, $data); - $generator = new Generator\Generator($template); - $generator->make(); - } + if ($module) { + if (!$this->getApplication()->isModelExists($model)) { + throw new InputException( + "Model $model is not exist, " . + "run command bluzman generate:model $model before" + ); + } - if ($module = $input->getArgument('module')) { - $this->write("Generate $module/controllers/crud.php"); + $this->write(" |> Generate CRUD controller $module/controllers/crud.php"); $controllerFile = $this->getControllerPath($module, 'crud'); - if (file_exists($controllerFile)) { - $this->comment("Controller file $module/crud already exists"); - } else { - $template = new Generator\Template\CrudControllerTemplate(); - $template->setFilePath($controllerFile); - $template->setTemplateData(['model' => $model]); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $this->generateFile('CrudControllerTemplate', $controllerFile, $data); - $this->write("Generate $module/views/crud.phtml"); + $this->write(" |> Generate CRUD view $module/views/crud.phtml"); - $viewFile = $this->getViewPath($module, 'crud'); - if (file_exists($viewFile)) { - $this->comment("View file $module/crud already exists"); - } else { - $template = new Generator\Template\CrudViewTemplate(); - $template->setFilePath($viewFile); - $template->setTemplateData( - [ - 'model' => $model, - 'module' => $module - ] - ); + $tableInstance = $this->getTableInstance($model); + $data['columns'] = $tableInstance::getMeta(); - $generator = new Generator\Generator($template); - $generator->make(); - } + $viewFile = $this->getViewPath($module, 'crud'); + $this->generateFile('CrudViewTemplate', $viewFile, $data); } } @@ -157,9 +113,12 @@ protected function generate(InputInterface $input, OutputInterface $output) * @return void * @throws \Bluzman\Generator\GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modelPath = $this->getApplication()->getModelPath($input->getArgument('model')); + $model = $input->getArgument('model'); + $module = $input->getArgument('module'); + + $modelPath = $this->getApplication()->getModelPath($model); $paths = [ $modelPath . DS . 'Crud.php', @@ -170,5 +129,13 @@ public function verify(InputInterface $input, OutputInterface $output) throw new Generator\GeneratorException("File `$path` is not exists"); } } + + $this->write(" |> CRUD for {$model} has been successfully created."); + if ($module) { + $this->write( + " |> Open page /acl in your browser " . + "and set permission Management for {$module} module" + ); + } } } diff --git a/src/Command/Generate/GridCommand.php b/src/Command/Generate/GridCommand.php index 3cbfe62..c992145 100644 --- a/src/Command/Generate/GridCommand.php +++ b/src/Command/Generate/GridCommand.php @@ -34,56 +34,30 @@ protected function configure() ->setHelp('This command allows you to generate GRID files') ; - $this - ->addModelArgument() - ->addModuleArgument(InputArgument::OPTIONAL) - ; + $this->addModelArgument(); + $this->addModuleArgument(InputArgument::OPTIONAL); } /** - * @param InputInterface $input + * @param InputInterface $input * @param OutputInterface $output + * * @return void + * @throws \Bluzman\Generator\GeneratorException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output) : void { + $this->write('Running generate:grid command'); try { - $this->write("Running generate:grid command"); - - $model = $input->getArgument('model'); - $this->getDefinition()->getArgument('model')->validate($model); - - if (!$this->getApplication()->isModelExists($model)) { - throw new InputException( - "Model $model is not exist, " . - "run command bluzman generate:model $model before" - ); - } - - if ($module = $input->getArgument('module')) { - $this->getDefinition()->getArgument('module')->validate($module); - - if (!$this->getApplication()->isModuleExists($module)) { - throw new InputException( - "Module $module is not exist, " . - "run command bluzman generate:module $module before" - ); - } - } + // validate + $this->validateModelArgument(); + $this->validateModuleArgument(); // generate directories and files $this->generate($input, $output); - // verify it + // verify files $this->verify($input, $output); - - $this->write("GRID for {$model} has been successfully created."); - - if ($module = $input->getArgument('module')) { - $this->write( - "Open page /acl in your browser and set permissions for {$module}" - ); - } } catch (InputException $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -95,54 +69,39 @@ protected function execute(InputInterface $input, OutputInterface $output) * @return void * @throws InputException */ - protected function generate(InputInterface $input, OutputInterface $output) + protected function generate(InputInterface $input, OutputInterface $output) : void { $model = ucfirst($input->getArgument('model')); + $module = $input->getArgument('module'); - // generate CRUD - $crudFile = $this->getApplication()->getModelPath($model) . DS . 'Grid.php'; - - if (file_exists($crudFile)) { - $this->comment("Crud file $model/Grid.php already exists"); - } else { - $template = $this->getTemplate('GridTemplate'); - $template->setFilePath($crudFile); - $template->setTemplateData([ - 'model' => $model - ]); + // template data + $data = [ + 'model' => $model, + 'module' => $module + ]; - $generator = new Generator\Generator($template); - $generator->make(); + if ($module) { + // controller and view generators required the `Model\Table` class + // validator is present on previous step + $data['columns'] = $this->getTableInstance($model)::getMeta(); } - if ($module = $input->getArgument('module')) { - $this->write("Generate $module/controllers/grid.php"); + // generate GRID class + $this->write(" |> Generate Grid class $model\\Grid"); + + $gridFile = $this->getApplication()->getModelPath($model) . DS . 'Grid.php'; + $this->generateFile('GridTemplate', $gridFile, $data); + + if ($module) { + $this->write(" |> Generate Grid controller $module/controllers/grid.php"); $controllerFile = $this->getControllerPath($module, 'grid'); - if (file_exists($controllerFile)) { - $this->comment("Controller file $module/grid already exists"); - } else { - $template = new Generator\Template\GridControllerTemplate(); - $template->setFilePath($controllerFile); - $template->setTemplateData(['model' => $model]); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $this->generateFile('GridControllerTemplate', $controllerFile, $data); - $this->write("Generate $module/views/grid.phtml"); + $this->write(" |> Generate Grid view $module/views/grid.phtml"); $viewFile = $this->getViewPath($module, 'grid'); - if (file_exists($viewFile)) { - $this->comment("View file $module/grid already exists"); - } else { - $template = new Generator\Template\GridViewTemplate(); - $template->setFilePath($viewFile); - $template->setTemplateData(['model' => $model]); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $this->generateFile('GridViewTemplate', $viewFile, $data); } } @@ -152,9 +111,12 @@ protected function generate(InputInterface $input, OutputInterface $output) * @return void * @throws \Bluzman\Generator\GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modelPath = $this->getApplication()->getModelPath($input->getArgument('model')); + $model = $input->getArgument('model'); + $module = $input->getArgument('module'); + + $modelPath = $this->getApplication()->getModelPath($model); $paths = [ $modelPath . DS . 'Grid.php', @@ -165,5 +127,15 @@ public function verify(InputInterface $input, OutputInterface $output) throw new Generator\GeneratorException("File `$path` is not exists"); } } + + // notifications + $this->write(" |> GRID for {$model} has been successfully created."); + + if ($module) { + $this->write( + " |> Open page /acl in your browser " . + "and set permission Management for {$module} module" + ); + } } } diff --git a/src/Command/Generate/ModelCommand.php b/src/Command/Generate/ModelCommand.php index 2346fe3..3350c90 100644 --- a/src/Command/Generate/ModelCommand.php +++ b/src/Command/Generate/ModelCommand.php @@ -6,14 +6,10 @@ namespace Bluzman\Command\Generate; -use Bluz\Proxy\Db; -use Bluz\Validator\Validator as v; -use Bluzman\Input\InputArgument; use Bluzman\Input\InputException; use Bluzman\Generator; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Question\ConfirmationQuestion; /** * ModelCommand @@ -38,13 +34,7 @@ protected function configure() ; $this->addModelArgument(); - - $table = new InputArgument('table', InputArgument::REQUIRED, 'Table name is required'); - $table->setValidator( - v::create()->string()->alphaNumeric('_')->noWhitespace() - ); - - $this->getDefinition()->addArgument($table); + $this->addTableArgument(); } /** @@ -52,24 +42,19 @@ protected function configure() * @param OutputInterface $output * @return void */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output) : void { + $this->write('Running generate:model command'); try { - $this->write('Running generate:model command'); - - $model = $input->getArgument('model'); - $this->getDefinition()->getArgument('model')->validate($model); - - $table = $input->getArgument('table'); - $this->getDefinition()->getArgument('table')->validate($table); + // validate + $this->validateModelArgument(); + $this->validateTableArgument(); // generate directories and files $this->generate($input, $output); // verify it $this->verify($input, $output); - - $this->write("Model {$model} has been successfully created."); } catch (InputException $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -81,10 +66,17 @@ protected function execute(InputInterface $input, OutputInterface $output) * @return void * @throws InputException */ - protected function generate(InputInterface $input, OutputInterface $output) + protected function generate(InputInterface $input, OutputInterface $output) : void { - $modelName = ucfirst($input->getArgument('model')); - $tableName = $input->getArgument('table'); + $model = ucfirst($input->getArgument('model')); + $table = $input->getArgument('table'); + + $data = [ + 'model' => $model, + 'table' => $table, + 'primaryKey' => $this->getPrimaryKey($table), + 'columns' => $this->getColumns($table) + ]; /* if ($this->getApplication()->isModelExists($modelName)) { @@ -100,42 +92,12 @@ protected function generate(InputInterface $input, OutputInterface $output) } */ // generate table - $tableFile = $this->getApplication()->getModelPath($modelName) . DS . 'Table.php'; - - if (file_exists($tableFile)) { - $this->comment("Table file $modelName/Table.php already exists"); - } else { - $template = $this->getTemplate('TableTemplate'); - $template->setFilePath($tableFile); - $template->setTemplateData([ - 'model' => $modelName, - 'table' => $tableName, - 'primaryKey' => $this->getPrimaryKey($tableName) - ]); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $tableFile = $this->getApplication()->getModelPath($model) . DS . 'Table.php'; + $this->generateFile('TableTemplate', $tableFile, $data); // generate row - $rowFile = $this->getApplication()->getModelPath($modelName) . DS . 'Row.php'; - - if (file_exists($rowFile)) { - $this->comment("Row file $modelName/Row.php already exists"); - } else { - $template = $this->getTemplate('RowTemplate'); - $template->setFilePath($rowFile); - $template->setTemplateData( - [ - 'model' => $modelName, - 'table' => $tableName, - 'columns' => $this->getColumns($tableName) - ] - ); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $rowFile = $this->getApplication()->getModelPath($model) . DS . 'Row.php'; + $this->generateFile('RowTemplate', $rowFile, $data); } /** @@ -144,9 +106,10 @@ protected function generate(InputInterface $input, OutputInterface $output) * @return void * @throws \Bluzman\Generator\GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modelPath = $this->getApplication()->getModelPath($input->getArgument('model')); + $model = $input->getArgument('model'); + $modelPath = $this->getApplication()->getModelPath($model); $paths = [ $modelPath . DS . 'Table.php', @@ -158,46 +121,7 @@ public function verify(InputInterface $input, OutputInterface $output) throw new Generator\GeneratorException("File `$path` is not exists"); } } - } - /** - * @todo move it to DB class - * @return array - */ - protected function getPrimaryKey($table) - { - $connect = Db::getOption('connect'); - - return Db::fetchColumn( - ' - SELECT COLUMN_NAME - FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE - WHERE TABLE_SCHEMA = ? - AND TABLE_NAME = ? - AND CONSTRAINT_NAME = ? - ', - [$connect['name'], $table, 'PRIMARY'] - ); - } - - /** - * @todo move it to DB class - * @return array - */ - protected function getColumns($table) - { - $connect = Db::getOption('connect'); - - return Db::fetchAll( - ' - SELECT - COLUMN_NAME as name, - COLUMN_TYPE as type - FROM INFORMATION_SCHEMA.COLUMNS - WHERE TABLE_SCHEMA = ? - AND TABLE_NAME = ? - ', - [$connect['name'], $table] - ); + $this->write(" |> Model {$model} has been successfully created."); } } diff --git a/src/Command/Generate/ModuleCommand.php b/src/Command/Generate/ModuleCommand.php index ec9c08c..255170d 100644 --- a/src/Command/Generate/ModuleCommand.php +++ b/src/Command/Generate/ModuleCommand.php @@ -7,8 +7,6 @@ namespace Bluzman\Command\Generate; use Bluzman\Generator\GeneratorException; -use Bluzman\Input\InputArgument; -use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -35,14 +33,6 @@ protected function configure() ; $this->addModuleArgument(); - - $controller = new InputArgument( - 'controller', - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, - 'Controller name(s)' - ); - - $this->getDefinition()->addArgument($controller); } /** @@ -52,36 +42,16 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { + $this->write('Running generate:module command'); try { - $this->write("Running generate:module command"); - - $module = $input->getArgument('module'); - - $argument = $this->getDefinition()->getArgument('module'); - $argument->validate($module); + // validate + $this->validateModuleArgument(); // create main folder and subfolders $this->generate($input, $output); // verify it $this->verify($input, $output); - - $this->write("Module $module has been successfully created."); - - // create controllers - $controllers = $input->getArgument('controller') ?? []; - - $command = $this->getApplication()->find('generate:controller'); - - foreach ($controllers as $controller) { - $arguments = [ - 'command' => 'generate:controller', - 'module' => $module, - 'controller' => $controller - ]; - $greetInput = new ArrayInput($arguments); - $command->run($greetInput, $output); - } } catch (\Exception $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -94,8 +64,9 @@ protected function execute(InputInterface $input, OutputInterface $output) */ protected function generate(InputInterface $input, OutputInterface $output) { - $this->addSubFolders( - $this->getApplication()->getModulePath($input->getArgument('module')), + $path = $this->getApplication()->getModulePath($input->getArgument('module')); + $this->createSubFolders( + $path, [ 'controllers', 'views' @@ -107,7 +78,7 @@ protected function generate(InputInterface $input, OutputInterface $output) * @param string $path * @param string[] $subFolders */ - protected function addSubFolders($path, array $subFolders = []) + protected function createSubFolders($path, array $subFolders = []) { if (!$this->getFs()->exists($path)) { $this->getFs()->mkdir($path); @@ -116,7 +87,7 @@ protected function addSubFolders($path, array $subFolders = []) foreach ($subFolders as $subFolderName) { $subFolderPath = $path . DIRECTORY_SEPARATOR . $subFolderName; if ($this->getFs()->exists($subFolderPath)) { - $this->comment("Directory $subFolderPath already exists"); + $this->comment(" |> Directory $subFolderPath already exists"); } else { $this->getFs()->mkdir($subFolderPath, 0755); $this->getFs()->touch([$subFolderPath . DIRECTORY_SEPARATOR . '.keep']); @@ -130,9 +101,10 @@ protected function addSubFolders($path, array $subFolders = []) * @return void * @throws GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modulePath = $this->getApplication()->getModulePath($input->getArgument('module')); + $module = $input->getArgument('module'); + $modulePath = $this->getApplication()->getModulePath($module); $paths = [ $modulePath, @@ -145,5 +117,7 @@ public function verify(InputInterface $input, OutputInterface $output) throw new GeneratorException("Directory `$path` is not exists"); } } + + $this->write(" |> Module $module has been successfully created."); } } diff --git a/src/Command/Generate/RestCommand.php b/src/Command/Generate/RestCommand.php index cea0da5..4a374d4 100644 --- a/src/Command/Generate/RestCommand.php +++ b/src/Command/Generate/RestCommand.php @@ -38,51 +38,21 @@ protected function configure() } /** - * @param InputInterface $input - * @param OutputInterface $output - * @return void + * {@inheritdoc} */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output) : void { + $this->write('Running generate:rest command'); try { - $this->write('Running generate:rest command'); - - $model = $input->getArgument('model'); - $this->getDefinition()->getArgument('model')->validate($model); - - if (!$this->getApplication()->isModelExists($model)) { - throw new InputException( - "Model $model is not exist, " . - "run command bluzman generate:model $model before" - ); - } - - $crudPath = $this->getApplication()->getModelPath($model) . DS . 'Crud.php'; - if (!is_file($crudPath)) { - throw new InputException( - "CRUD for $model is not exist, " . - "run command bluzman generate:crud $model before" - ); - } - - $module = $input->getArgument('module'); - $this->getDefinition()->getArgument('module')->validate($module); - - if (!$this->getApplication()->isModuleExists($module)) { - throw new InputException( - "Module $module is not exist, " . - "run command bluzman generate:module $module before" - ); - } + // validate + $this->validateModelArgument(); + $this->validateModuleArgument(); // generate directories and files $this->generate($input, $output); // verify it $this->verify($input, $output); - - $this->write("REST for {$model} has been successfully created."); - $this->write("Open page /acl in your browser and set permissions for {$module}"); } catch (InputException $e) { $this->error("ERROR: {$e->getMessage()}"); } @@ -94,24 +64,27 @@ protected function execute(InputInterface $input, OutputInterface $output) * @return void * @throws InputException */ - protected function generate(InputInterface $input, OutputInterface $output) + protected function generate(InputInterface $input, OutputInterface $output) : void { $model = ucfirst($input->getArgument('model')); $module = $input->getArgument('module'); + $data = [ + 'model' => $model, + 'module' => $module + ]; + + $crudPath = $this->getApplication()->getModelPath($model) . DS . 'Crud.php'; + if (!is_file($crudPath)) { + throw new InputException( + "CRUD for $model is not exist, " . + "run command bluzman generate:crud $model before" + ); + } - $this->write("Generate $module/controllers/rest.php"); + $this->write(" |> Generate $module/controllers/rest.php"); $controllerFile = $this->getControllerPath($module, 'rest'); - if (file_exists($controllerFile)) { - $this->comment("Controller file $module/crud already exists"); - } else { - $template = $this->getTemplate('RestTemplate'); - $template->setFilePath($controllerFile); - $template->setTemplateData(['model' => $model]); - - $generator = new Generator\Generator($template); - $generator->make(); - } + $this->generateFile('RestTemplate', $controllerFile, $data); } /** @@ -120,9 +93,12 @@ protected function generate(InputInterface $input, OutputInterface $output) * @return void * @throws \Bluzman\Generator\GeneratorException */ - public function verify(InputInterface $input, OutputInterface $output) + public function verify(InputInterface $input, OutputInterface $output) : void { - $modulePath = $this->getApplication()->getModulePath($input->getArgument('module')); + $model = $input->getArgument('model'); + $module = $input->getArgument('module'); + + $modulePath = $this->getApplication()->getModulePath($module); $paths = [ $modulePath . DS . 'controllers' . DS . 'rest.php', @@ -133,5 +109,11 @@ public function verify(InputInterface $input, OutputInterface $output) throw new Generator\GeneratorException("File `$path` is not exists"); } } + + $this->write(" |> REST for {$model} has been successfully created."); + $this->write( + " |> Open page /acl in your browser " . + "and set permissions Management for {$module} module" + ); } } diff --git a/src/Command/Generate/ScaffoldCommand.php b/src/Command/Generate/ScaffoldCommand.php new file mode 100644 index 0000000..1eb07f4 --- /dev/null +++ b/src/Command/Generate/ScaffoldCommand.php @@ -0,0 +1,172 @@ +setName('generate:scaffold') + // the short description shown while running "php bin/bluzman list" + ->setDescription('Generate a new model and module with crud and grid') + // the full command description shown when running the command with + // the "--help" option + ->setHelp('This command allows you to generate a scaffolding') + ; + + $this->addModelArgument(); + $this->addTableArgument(); + $this->addModuleArgument(); + } + + /** + * {@inheritdoc} + */ + protected function execute(InputInterface $input, OutputInterface $output) : void + { + $this->write('Running generate:scaffold command'); + try { + // generate + $this->runGenerateModel(); + $this->runGenerateModule(); + $this->runGenerateCrud(); + $this->runGenerateGrid(); + + // verify it + $this->verify($input, $output); + } catch (\Exception $e) { + $this->error("ERROR: {$e->getMessage()}"); + } + } + + /** + * Generate Model + * + * @return void + */ + protected function runGenerateModel() : void + { + $command = $this->getApplication()->find('generate:model'); + + $arguments = [ + 'command' => 'generate:model', + 'model' => $this->getInput()->getArgument('model'), + 'table' => $this->getInput()->getArgument('table') + ]; + $command->run( + new ArrayInput($arguments), + $this->getOutput() + ); + } + + /** + * Generate Module + * + * @return void + */ + protected function runGenerateModule() : void + { + $command = $this->getApplication()->find('generate:module'); + + $arguments = [ + 'command' => 'generate:module', + 'module' => $this->getInput()->getArgument('module') + ]; + $command->run( + new ArrayInput($arguments), + $this->getOutput() + ); + } + + /** + * Generate Crud + * + * @return void + */ + protected function runGenerateCrud() : void + { + $command = $this->getApplication()->find('generate:crud'); + + $arguments = [ + 'command' => 'generate:crud', + 'model' => $this->getInput()->getArgument('model'), + 'module' => $this->getInput()->getArgument('module') + ]; + $command->run( + new ArrayInput($arguments), + $this->getOutput() + ); + } + + /** + * Generate Grid + * + * @return void + */ + protected function runGenerateGrid() : void + { + $command = $this->getApplication()->find('generate:grid'); + + $arguments = [ + 'command' => 'generate:grid', + 'model' => $this->getInput()->getArgument('model'), + 'module' => $this->getInput()->getArgument('module') + ]; + $command->run( + new ArrayInput($arguments), + $this->getOutput() + ); + } + + /** + * {@inheritdoc} + * + * @throws GeneratorException + */ + public function verify(InputInterface $input, OutputInterface $output) : void + { + $model = $input->getArgument('model'); + $module = $input->getArgument('module'); + + $modelPath = $this->getApplication()->getModelPath($model); + $modulePath = $this->getApplication()->getModulePath($module); + + $paths = [ + $modelPath . DS . 'Crud.php', + $modelPath . DS . 'Grid.php', + $modelPath . DS . 'Row.php', + $modelPath . DS . 'Table.php', + $modulePath . DS . 'controllers' . DS . 'crud.php', + $modulePath . DS . 'controllers' . DS . 'grid.php', + $modulePath . DS . 'views' . DS . 'crud.phtml', + $modulePath . DS . 'views' . DS . 'grid.phtml', + ]; + + foreach ($paths as $path) { + if (!$this->getFs()->exists($path)) { + throw new GeneratorException("File `$path` is not exists"); + } + } + + $this->write("Scaffolding for {$model} has been successfully created."); + } +} diff --git a/src/Generator/Generator.php b/src/Generator/Generator.php index 34a2c66..9b6d6bd 100644 --- a/src/Generator/Generator.php +++ b/src/Generator/Generator.php @@ -35,6 +35,13 @@ class Generator */ protected $fs; + public function __construct(AbstractTemplate $template) + { + $this->setTemplate($template); + $this->setAbsolutePath(__DIR__); + $this->setFs(new Filesystem()); + } + /** * @return AbstractTemplate */ @@ -46,7 +53,7 @@ public function getTemplate() /** * @param AbstractTemplate $template */ - public function setTemplate($template) + public function setTemplate($template) : void { $this->template = $template; } @@ -62,7 +69,7 @@ public function getAbsolutePath() /** * @param string $absolutePath */ - public function setAbsolutePath($absolutePath) + public function setAbsolutePath($absolutePath) : void { $this->absolutePath = $absolutePath; } @@ -78,16 +85,20 @@ public function getFs() /** * @param Filesystem $fs */ - public function setFs($fs) + public function setFs($fs) : void { $this->fs = $fs; } - public function __construct(AbstractTemplate $template) + /** + * @internal param $path + */ + public function make() : void { - $this->setTemplate($template); - $this->setAbsolutePath(__DIR__); - $this->setFs(new Filesystem()); + $this->getFs()->dumpFile( + $this->getTemplate()->getFilePath(), + $this->getCompiledTemplate() + ); } public function getCompiledTemplate() @@ -99,15 +110,4 @@ public function getCompiledTemplate() return $view->render(); } - - /** - * @internal param $path - */ - public function make() - { - $this->getFs()->dumpFile( - $this->getTemplate()->getFilePath(), - $this->getCompiledTemplate() - ); - } } diff --git a/src/Generator/Template/AbstractTemplate.php b/src/Generator/Template/AbstractTemplate.php index f6ffbe4..0c37eee 100644 --- a/src/Generator/Template/AbstractTemplate.php +++ b/src/Generator/Template/AbstractTemplate.php @@ -11,6 +11,7 @@ * * @package Bluzman\Generator\Template * + * @todo Migrate to Bluz\View\View * @author Pavel Machekhin * @created 2013-03-28 16:36 */ diff --git a/src/Generator/views/models/grid.phtml b/src/Generator/views/models/grid.phtml index d4be412..caee1e6 100644 --- a/src/Generator/views/models/grid.phtml +++ b/src/Generator/views/models/grid.phtml @@ -23,9 +23,9 @@ class Grid extends \Bluz\Grid\Grid protected $uid = ''; /** - * @return self + * @return void */ - public function init() + public function init() : void { // Current table as source of grid $adapter = new SelectSource(); @@ -33,8 +33,17 @@ class Grid extends \Bluz\Grid\Grid $this->setAdapter($adapter); $this->setDefaultLimit(25); - $this->setAllowOrders([]); - - return $this; + + $this->setAllowFilters([ + $meta) : ?> + '', + + ]); + $this->setAllowOrders([ + $meta) : ?> + '', + + ]); + } } diff --git a/src/Generator/views/models/row.phtml b/src/Generator/views/models/row.phtml index 1e5debe..440f365 100644 --- a/src/Generator/views/models/row.phtml +++ b/src/Generator/views/models/row.phtml @@ -20,14 +20,14 @@ class Row extends \Bluz\Db\Row /** * @return void */ - public function beforeInsert() + public function beforeInsert() : void { } /** * @return void */ - public function beforeUpdate() + public function beforeUpdate() : void { } } diff --git a/src/Generator/views/models/table.phtml b/src/Generator/views/models/table.phtml index 7ae59c5..20f4d98 100644 --- a/src/Generator/views/models/table.phtml +++ b/src/Generator/views/models/table.phtml @@ -1,12 +1,10 @@ - + /** * @namespace */ namespace Application\; -use \Application\\Row; - /** * Class Table for `` * @@ -22,6 +20,9 @@ class Table extends \Bluz\Db\Table */ protected $name = ''; + /** + * @var string + */ protected $rowClass = Row::class; /** diff --git a/src/Generator/views/views/crud.phtml b/src/Generator/views/views/crud.phtml index 7c1e57a..92b3a8d 100644 --- a/src/Generator/views/views/crud.phtml +++ b/src/Generator/views/views/crud.phtml @@ -1,12 +1,43 @@ /** @var \Application\\Row $row */ -$uid = uniqid('form_'); +$uid = uniqid('form_', false); $url = $this->url('', 'crud'); \n"?> -
- - - + + +
+

"?>

+ +
+
+ $meta) : $columnTitle = ucfirst($column); ?> + + "?>"/> + +
+ +
+ + "?>"/> + + "?>"/> + + select('$column', [], \$row['$column'], ['id' => '$column', 'class' => 'form-control']);?>\n"?> + + "?>"/> + +
+
+
+ + +
+
+ + +
// need for plain request diff --git a/src/Generator/views/views/grid.phtml b/src/Generator/views/views/grid.phtml index 08a5f36..55193d9 100644 --- a/src/Generator/views/views/grid.phtml +++ b/src/Generator/views/views/grid.phtml @@ -6,44 +6,62 @@ if (!$grid) return; $uid = $grid->getUid(); \n"?>
- + - partial("grid/total.phtml", ["grid"=>$grid]) ?>'?> - partial("grid/limit.phtml", ["grid"=>$grid]) ?>'?> + - - - - - - - - - - - getData() as $i => $row) : ?>'?> - - - - - - - '?> - -
#Header example
'?>Content example - - - - - - -
+
- partial("grid/empty-rows.phtml", ["grid"=>$grid]) ?>'?> - partial("grid/pagination.phtml", ["grid"=>$grid]) ?>'?> - partial("grid/total.phtml", ["grid"=>$grid]) ?>'?> + partial('grid/total.phtml', ['grid'=>\$grid]) ?>\n"?> + partial('grid/limit.phtml', ['grid'=>\$grid]) ?>\n"?> -
\ No newline at end of file + + + + $meta) : $columnTitle = ucfirst($column); ?> + + + + + + + + getData() as $row) : ?>'?> + + $meta) : ?> + + + + + + + '?> + +
order('{$column}') ?: '#' ?>"?>">"?>
"?> + url('$module', 'crud', ['id' => \$row['$first']]) ?>"?>" class="btn btn-primary" + data-ajax-dialog data-ajax-method="get" data-modal-style="modal-lg"> + + + url('$module', 'crud', ['id' => \$row['$first']]) ?>"?>" class="btn btn-danger" + data-confirm data-ajax data-ajax-method="delete"> + + +
+ + partial('grid/empty-rows.phtml', ['grid'=>\$grid]) ?>\n"?> + partial('grid/pagination.phtml', ['grid'=>\$grid]) ?>\n"?> + partial('grid/total.phtml', ['grid'=>\$grid]) ?>\n"?> + + diff --git a/src/Input/InputArgument.php b/src/Input/InputArgument.php index 5ee8617..dbcddc2 100644 --- a/src/Input/InputArgument.php +++ b/src/Input/InputArgument.php @@ -11,5 +11,4 @@ */ class InputArgument extends \Symfony\Component\Console\Input\InputArgument { - use InputValidationTrait; } diff --git a/src/Input/InputOption.php b/src/Input/InputOption.php index dd80f18..6c00870 100644 --- a/src/Input/InputOption.php +++ b/src/Input/InputOption.php @@ -11,5 +11,4 @@ */ class InputOption extends \Symfony\Component\Console\Input\InputOption { - use InputValidationTrait; } diff --git a/src/Input/InputValidationTrait.php b/src/Input/InputValidationTrait.php deleted file mode 100644 index ac0aa6e..0000000 --- a/src/Input/InputValidationTrait.php +++ /dev/null @@ -1,54 +0,0 @@ -validator = $validator; - } - - /** - * @return ValidatorChain - */ - public function getValidator() - { - return $this->validator; - } - - /** - * @param $value - * @return bool - * @throws \Exception - */ - public function validate($value) - { - if (!$this->getValidator()) { - return true; - } - - if ($this->getValidator()->validate($value)) { - return true; - } - throw new InputException($this->getValidator()->getError()); - } -} diff --git a/tests/Application/ApplicationTest.php b/tests/Application/ApplicationTest.php index dd2b6a5..b25a0ef 100644 --- a/tests/Application/ApplicationTest.php +++ b/tests/Application/ApplicationTest.php @@ -43,6 +43,7 @@ public function testCommandsAreAvailable() self::assertInstanceOf(Command::class, $this->application->get('generate:grid')); self::assertInstanceOf(Command::class, $this->application->get('generate:model')); self::assertInstanceOf(Command::class, $this->application->get('generate:module')); + self::assertInstanceOf(Command::class, $this->application->get('generate:scaffold')); self::assertInstanceOf(Command::class, $this->application->get('generate:rest')); self::assertInstanceOf(Command::class, $this->application->get('module:install')); self::assertInstanceOf(Command::class, $this->application->get('module:list')); diff --git a/tests/Command/Generate/GridCommandTest.php b/tests/Command/Generate/GridCommandTest.php index d63dea9..ad1030c 100644 --- a/tests/Command/Generate/GridCommandTest.php +++ b/tests/Command/Generate/GridCommandTest.php @@ -24,7 +24,14 @@ class GridCommandTest extends AbstractCommandTest */ protected $modelPath; - protected $dataForTemplate = ['author' => 'test', 'date' => '00-00-00 00:00:00']; + protected $dataForTemplate = [ + 'author' => 'test', + 'date' => '00-00-00 00:00:00', + 'columns' => [ + 'id' => ['type' => 'int'], + 'name' => ['type' => 'varchar'], + ] + ]; public function setUp() { @@ -63,6 +70,7 @@ public function testCorrectWorkflow() ->andReturn($template) ->getMock(); + $this->getApplication()->addCommands([$command]); $commandTester = new CommandTester($command); diff --git a/tests/Generator/GeneratorTest.php b/tests/Generator/GeneratorTest.php index 6cf628c..e58a2ff 100644 --- a/tests/Generator/GeneratorTest.php +++ b/tests/Generator/GeneratorTest.php @@ -9,6 +9,7 @@ use Bluzman\Generator\Generator; use Bluzman\Generator\Template\AbstractTemplate; use Bluzman\Tests\BluzmanTestCase; +use Bluzman\Generator\Template\ControllerTemplate; /** * @author Pavel Machekhin @@ -76,7 +77,7 @@ public function templateOptions() return [ [ [ - 'template' => '\Bluzman\Tests\Generator\DummyTemplate', + 'template' => DummyTemplate::class, 'defaultTemplateData' => [ ], @@ -86,7 +87,7 @@ public function templateOptions() 'stub' => 'foo=bar' ], [ - 'template' => '\Bluzman\Generator\Template\ControllerTemplate', + 'template' => ControllerTemplate::class, 'defaultTemplateData' => [ 'author' => 'test', 'date' => '2000-01-01 23:59:59' diff --git a/tests/Generator/samples/grid.html b/tests/Generator/samples/grid.html index c286a29..c255a53 100644 --- a/tests/Generator/samples/grid.html +++ b/tests/Generator/samples/grid.html @@ -22,9 +22,9 @@ protected $uid = 'users'; /** - * @return self + * @return void */ - public function init() + public function init() : void { // Current table as source of grid $adapter = new SelectSource(); @@ -32,8 +32,13 @@ $this->setAdapter($adapter); $this->setDefaultLimit(25); - $this->setAllowOrders([]); - - return $this; + $this->setAllowFilters([ + 'id', + 'name', + ]); + $this->setAllowOrders([ + 'id', + 'name', + ]); } } diff --git a/tests/Generator/samples/row.html b/tests/Generator/samples/row.html index e1e94f7..c700d05 100644 --- a/tests/Generator/samples/row.html +++ b/tests/Generator/samples/row.html @@ -21,14 +21,14 @@ /** * @return void */ - public function beforeInsert() + public function beforeInsert() : void { } /** * @return void */ - public function beforeUpdate() + public function beforeUpdate() : void { } } diff --git a/tests/Generator/samples/table.html b/tests/Generator/samples/table.html index d690d92..d52f1a1 100644 --- a/tests/Generator/samples/table.html +++ b/tests/Generator/samples/table.html @@ -4,8 +4,6 @@ */ namespace Application\Users; -use \Application\Users\Row; - /** * Class Table for `users` * @@ -21,6 +19,9 @@ */ protected $name = 'users'; + /** + * @var string + */ protected $rowClass = Row::class; /**