@@ -28,7 +28,7 @@ |
||
| 28 | 28 | $this->setDispatcher($dispatcher); |
| 29 | 29 | $this->keekoDispatcher = $dispatcher; |
| 30 | 30 | |
| 31 | - $dispatcher->addListener(ConsoleEvents::TERMINATE, function (ConsoleTerminateEvent $event) { |
|
| 31 | + $dispatcher->addListener(ConsoleEvents::TERMINATE, function(ConsoleTerminateEvent $event) { |
|
| 32 | 32 | $command = $event->getCommand(); |
| 33 | 33 | $this->finishedCommands[] = $command->getName(); |
| 34 | 34 | }); |
@@ -358,13 +358,13 @@ |
||
| 358 | 358 | $type = $this->getPackageType(); |
| 359 | 359 | |
| 360 | 360 | switch ($type) { |
| 361 | - case 'app': |
|
| 362 | - $this->handleAppClass($class); |
|
| 363 | - break; |
|
| 361 | + case 'app': |
|
| 362 | + $this->handleAppClass($class); |
|
| 363 | + break; |
|
| 364 | 364 | |
| 365 | - case 'module': |
|
| 366 | - $this->handleModuleClass($class); |
|
| 367 | - break; |
|
| 365 | + case 'module': |
|
| 366 | + $this->handleModuleClass($class); |
|
| 367 | + break; |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | $this->codegenService->dumpStruct($class, true); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $types = ['module', 'app']; |
| 175 | 175 | $question = new Question('Package type (module|app)', $type); |
| 176 | 176 | $question->setAutocompleterValues($types); |
| 177 | - $question->setValidator(function ($answer) use ($types) { |
|
| 177 | + $question->setValidator(function($answer) use ($types) { |
|
| 178 | 178 | if (!in_array($answer, $types)) { |
| 179 | 179 | throw new \RuntimeException('The name of the type should be one of: ' . |
| 180 | 180 | implode(',', $types)); |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | private function validateName($name) { |
| 554 | 554 | if (!preg_match('{^[a-z0-9_.-]+/[a-z0-9_.-]+$}', $name)) { |
| 555 | 555 | throw new \InvalidArgumentException( |
| 556 | - 'The package name '.$name.' is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+' |
|
| 556 | + 'The package name ' . $name . ' is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name, matching: [a-z0-9_.-]+/[a-z0-9_.-]+' |
|
| 557 | 557 | ); |
| 558 | 558 | } |
| 559 | 559 | } |
@@ -24,8 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | protected function getQuestion($question, $default = null, $sep = ':') { |
| 26 | 26 | return !empty($default) ? |
| 27 | - sprintf('<info>%s</info> [<comment>%s</comment>]%s ', $question, $default, $sep) : |
|
| 28 | - sprintf('<info>%s</info>%s ', $question, $sep); |
|
| 27 | + sprintf('<info>%s</info> [<comment>%s</comment>]%s ', $question, $default, $sep) : sprintf('<info>%s</info>%s ', $question, $sep); |
|
| 29 | 28 | } |
| 30 | 29 | |
| 31 | 30 | /** |
@@ -153,14 +153,14 @@ |
||
| 153 | 153 | // iterate over behaviors to get their respective columns |
| 154 | 154 | foreach ($table->getBehaviors() as $behavior) { |
| 155 | 155 | switch ($behavior->getName()) { |
| 156 | - case 'timestampable': |
|
| 157 | - $fields[] = $behavior->getParameter('create_column'); |
|
| 158 | - $fields[] = $behavior->getParameter('update_column'); |
|
| 159 | - break; |
|
| 160 | - |
|
| 161 | - case 'aggregate_column': |
|
| 162 | - $fields[] = $behavior->getParameter('name'); |
|
| 163 | - break; |
|
| 156 | + case 'timestampable': |
|
| 157 | + $fields[] = $behavior->getParameter('create_column'); |
|
| 158 | + $fields[] = $behavior->getParameter('update_column'); |
|
| 159 | + break; |
|
| 160 | + |
|
| 161 | + case 'aggregate_column': |
|
| 162 | + $fields[] = $behavior->getParameter('name'); |
|
| 163 | + break; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * Adds authors to the docblock of the given struct |
| 63 | 63 | * |
| 64 | 64 | * @param AbstractPhpStruct $struct |
| 65 | - * @param array $package |
|
| 65 | + * @param PackageSchema $package |
|
| 66 | 66 | */ |
| 67 | 67 | public function addAuthors(AbstractPhpStruct $struct, PackageSchema $package) { |
| 68 | 68 | $docblock = $struct->getDocblock(); |
@@ -23,20 +23,20 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public static function createActionTraitGenerator($type, CommandService $service) { |
| 25 | 25 | switch ($type) { |
| 26 | - case 'list': |
|
| 27 | - return new ModelListActionTraitGenerator($service); |
|
| 26 | + case 'list': |
|
| 27 | + return new ModelListActionTraitGenerator($service); |
|
| 28 | 28 | |
| 29 | - case 'create': |
|
| 30 | - return new ModelCreateActionTraitGenerator($service); |
|
| 29 | + case 'create': |
|
| 30 | + return new ModelCreateActionTraitGenerator($service); |
|
| 31 | 31 | |
| 32 | - case 'update': |
|
| 33 | - return new ModelUpdateActionTraitGenerator($service); |
|
| 32 | + case 'update': |
|
| 33 | + return new ModelUpdateActionTraitGenerator($service); |
|
| 34 | 34 | |
| 35 | - case 'read': |
|
| 36 | - return new ModelReadActionTraitGenerator($service); |
|
| 35 | + case 'read': |
|
| 36 | + return new ModelReadActionTraitGenerator($service); |
|
| 37 | 37 | |
| 38 | - case 'delete': |
|
| 39 | - return new ModelDeleteActionTraitGenerator($service); |
|
| 38 | + case 'delete': |
|
| 39 | + return new ModelDeleteActionTraitGenerator($service); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | |
@@ -48,20 +48,20 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public static function createJsonResponseGenerator($type, CommandService $service) { |
| 50 | 50 | switch ($type) { |
| 51 | - case 'list': |
|
| 52 | - return new ModelListJsonResponseGenerator($service); |
|
| 51 | + case 'list': |
|
| 52 | + return new ModelListJsonResponseGenerator($service); |
|
| 53 | 53 | |
| 54 | - case 'create': |
|
| 55 | - return new ModelCreateJsonResponseGenerator($service); |
|
| 54 | + case 'create': |
|
| 55 | + return new ModelCreateJsonResponseGenerator($service); |
|
| 56 | 56 | |
| 57 | - case 'update': |
|
| 58 | - return new ModelUpdateJsonResponseGenerator($service); |
|
| 57 | + case 'update': |
|
| 58 | + return new ModelUpdateJsonResponseGenerator($service); |
|
| 59 | 59 | |
| 60 | - case 'read': |
|
| 61 | - return new ModelReadJsonResponseGenerator($service); |
|
| 60 | + case 'read': |
|
| 61 | + return new ModelReadJsonResponseGenerator($service); |
|
| 62 | 62 | |
| 63 | - case 'delete': |
|
| 64 | - return new ModelDeleteJsonResponseGenerator($service); |
|
| 63 | + case 'delete': |
|
| 64 | + return new ModelDeleteJsonResponseGenerator($service); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -167,14 +167,14 @@ |
||
| 167 | 167 | if ($package->getVendor() == 'keeko' && $this->isCoreSchema()) { |
| 168 | 168 | $model = $package->getName(); |
| 169 | 169 | if ($this->hasModel($model)) { |
| 170 | - $models []= $model; |
|
| 170 | + $models [] = $model; |
|
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // anyway, generate all |
| 175 | 175 | else { |
| 176 | 176 | foreach ($this->getModels() as $model) { |
| 177 | - $models []= $model->getOriginCommonName(); |
|
| 177 | + $models [] = $model->getOriginCommonName(); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -91,6 +91,9 @@ |
||
| 91 | 91 | ; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param string $name |
|
| 96 | + */ |
|
| 94 | 97 | protected function runCommand($name, InputInterface $input, OutputInterface $output) { |
| 95 | 98 | // return whether command has already executed |
| 96 | 99 | $app = $this->getApplication(); |
@@ -283,7 +283,6 @@ |
||
| 283 | 283 | /** |
| 284 | 284 | * Generates an action. |
| 285 | 285 | * |
| 286 | - * @param string $actionName |
|
| 287 | 286 | * @param ActionSchema $action the action node from composer.json |
| 288 | 287 | */ |
| 289 | 288 | private function generateAction($actionName) { |
@@ -268,14 +268,14 @@ |
||
| 268 | 268 | private function getActionTitle($modelName, $type) { |
| 269 | 269 | $name = NameUtils::dasherize($modelName); |
| 270 | 270 | switch ($type) { |
| 271 | - case 'list': |
|
| 272 | - return 'List all ' . NameUtils::pluralize($name); |
|
| 271 | + case 'list': |
|
| 272 | + return 'List all ' . NameUtils::pluralize($name); |
|
| 273 | 273 | |
| 274 | - case 'create': |
|
| 275 | - case 'read': |
|
| 276 | - case 'update': |
|
| 277 | - case 'delete': |
|
| 278 | - return ucfirst($type) . 's ' . (in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a') . ' ' . $name; |
|
| 274 | + case 'create': |
|
| 275 | + case 'read': |
|
| 276 | + case 'update': |
|
| 277 | + case 'delete': |
|
| 278 | + return ucfirst($type) . 's ' . (in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a') . ' ' . $name; |
|
| 279 | 279 | } |
| 280 | 280 | } |
| 281 | 281 | |
@@ -14,6 +14,9 @@ |
||
| 14 | 14 | /** @var Table */ |
| 15 | 15 | private $foreign; |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param \keeko\tools\services\CommandService $service |
|
| 19 | + */ |
|
| 17 | 20 | public function __construct($service, Table $model, Table $foreign) { |
| 18 | 21 | parent::__construct($service); |
| 19 | 22 | $this->model = $model; |