@@ -21,9 +21,9 @@ |
||
21 | 21 | // method: run(Request $request) : Response |
22 | 22 | $class->addUseStatement('phootwork\\json\\Json'); |
23 | 23 | $class->addUseStatement('Tobscure\\JsonApi\\Exception\\InvalidParameterException'); |
24 | - $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain'); |
|
24 | + $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain'); |
|
25 | 25 | $class->setMethod($this->generateRunMethod($this->twig->render('to-many-remove-run.twig', [ |
26 | - 'domain' => $model->getPhpName() . 'Domain', |
|
26 | + 'domain' => $model->getPhpName().'Domain', |
|
27 | 27 | 'foreign_class' => $foreignModel->getPhpName() |
28 | 28 | ]))); |
29 | 29 |
@@ -20,9 +20,9 @@ |
||
20 | 20 | $this->addConfigureParamsMethod($class, $this->twig->render('relationship-configureParams.twig')); |
21 | 21 | |
22 | 22 | // method: run(Request $request) : Response |
23 | - $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain'); |
|
23 | + $class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain'); |
|
24 | 24 | $class->setMethod($this->generateRunMethod($this->twig->render('to-one-read-run.twig', [ |
25 | - 'domain' => $model->getPhpName() . 'Domain' |
|
25 | + 'domain' => $model->getPhpName().'Domain' |
|
26 | 26 | ]))); |
27 | 27 | |
28 | 28 | return $class; |
@@ -34,10 +34,10 @@ discard block |
||
34 | 34 | $schema = null; |
35 | 35 | $schemas = [ |
36 | 36 | $input->hasOption('schema') ? $input->getOption('schema') : '', |
37 | - $workDir . '/database/schema.xml', |
|
38 | - $workDir . '/res/database/schema.xml', |
|
39 | - $workDir . '/vendor/keeko/core/database/schema.xml', |
|
40 | - $workDir . '/vendor/keeko/core/res/database/schema.xml' |
|
37 | + $workDir.'/database/schema.xml', |
|
38 | + $workDir.'/res/database/schema.xml', |
|
39 | + $workDir.'/vendor/keeko/core/database/schema.xml', |
|
40 | + $workDir.'/vendor/keeko/core/res/database/schema.xml' |
|
41 | 41 | ]; |
42 | 42 | foreach ($schemas as $path) { |
43 | 43 | if (file_exists($path)) { |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | public function getTableName($name) { |
90 | 90 | $db = $this->getDatabase(); |
91 | 91 | if (!Text::create($name)->startsWith($db->getTablePrefix())) { |
92 | - $name = $db->getTablePrefix() . $name; |
|
92 | + $name = $db->getTablePrefix().$name; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | return $name; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function getModels() { |
119 | 119 | if ($this->models === null) { |
120 | - $namespace = $this->packageService->getNamespace() . '\\model'; |
|
120 | + $namespace = $this->packageService->getNamespace().'\\model'; |
|
121 | 121 | $propel = $this->getDatabase(); |
122 | 122 | |
123 | 123 | $this->models = new ArrayList(); |
@@ -162,14 +162,14 @@ discard block |
||
162 | 162 | if ($package->getVendor() == 'keeko' && $this->isCoreSchema()) { |
163 | 163 | $model = $package->getName(); |
164 | 164 | if ($this->hasModel($model)) { |
165 | - $models []= $model; |
|
165 | + $models [] = $model; |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
169 | 169 | // anyway, generate all |
170 | 170 | else { |
171 | 171 | foreach ($this->getModels() as $model) { |
172 | - $models []= $model->getOriginCommonName(); |
|
172 | + $models [] = $model->getOriginCommonName(); |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | $model = $this->getModel($modelName); |
236 | 236 | $modelObjectName = $model->getPhpName(); |
237 | 237 | |
238 | - return $database->getNamespace() . '\\' . $modelObjectName; |
|
238 | + return $database->getNamespace().'\\'.$modelObjectName; |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use keeko\tools\generator\serializer\base\ModelSerializerTraitGenerator; |
8 | 8 | use keeko\tools\generator\serializer\SkeletonSerializerGenerator; |
9 | 9 | use keeko\tools\helpers\QuestionHelperTrait; |
10 | -use phootwork\file\File; |
|
11 | 10 | use Symfony\Component\Console\Input\InputArgument; |
12 | 11 | use Symfony\Component\Console\Input\InputInterface; |
13 | 12 | use Symfony\Component\Console\Input\InputOption; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | protected function initialize(InputInterface $input, OutputInterface $output) { |
50 | 50 | parent::initialize($input, $output); |
51 | 51 | |
52 | - $loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot() . '/serializer'); |
|
52 | + $loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot().'/serializer'); |
|
53 | 53 | $this->twig = new \Twig_Environment($loader); |
54 | 54 | } |
55 | 55 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | private function generateModel($modelName) { |
132 | - $this->logger->info('Generate Serializer from Model: ' . $modelName); |
|
132 | + $this->logger->info('Generate Serializer from Model: '.$modelName); |
|
133 | 133 | $model = $this->modelService->getModel($modelName); |
134 | 134 | |
135 | 135 | // generate class |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $this->codegenService->dumpStruct($trait, true); |
144 | 144 | |
145 | 145 | // add serializer + ApiModelInterface on the model |
146 | - $class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace() . '\\' . $model->getPhpName())); |
|
146 | + $class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace().'\\'.$model->getPhpName())); |
|
147 | 147 | $file = $this->codegenService->getFile($class); |
148 | 148 | if ($file->exists()) { |
149 | 149 | $class = PhpClass::fromFile($this->codegenService->getFilename($class)); |
@@ -173,10 +173,10 @@ discard block |
||
173 | 173 | * @param string $name |
174 | 174 | */ |
175 | 175 | private function generateSkeleton($name) { |
176 | - $this->logger->info('Generate Skeleton Serializer: ' . $name); |
|
176 | + $this->logger->info('Generate Skeleton Serializer: '.$name); |
|
177 | 177 | $input = $this->io->getInput(); |
178 | 178 | |
179 | - $className = NamespaceResolver::getNamespace('src/serializer', $this->package) . '\\' . $name; |
|
179 | + $className = NamespaceResolver::getNamespace('src/serializer', $this->package).'\\'.$name; |
|
180 | 180 | |
181 | 181 | if (!Text::create($className)->endsWith('Serializer')) { |
182 | 182 | $className .= 'Serializer'; |
@@ -6,7 +6,7 @@ |
||
6 | 6 | /** |
7 | 7 | * Add default blank methods |
8 | 8 | * |
9 | - * @param string $classname |
|
9 | + * @param string $className |
|
10 | 10 | */ |
11 | 11 | public function generate($className) { |
12 | 12 | $class = $this->generateClass($className); |
@@ -8,6 +8,9 @@ |
||
8 | 8 | |
9 | 9 | protected $serializer; |
10 | 10 | |
11 | + /** |
|
12 | + * @param string $serializer |
|
13 | + */ |
|
11 | 14 | public function setSerializer($serializer) { |
12 | 15 | $this->serializer = $serializer; |
13 | 16 | } |
@@ -27,13 +27,13 @@ |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | protected function getClassName(Table $model) { |
30 | - return str_replace('model', 'serializer', $model->getNamespace()) . |
|
31 | - '\\' . $model->getPhpName() . 'Serializer'; |
|
30 | + return str_replace('model', 'serializer', $model->getNamespace()). |
|
31 | + '\\'.$model->getPhpName().'Serializer'; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | protected function ensureDomainTrait(PhpClass $class, Table $model) { |
35 | - $class->addUseStatement(str_replace('model', 'serializer\\base', $model->getNamespace()) . |
|
36 | - '\\' . $model->getPhpName() . 'SerializerTrait'); |
|
37 | - $class->addTrait($model->getPhpName() . 'SerializerTrait'); |
|
35 | + $class->addUseStatement(str_replace('model', 'serializer\\base', $model->getNamespace()). |
|
36 | + '\\'.$model->getPhpName().'SerializerTrait'); |
|
37 | + $class->addTrait($model->getPhpName().'SerializerTrait'); |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 | \ No newline at end of file |
@@ -34,19 +34,19 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | protected function getClassName(Table $model) { |
37 | - return str_replace('model', 'domain', $model->getNamespace()) . |
|
38 | - '\\' . $model->getPhpName() . 'Domain'; |
|
37 | + return str_replace('model', 'domain', $model->getNamespace()). |
|
38 | + '\\'.$model->getPhpName().'Domain'; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | protected function ensureUseStatements(PhpClass $class, Table $model) { |
42 | - $class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query'); |
|
42 | + $class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | protected function generateApplyFilter(PhpClass $class, Table $model) { |
46 | 46 | if (!$class->hasMethod('applyFilter')) { |
47 | 47 | $class->setMethod(PhpMethod::create('applyFilter') |
48 | 48 | ->addParameter(PhpParameter::create('query') |
49 | - ->setType($model->getPhpName() . 'Query') |
|
49 | + ->setType($model->getPhpName().'Query') |
|
50 | 50 | ) |
51 | 51 | ->addParameter(PhpParameter::create('filter')) |
52 | 52 | ->setVisibility(PhpMethod::VISIBILITY_PROTECTED) |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | protected function ensureDomainTrait(PhpClass $class, Table $model) { |
58 | - $class->addUseStatement(str_replace('model', 'domain\\base', $model->getNamespace()) . |
|
59 | - '\\' . $model->getPhpName() . 'DomainTrait'); |
|
60 | - $class->addTrait($model->getPhpName() . 'DomainTrait'); |
|
58 | + $class->addUseStatement(str_replace('model', 'domain\\base', $model->getNamespace()). |
|
59 | + '\\'.$model->getPhpName().'DomainTrait'); |
|
60 | + $class->addTrait($model->getPhpName().'DomainTrait'); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | protected function generateTrait(Table $model) { |
23 | 23 | $trait = PhpTrait::create() |
24 | 24 | ->setNamespace(str_replace('model', 'domain\\base', $model->getNamespace())) |
25 | - ->setName($model->getPhpName() . 'DomainTrait') |
|
26 | - ->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName()) |
|
27 | - ->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query') |
|
25 | + ->setName($model->getPhpName().'DomainTrait') |
|
26 | + ->addUseStatement($model->getNamespace().'\\'.$model->getPhpName()) |
|
27 | + ->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query') |
|
28 | 28 | ->addUseStatement('keeko\\framework\\service\\ServiceContainer') |
29 | 29 | ->setMethod(PhpMethod::create('getServiceContainer') |
30 | 30 | ->setVisibility(PhpMethod::VISIBILITY_PROTECTED) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | ) |
35 | 35 | ; |
36 | 36 | $trait->addUseStatement('keeko\framework\domain\payload\PayloadInterface'); |
37 | - $trait->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName()); |
|
37 | + $trait->addUseStatement($model->getNamespace().'\\'.$model->getPhpName()); |
|
38 | 38 | |
39 | 39 | return $trait; |
40 | 40 | } |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | 'class' => $model->getPhpName() |
49 | 49 | ])) |
50 | 50 | ->setVisibility(PhpMethod::VISIBILITY_PROTECTED) |
51 | - ->setDescription('Returns one ' . $model->getPhpName() . ' with the given id from cache') |
|
52 | - ->setType($model->getPhpName() . '|null') |
|
51 | + ->setDescription('Returns one '.$model->getPhpName().' with the given id from cache') |
|
52 | + ->setType($model->getPhpName().'|null') |
|
53 | 53 | ); |
54 | 54 | } |
55 | 55 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | 'model' => NameUtils::toCamelCase($model->getOriginCommonName()), |
64 | 64 | 'class' => $model->getPhpName() |
65 | 65 | ])) |
66 | - ->setDescription('Returns one ' . $model->getPhpName() . ' with the given id') |
|
66 | + ->setDescription('Returns one '.$model->getPhpName().' with the given id') |
|
67 | 67 | ->setType('PayloadInterface') |
68 | 68 | ); |
69 | 69 | } |
@@ -87,17 +87,17 @@ discard block |
||
87 | 87 | |
88 | 88 | $trait->setMethod(PhpMethod::create('applyFilter') |
89 | 89 | ->addParameter(PhpParameter::create('query') |
90 | - ->setType($model->getPhpName() . 'Query') |
|
90 | + ->setType($model->getPhpName().'Query') |
|
91 | 91 | ) |
92 | 92 | ->addParameter(PhpParameter::create('filter')) |
93 | 93 | ->setVisibility(PhpMethod::VISIBILITY_PROTECTED) |
94 | 94 | ->setAbstract(true) |
95 | - ->setDescription('Implement this functionality at ' . $this->getClassName($model)) |
|
95 | + ->setDescription('Implement this functionality at '.$this->getClassName($model)) |
|
96 | 96 | ); |
97 | 97 | } |
98 | 98 | |
99 | 99 | protected function getClassName(Table $model) { |
100 | - return str_replace('model', 'domain', $model->getNamespace()) . |
|
101 | - '\\' . $model->getPhpName() . 'Domain'; |
|
100 | + return str_replace('model', 'domain', $model->getNamespace()). |
|
101 | + '\\'.$model->getPhpName().'Domain'; |
|
102 | 102 | } |
103 | 103 | } |