@@ -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; |
@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | protected function addMethods(PhpClass $class, ActionSchema $action) { |
23 | 23 | // method: run(Request $request, $data = null) |
24 | - $class->addUseStatement($this->model->getNamespace() . '\\' . $this->model->getPhpName()); |
|
24 | + $class->addUseStatement($this->model->getNamespace().'\\'.$this->model->getPhpName()); |
|
25 | 25 | $class->setMethod($this->generateRunMethod($this->twig->render('dump-to-one-relationship.twig', [ |
26 | 26 | 'class' => $this->model->getPhpName(), |
27 | 27 | 'related' => $this->foreign->getCamelCaseName() |
@@ -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; |
@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | protected function addMethods(PhpClass $class, ActionSchema $action) { |
23 | 23 | // method: run(Request $request, $data = null) |
24 | - $class->addUseStatement($this->model->getNamespace() . '\\' . $this->model->getPhpName()); |
|
24 | + $class->addUseStatement($this->model->getNamespace().'\\'.$this->model->getPhpName()); |
|
25 | 25 | $class->setMethod($this->generateRunMethod($this->twig->render('dump-to-one-relationship.twig', [ |
26 | 26 | 'class' => $this->model->getPhpName(), |
27 | 27 | 'related' => $this->foreign->getCamelCaseName() |
@@ -6,6 +6,6 @@ |
||
6 | 6 | public function __construct() {} |
7 | 7 | |
8 | 8 | public function getTemplateRoot() { |
9 | - return __DIR__ . '/../../templates'; |
|
9 | + return __DIR__.'/../../templates'; |
|
10 | 10 | } |
11 | 11 | } |
12 | 12 | \ No newline at end of file |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | protected function initialize(InputInterface $input, OutputInterface $output) { |
47 | 47 | parent::initialize($input, $output); |
48 | 48 | |
49 | - $loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot() . '/serializer'); |
|
49 | + $loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot().'/serializer'); |
|
50 | 50 | $this->twig = new \Twig_Environment($loader); |
51 | 51 | } |
52 | 52 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | private function generateModel($modelName) { |
136 | - $this->logger->info('Generate Serializer from Model: ' . $modelName); |
|
136 | + $this->logger->info('Generate Serializer from Model: '.$modelName); |
|
137 | 137 | $model = $this->modelService->getModel($modelName); |
138 | 138 | |
139 | 139 | // trait |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $this->codegenService->dumpStruct($serializer, true); |
162 | 162 | |
163 | 163 | // add serializer + APIModelInterface on the model |
164 | - $class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace() . '\\' . $model->getPhpName())); |
|
164 | + $class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace().'\\'.$model->getPhpName())); |
|
165 | 165 | $file = new File($this->codegenService->getFilename($class)); |
166 | 166 | if ($file->exists()) { |
167 | 167 | $class = PhpClass::fromFile($this->codegenService->getFilename($class)); |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * @param string $actionName |
192 | 192 | */ |
193 | 193 | private function generateAction($actionName) { |
194 | - $this->logger->info('Generate Serializer for action: ' . $actionName); |
|
194 | + $this->logger->info('Generate Serializer for action: '.$actionName); |
|
195 | 195 | |
196 | 196 | $action = $this->packageService->getAction($actionName); |
197 | 197 | $generator = new ActionSerializerGenerator($this->service); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | protected function generateResponse($actionName) { |
143 | - $this->logger->info('Generate Response: ' . $actionName); |
|
143 | + $this->logger->info('Generate Response: '.$actionName); |
|
144 | 144 | $module = $this->packageService->getModule(); |
145 | 145 | |
146 | 146 | if (!$module->hasAction($actionName)) { |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $modelName = $this->modelService->getModelNameByAction($action); |
161 | 161 | |
162 | 162 | if (!$action->hasResponse($format)) { |
163 | - $action->setResponse($format, str_replace(['Action', 'action'], [ucwords($format) . 'Responder', 'responder'], $action->getClass())); |
|
163 | + $action->setResponse($format, str_replace(['Action', 'action'], [ucwords($format).'Responder', 'responder'], $action->getClass())); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | // find generator |
@@ -228,13 +228,13 @@ discard block |
||
228 | 228 | $foreign->getPhpName() |
229 | 229 | ); |
230 | 230 | |
231 | - $many = $module->hasAction($prefix . '-read') |
|
232 | - && $module->hasAction($prefix . '-update') |
|
233 | - && $module->hasAction($prefix . '-add') |
|
234 | - && $module->hasAction($prefix . '-remove') |
|
231 | + $many = $module->hasAction($prefix.'-read') |
|
232 | + && $module->hasAction($prefix.'-update') |
|
233 | + && $module->hasAction($prefix.'-add') |
|
234 | + && $module->hasAction($prefix.'-remove') |
|
235 | 235 | ; |
236 | - $single = $module->hasAction($prefix . '-read') |
|
237 | - && $module->hasAction($prefix . '-update') |
|
236 | + $single = $module->hasAction($prefix.'-read') |
|
237 | + && $module->hasAction($prefix.'-update') |
|
238 | 238 | && !$many |
239 | 239 | ; |
240 | 240 |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | $schema = null; |
35 | 35 | $schemas = [ |
36 | 36 | $input->hasOption('schema') ? $input->getOption('schema') : '', |
37 | - $workDir . '/database/schema.xml', |
|
38 | - $workDir . '/core/database/schema.xml', |
|
39 | - $workDir . '/vendor/keeko/core/database/schema.xml' |
|
37 | + $workDir.'/database/schema.xml', |
|
38 | + $workDir.'/core/database/schema.xml', |
|
39 | + $workDir.'/vendor/keeko/core/database/schema.xml' |
|
40 | 40 | ]; |
41 | 41 | foreach ($schemas as $path) { |
42 | 42 | if (file_exists($path)) { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | public function getTableName($name) { |
89 | 89 | $db = $this->getDatabase(); |
90 | 90 | if (!Text::create($name)->startsWith($db->getTablePrefix())) { |
91 | - $name = $db->getTablePrefix() . $name; |
|
91 | + $name = $db->getTablePrefix().$name; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | return $name; |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public function getModels() { |
118 | 118 | if ($this->models === null) { |
119 | - $namespace = $this->packageService->getNamespace() . '\\model'; |
|
119 | + $namespace = $this->packageService->getNamespace().'\\model'; |
|
120 | 120 | $propel = $this->getDatabase(); |
121 | 121 | |
122 | 122 | $this->models = new ArrayList(); |
@@ -165,14 +165,14 @@ discard block |
||
165 | 165 | if ($package->getVendor() == 'keeko' && $this->isCoreSchema()) { |
166 | 166 | $model = $package->getName(); |
167 | 167 | if ($this->hasModel($model)) { |
168 | - $models []= $model; |
|
168 | + $models [] = $model; |
|
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | 172 | // anyway, generate all |
173 | 173 | else { |
174 | 174 | foreach ($this->getModels() as $model) { |
175 | - $models []= $model->getOriginCommonName(); |
|
175 | + $models [] = $model->getOriginCommonName(); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | $model = $this->getModel($modelName); |
239 | 239 | $modelObjectName = $model->getPhpName(); |
240 | 240 | |
241 | - return $database->getNamespace() . '\\' . $modelObjectName; |
|
241 | + return $database->getNamespace().'\\'.$modelObjectName; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |
@@ -15,9 +15,9 @@ |
||
15 | 15 | |
16 | 16 | // method: run(Request $request) |
17 | 17 | $class->addUseStatement('Tobscure\\JsonApi\\Parameters'); |
18 | - $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain'); |
|
18 | + $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain'); |
|
19 | 19 | $class->setMethod($this->generateRunMethod($this->twig->render('list-run.twig', [ |
20 | - 'domain' => $model->getPhpName() . 'Domain' |
|
20 | + 'domain' => $model->getPhpName().'Domain' |
|
21 | 21 | ]))); |
22 | 22 | |
23 | 23 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | // method: run(Request $request) : Response |
22 | 22 | $class->addUseStatement('Symfony\\Component\\Routing\\Exception\\ResourceNotFoundException'); |
23 | - $class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query'); |
|
23 | + $class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query'); |
|
24 | 24 | $class->setMethod($this->generateRunMethod($this->twig->render('to-many-read-run.twig', [ |
25 | 25 | 'model' => $model->getCamelCaseName(), |
26 | 26 | 'class' => $model->getPhpName() |
@@ -21,9 +21,9 @@ |
||
21 | 21 | // method: run(Request $request) : Response |
22 | 22 | $class->addUseStatement('Symfony\\Component\\Routing\\Exception\\ResourceNotFoundException'); |
23 | 23 | $class->addUseStatement('Tobscure\\JsonApi\\Exception\\InvalidParameterException'); |
24 | - $class->addUseStatement($middle->getNamespace() . '\\' . $middle->getPhpName() . 'Query'); |
|
25 | - $class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query'); |
|
26 | - $class->addUseStatement($model->getNamespace() . '\\' . $foreignModel->getPhpName() . 'Query'); |
|
24 | + $class->addUseStatement($middle->getNamespace().'\\'.$middle->getPhpName().'Query'); |
|
25 | + $class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query'); |
|
26 | + $class->addUseStatement($model->getNamespace().'\\'.$foreignModel->getPhpName().'Query'); |
|
27 | 27 | $class->setMethod($this->generateRunMethod($this->twig->render('to-many-update-run.twig', [ |
28 | 28 | 'model' => $model->getCamelCaseName(), |
29 | 29 | 'class' => $model->getPhpName(), |