@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | ); |
94 | 94 | |
95 | 95 | $pathExpression = new PathExpression( |
96 | - PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, |
|
96 | + PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, |
|
97 | 97 | $rootAlias, |
98 | 98 | $identifier |
99 | 99 | ); |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | |
105 | 105 | if (isset($AST->orderByClause)) { |
106 | 106 | foreach ($AST->orderByClause->orderByItems as $item) { |
107 | - if ( ! $item->expression instanceof PathExpression) { |
|
107 | + if (!$item->expression instanceof PathExpression) { |
|
108 | 108 | continue; |
109 | 109 | } |
110 | 110 | |
111 | 111 | $AST->selectClause->selectExpressions[] = new SelectExpression( |
112 | 112 | $this->createSelectExpressionItem($item->expression), |
113 | - '_dctrn_ord' . $this->_aliasCounter++ |
|
113 | + '_dctrn_ord'.$this->_aliasCounter++ |
|
114 | 114 | ); |
115 | 115 | } |
116 | 116 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | && isset($queryComponents[$expression->identificationVariable])) { |
146 | 146 | $queryComponent = $queryComponents[$expression->identificationVariable]; |
147 | 147 | if (isset($queryComponent['parent']) |
148 | - && $queryComponent['relation']['type'] & ClassMetadataInfo::TO_MANY) { |
|
148 | + && $queryComponent['relation']['type']&ClassMetadataInfo::TO_MANY) { |
|
149 | 149 | throw new \RuntimeException("Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers."); |
150 | 150 | } |
151 | 151 | } |
@@ -20,7 +20,6 @@ |
||
20 | 20 | |
21 | 21 | use Doctrine\DBAL\Types\Type; |
22 | 22 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
23 | -use Doctrine\ORM\ORMException; |
|
24 | 23 | use Doctrine\ORM\Query; |
25 | 24 | use Doctrine\ORM\Query\AST\Functions\IdentityFunction; |
26 | 25 | use Doctrine\ORM\Query\AST\PathExpression; |
@@ -44,9 +44,9 @@ |
||
44 | 44 | */ |
45 | 45 | public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) |
46 | 46 | { |
47 | - return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause( |
|
47 | + return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause( |
|
48 | 48 | $this->orderByClause |
49 | - )) . ')'; |
|
49 | + )).')'; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -209,8 +209,8 @@ discard block |
||
209 | 209 | $sqlIdentifier = $this->getSQLIdentifier($AST); |
210 | 210 | |
211 | 211 | if ($hasOrderBy) { |
212 | - $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier); |
|
213 | - $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum'; |
|
212 | + $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier); |
|
213 | + $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum'; |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | // Build the counter query |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | ); |
222 | 222 | |
223 | 223 | if ($hasOrderBy) { |
224 | - $sql .= $orderGroupBy . $outerOrderBy; |
|
224 | + $sql .= $orderGroupBy.$outerOrderBy; |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | // Apply the limit and offset. |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | { |
369 | 369 | // If the sql statement has an order by clause, we need to wrap it in a new select distinct |
370 | 370 | // statement |
371 | - if (! $orderByClause instanceof OrderByClause) { |
|
371 | + if (!$orderByClause instanceof OrderByClause) { |
|
372 | 372 | return $sql; |
373 | 373 | } |
374 | 374 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | = array(); |
405 | 405 | |
406 | 406 | // Generate DQL alias -> SQL table alias mapping |
407 | - foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) { |
|
407 | + foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) { |
|
408 | 408 | $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata']; |
409 | 409 | $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias); |
410 | 410 | } |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i'; |
414 | 414 | |
415 | 415 | // Generate search patterns for each field's path expression in the order by clause |
416 | - foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) { |
|
416 | + foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) { |
|
417 | 417 | $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias]; |
418 | 418 | $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias]; |
419 | 419 | |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | $replacements[] = $fieldAlias; |
450 | 450 | } |
451 | 451 | |
452 | - foreach($orderByClause->orderByItems as $orderByItem) { |
|
452 | + foreach ($orderByClause->orderByItems as $orderByItem) { |
|
453 | 453 | // Walk order by item to get string representation of it |
454 | 454 | $orderByItemString = $this->walkOrderByItem($orderByItem); |
455 | 455 |
@@ -18,19 +18,10 @@ |
||
18 | 18 | use Doctrine\DBAL\Platforms\PostgreSqlPlatform; |
19 | 19 | use Doctrine\DBAL\Platforms\SQLAnywherePlatform; |
20 | 20 | use Doctrine\DBAL\Platforms\SQLServerPlatform; |
21 | -use Doctrine\ORM\Query\AST\ArithmeticExpression; |
|
22 | -use Doctrine\ORM\Query\AST\ArithmeticFactor; |
|
23 | -use Doctrine\ORM\Query\AST\ArithmeticTerm; |
|
24 | -use Doctrine\ORM\Query\AST\Literal; |
|
25 | 21 | use Doctrine\ORM\Query\AST\OrderByClause; |
26 | -use Doctrine\ORM\Query\AST\OrderByItem; |
|
27 | 22 | use Doctrine\ORM\Query\AST\PartialObjectExpression; |
28 | -use Doctrine\ORM\Query\AST\PathExpression; |
|
29 | 23 | use Doctrine\ORM\Query\AST\SelectExpression; |
30 | 24 | use Doctrine\ORM\Query\AST\SelectStatement; |
31 | -use Doctrine\ORM\Query\AST\SimpleArithmeticExpression; |
|
32 | -use Doctrine\ORM\Query\Expr\OrderBy; |
|
33 | -use Doctrine\ORM\Query\Expr\Select; |
|
34 | 25 | use Doctrine\ORM\Query\SqlWalker; |
35 | 26 | |
36 | 27 | /** |
@@ -91,7 +91,7 @@ |
||
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | - $recursive = function ($config, $space = ' ') use (&$recursive, $output) { |
|
94 | + $recursive = function($config, $space = ' ') use (&$recursive, $output) { |
|
95 | 95 | foreach ($config as $key => $item) { |
96 | 96 | if (is_array($item)) { |
97 | 97 | $space = ' '; |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | $em->getConfiguration()->setSQLLogger(null); |
236 | 236 | |
237 | 237 | $response = new StreamedResponse(); |
238 | - $response->setCallback(function () use ($app, $request) { |
|
238 | + $response->setCallback(function() use ($app, $request) { |
|
239 | 239 | |
240 | 240 | // CSV種別を元に初期化. |
241 | 241 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | |
250 | 250 | // データ行の出力. |
251 | 251 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
252 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) { |
|
252 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) { |
|
253 | 253 | |
254 | 254 | $Csvs = $csvService->getCsvs(); |
255 | 255 | |
@@ -284,9 +284,9 @@ discard block |
||
284 | 284 | }); |
285 | 285 | |
286 | 286 | $now = new \DateTime(); |
287 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
287 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
288 | 288 | $response->headers->set('Content-Type', 'application/octet-stream'); |
289 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
289 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
290 | 290 | |
291 | 291 | $response->send(); |
292 | 292 |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $em->getConfiguration()->setSQLLogger(null); |
241 | 241 | |
242 | 242 | $response = new StreamedResponse(); |
243 | - $response->setCallback(function () use ($app, $request) { |
|
243 | + $response->setCallback(function() use ($app, $request) { |
|
244 | 244 | |
245 | 245 | // CSV種別を元に初期化. |
246 | 246 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | |
255 | 255 | // データ行の出力. |
256 | 256 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
257 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) { |
|
257 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) { |
|
258 | 258 | |
259 | 259 | $Csvs = $csvService->getCsvs(); |
260 | 260 | |
@@ -295,9 +295,9 @@ discard block |
||
295 | 295 | }); |
296 | 296 | |
297 | 297 | $now = new \DateTime(); |
298 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
298 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
299 | 299 | $response->headers->set('Content-Type', 'application/octet-stream'); |
300 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
300 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
301 | 301 | $response->send(); |
302 | 302 | |
303 | 303 | log_info('受注CSV出力ファイル名', array($filename)); |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | $em->getConfiguration()->setSQLLogger(null); |
323 | 323 | |
324 | 324 | $response = new StreamedResponse(); |
325 | - $response->setCallback(function () use ($app, $request) { |
|
325 | + $response->setCallback(function() use ($app, $request) { |
|
326 | 326 | |
327 | 327 | // CSV種別を元に初期化. |
328 | 328 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | |
337 | 337 | // データ行の出力. |
338 | 338 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
339 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) { |
|
339 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) { |
|
340 | 340 | |
341 | 341 | $Csvs = $csvService->getCsvs(); |
342 | 342 | |
@@ -386,9 +386,9 @@ discard block |
||
386 | 386 | }); |
387 | 387 | |
388 | 388 | $now = new \DateTime(); |
389 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
389 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
390 | 390 | $response->headers->set('Content-Type', 'application/octet-stream'); |
391 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
391 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
392 | 392 | $response->send(); |
393 | 393 | |
394 | 394 | log_info('配送CSV出力ファイル名', array($filename)); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $em->getConfiguration()->setSQLLogger(null); |
206 | 206 | |
207 | 207 | $response = new StreamedResponse(); |
208 | - $response->setCallback(function () use ($app, $request) { |
|
208 | + $response->setCallback(function() use ($app, $request) { |
|
209 | 209 | |
210 | 210 | // CSV種別を元に初期化. |
211 | 211 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | |
220 | 220 | // データ行の出力. |
221 | 221 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
222 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) { |
|
222 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) { |
|
223 | 223 | |
224 | 224 | $Csvs = $csvService->getCsvs(); |
225 | 225 | |
@@ -252,9 +252,9 @@ discard block |
||
252 | 252 | }); |
253 | 253 | |
254 | 254 | $now = new \DateTime(); |
255 | - $filename = 'category_' . $now->format('YmdHis') . '.csv'; |
|
255 | + $filename = 'category_'.$now->format('YmdHis').'.csv'; |
|
256 | 256 | $response->headers->set('Content-Type', 'application/octet-stream'); |
257 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
257 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
258 | 258 | $response->send(); |
259 | 259 | |
260 | 260 | log_info('カテゴリCSV出力ファイル名', array($filename)); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $this->output->writeln('------------------------------------------------------'); |
48 | 48 | $this->output->writeln('---Plugin Generator for Entity'); |
49 | 49 | $this->output->writeln('---[*] You need to create yaml file first.'); |
50 | - $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.'); |
|
50 | + $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.'); |
|
51 | 51 | $this->output->writeln('------------------------------------------------------'); |
52 | 52 | $this->output->writeln(''); |
53 | 53 | } |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | $pluginCode = $this->paramList['pluginCode']['value']; |
63 | 63 | $yamlList = $this->paramList['entityList']['value']; |
64 | 64 | |
65 | - $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode; |
|
65 | + $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode; |
|
66 | 66 | |
67 | 67 | $dirList = array('Entity', 'Repository', '/Resource/doctrine/migration'); |
68 | 68 | foreach ($dirList as $dirName) { |
69 | - $dirPath = $codePath . '/' . $dirName; |
|
69 | + $dirPath = $codePath.'/'.$dirName; |
|
70 | 70 | if (!is_dir($dirPath)) { |
71 | 71 | mkdir($dirPath); |
72 | 72 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $metadetas = array(); |
80 | 80 | |
81 | 81 | |
82 | - $YamlDriver = new YamlDriver(array($codePath . '/Resource/doctrine')); |
|
82 | + $YamlDriver = new YamlDriver(array($codePath.'/Resource/doctrine')); |
|
83 | 83 | foreach ($yamlList as $pathYaml => $fullClassName) { |
84 | 84 | |
85 | 85 | $MetadataInfo = new ClassMetadataInfo($fullClassName); |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | $EntityGenerator->setGenerateStubMethods(true); |
96 | 96 | $EntityGenerator->setUpdateEntityIfExists(false); |
97 | 97 | |
98 | - $pathClass = $this->app['config']['root_dir'] . '/app/'; |
|
98 | + $pathClass = $this->app['config']['root_dir'].'/app/'; |
|
99 | 99 | $EntityGenerator->generate(array($MetadataInfo), $pathClass); |
100 | - $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name) . '.php'; |
|
100 | + $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name).'.php'; |
|
101 | 101 | if (is_file($pathClass)) { |
102 | 102 | $fsList['file'][$pathClass] = true; |
103 | 103 | } else { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $migrationContent = $this->makeMigration($pluginCode, $metadetas); |
119 | 119 | $timeSt = date('YmdHis'); |
120 | 120 | $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent); |
121 | - $migPath = $codePath . '/Resource/doctrine/migration/Version' . $timeSt . '.php'; |
|
121 | + $migPath = $codePath.'/Resource/doctrine/migration/Version'.$timeSt.'.php'; |
|
122 | 122 | |
123 | 123 | file_put_contents($migPath, $migrationContent); |
124 | 124 | if (is_file($migPath)) { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $this->output->writeln(''); |
151 | 151 | $this->output->writeln(' this files and folders were created.'); |
152 | 152 | foreach ($dirFileOk as $path) { |
153 | - $this->output->writeln('<info> - ' . $path . '</info>'); |
|
153 | + $this->output->writeln('<info> - '.$path.'</info>'); |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | |
202 | 202 | if ($this->entityList === null) { |
203 | 203 | $this->entityList = array(); |
204 | - $directory = $this->app['config']['root_dir'] . '/app/Plugin/' . $this->paramList['pluginCode']['value'] . '/Resource/doctrine/'; |
|
204 | + $directory = $this->app['config']['root_dir'].'/app/Plugin/'.$this->paramList['pluginCode']['value'].'/Resource/doctrine/'; |
|
205 | 205 | if (!is_dir($directory)) { |
206 | 206 | return $this->entityList; |
207 | 207 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | private function getPluginList() |
223 | 223 | { |
224 | 224 | $ret = array(); |
225 | - $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin'; |
|
225 | + $pluginDir = $this->app['config']['root_dir'].'/app/Plugin'; |
|
226 | 226 | $iterator = new \DirectoryIterator($pluginDir); |
227 | 227 | foreach ($iterator as $fileInfo) { |
228 | 228 | if ($fileInfo->isDot()) { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | private function toCamelCase($name) |
239 | 239 | { |
240 | - return lcfirst(implode('', array_map(function ($name) { |
|
240 | + return lcfirst(implode('', array_map(function($name) { |
|
241 | 241 | return ucfirst($name); |
242 | 242 | }, explode('_', $name)))); |
243 | 243 | } |
@@ -249,31 +249,31 @@ discard block |
||
249 | 249 | $line = array(); |
250 | 250 | $line[] = '<?php'; |
251 | 251 | $line[] = '/*'; |
252 | - $line[] = ' * This file is part of ' . $pluginCode; |
|
252 | + $line[] = ' * This file is part of '.$pluginCode; |
|
253 | 253 | $line[] = ' *'; |
254 | 254 | $line[] = ' *'; |
255 | 255 | $line[] = ' * For the full copyright and license information, please view the LICENSE'; |
256 | 256 | $line[] = ' * file that was distributed with this source code.'; |
257 | 257 | $line[] = ' */'; |
258 | 258 | $line[] = ''; |
259 | - $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;'; |
|
259 | + $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;'; |
|
260 | 260 | $line[] = ''; |
261 | 261 | $line[] = 'use Doctrine\ORM\EntityRepository;'; |
262 | 262 | $line[] = ''; |
263 | 263 | $line[] = '/**'; |
264 | - $line[] = ' * ' . $nameFormated; |
|
264 | + $line[] = ' * '.$nameFormated; |
|
265 | 265 | $line[] = ' *'; |
266 | 266 | $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom'; |
267 | 267 | $line[] = ' * repository methods below.'; |
268 | 268 | $line[] = ' */'; |
269 | - $line[] = 'class ' . $nameFormated . 'Repository extends EntityRepository'; |
|
269 | + $line[] = 'class '.$nameFormated.'Repository extends EntityRepository'; |
|
270 | 270 | $line[] = '{'; |
271 | 271 | $line[] = ''; |
272 | 272 | $line[] = '}'; |
273 | 273 | $line[] = ''; |
274 | 274 | |
275 | 275 | $cont = join(PHP_EOL, $line); |
276 | - $filename = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . '/Repository/' . $nameFormated . 'Repository.php'; |
|
276 | + $filename = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.'/Repository/'.$nameFormated.'Repository.php'; |
|
277 | 277 | file_put_contents($filename, $cont); |
278 | 278 | return $filename; |
279 | 279 | } |
@@ -281,20 +281,20 @@ discard block |
||
281 | 281 | private function makeMigration($pluginCode, $metadetas) |
282 | 282 | { |
283 | 283 | if ($this->paramList['supportFlag']['value']) { |
284 | - $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php'); |
|
284 | + $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php'); |
|
285 | 285 | } else { |
286 | - $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php'); |
|
286 | + $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php'); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | $entityList = $this->createEntityList($pluginCode, $metadetas); |
290 | 290 | |
291 | - $entityListStr = join(',' . PHP_EOL, $entityList); |
|
291 | + $entityListStr = join(','.PHP_EOL, $entityList); |
|
292 | 292 | $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont); |
293 | 293 | if ($this->paramList['supportFlag']['value']) { |
294 | 294 | $createParts = $this->makeCreateParts($metadetas); |
295 | 295 | $tableNameArr = array(); |
296 | 296 | foreach ($createParts as $tableName => $tableArr) { |
297 | - $tableNameArr[] = ' $this->createTable' . $tableName . '($schema);'; |
|
297 | + $tableNameArr[] = ' $this->createTable'.$tableName.'($schema);'; |
|
298 | 298 | } |
299 | 299 | $tableNameStr = join(PHP_EOL, $tableNameArr); |
300 | 300 | $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont); |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | { |
318 | 318 | $ret = array(); |
319 | 319 | foreach ($migrations as $metadata) { |
320 | - $ret[] = " '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($metadata->table['name'])) . "'"; |
|
320 | + $ret[] = " '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($metadata->table['name']))."'"; |
|
321 | 321 | } |
322 | 322 | return $ret; |
323 | 323 | } |
@@ -335,14 +335,14 @@ discard block |
||
335 | 335 | $nameFormated = $this->getShortClassName($metadata->table['name']); |
336 | 336 | $tmp = array(); |
337 | 337 | $tmp[] = ''; |
338 | - $tmp[] = ' public function createTable' . ucfirst($nameFormated) . '(Schema $schema)'; |
|
338 | + $tmp[] = ' public function createTable'.ucfirst($nameFormated).'(Schema $schema)'; |
|
339 | 339 | $tmp[] = ' {'; |
340 | - $tmp[] = ' $table = $schema->createTable(\'' . $metadata->table['name'] . '\');'; |
|
340 | + $tmp[] = ' $table = $schema->createTable(\''.$metadata->table['name'].'\');'; |
|
341 | 341 | $columns = $metadata->fieldMappings; |
342 | 342 | foreach ($columns as $column) { |
343 | 343 | |
344 | 344 | $typeName = $column['type']; |
345 | - $tmp[] = ' $table->addColumn(\'' . $column['columnName'] . '\', \'' . $typeName . '\', array('; |
|
345 | + $tmp[] = ' $table->addColumn(\''.$column['columnName'].'\', \''.$typeName.'\', array('; |
|
346 | 346 | $param = array(); |
347 | 347 | if (isset($column['nullable']) && $column['nullable']) { |
348 | 348 | $param['notnull'] = 'true'; |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | } |
352 | 352 | |
353 | 353 | foreach ($param as $parKey => $parVal) { |
354 | - $tmp[] = ' \'' . $parKey . '\' => ' . $parVal . ','; |
|
354 | + $tmp[] = ' \''.$parKey.'\' => '.$parVal.','; |
|
355 | 355 | } |
356 | 356 | $tmp[] = ' ));'; |
357 | 357 | } |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | { |
370 | 370 | $ret = array(); |
371 | 371 | foreach ($metadetas as $metadata) { |
372 | - $ret[] = ' $schema->dropTable(\'' . $metadata->table['name'] . '\');'; |
|
372 | + $ret[] = ' $schema->dropTable(\''.$metadata->table['name'].'\');'; |
|
373 | 373 | } |
374 | 374 | |
375 | 375 | return $ret; |
@@ -160,7 +160,7 @@ |
||
160 | 160 | $this->paramList = array( |
161 | 161 | 'pluginCode' => array( |
162 | 162 | 'no' => 1, |
163 | - 'label' => '[+]Plugin Code: ', |
|
163 | + 'label' => '[+]Plugin Code: ', |
|
164 | 164 | 'value' => null, |
165 | 165 | 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)', |
166 | 166 | 'validation' => array( |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $this->output->writeln('------------------------------------------------------'); |
44 | 44 | $this->output->writeln('---Plugin Generator for Entity'); |
45 | 45 | $this->output->writeln('---[*] You need to create table schema first.'); |
46 | - $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.'); |
|
46 | + $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.'); |
|
47 | 47 | $this->output->writeln('------------------------------------------------------'); |
48 | 48 | $this->output->writeln(''); |
49 | 49 | } |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | |
58 | 58 | $pluginCode = $this->paramList['pluginCode']['value']; |
59 | 59 | $tableList = $this->paramList['tableList']['value']; |
60 | - $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode; |
|
60 | + $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode; |
|
61 | 61 | |
62 | 62 | $dirList = array('Entity', 'Repository', 'Resource', 'Resource/doctrine', '/Resource/doctrine/migration'); |
63 | 63 | foreach ($dirList as $dirName) { |
64 | - $dirPath = $codePath . '/' . $dirName; |
|
64 | + $dirPath = $codePath.'/'.$dirName; |
|
65 | 65 | if (!is_dir($dirPath)) { |
66 | 66 | mkdir($dirPath); |
67 | 67 | } |
@@ -86,13 +86,13 @@ discard block |
||
86 | 86 | $migrationContent = $this->makeMigration($pluginCode, $migration); |
87 | 87 | $timeSt = date('YmdHis'); |
88 | 88 | $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent); |
89 | - $path = '/Resource/doctrine/migration/Version' . $timeSt . '.php'; |
|
89 | + $path = '/Resource/doctrine/migration/Version'.$timeSt.'.php'; |
|
90 | 90 | $entityInfoList[] = array($path => $migrationContent); |
91 | 91 | } |
92 | 92 | |
93 | 93 | foreach ($entityInfoList as $entityInfo) { |
94 | 94 | foreach ($entityInfo as $path => $body) { |
95 | - $fullPath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . $path; |
|
95 | + $fullPath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.$path; |
|
96 | 96 | file_put_contents($fullPath, $body); |
97 | 97 | if (is_file($fullPath)) { |
98 | 98 | $fsList['file'][$fullPath] = true; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $this->output->writeln(''); |
124 | 124 | $this->output->writeln(' this files and folders were created.'); |
125 | 125 | foreach ($dirFileOk as $path) { |
126 | - $this->output->writeln('<info> - ' . $path . '</info>'); |
|
126 | + $this->output->writeln('<info> - '.$path.'</info>'); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | } |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | $nameFormated = ucfirst($this->toCamelCase($tableName)); |
135 | 135 | |
136 | 136 | $ret = array(); |
137 | - $ret['/Entity/' . $nameFormated . '.php'] = $this->getSrc($pluginCode, $TableInfo); |
|
137 | + $ret['/Entity/'.$nameFormated.'.php'] = $this->getSrc($pluginCode, $TableInfo); |
|
138 | 138 | |
139 | - $ret['/Resource/doctrine/Plugin.' . $pluginCode . '.Entity.' . $nameFormated . '.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo); |
|
139 | + $ret['/Resource/doctrine/Plugin.'.$pluginCode.'.Entity.'.$nameFormated.'.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo); |
|
140 | 140 | |
141 | - $ret['/Repository/' . $nameFormated . 'Repository.php'] = $this->getRepo($pluginCode, $TableInfo); |
|
141 | + $ret['/Repository/'.$nameFormated.'Repository.php'] = $this->getRepo($pluginCode, $TableInfo); |
|
142 | 142 | |
143 | 143 | return $ret; |
144 | 144 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | private function getPluginList() |
202 | 202 | { |
203 | 203 | $ret = array(); |
204 | - $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin'; |
|
204 | + $pluginDir = $this->app['config']['root_dir'].'/app/Plugin'; |
|
205 | 205 | $iterator = new \DirectoryIterator($pluginDir); |
206 | 206 | foreach ($iterator as $fileInfo) { |
207 | 207 | if ($fileInfo->isDot()) { |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | private function toCamelCase($name) |
218 | 218 | { |
219 | - return lcfirst(implode('', array_map(function ($name) { |
|
219 | + return lcfirst(implode('', array_map(function($name) { |
|
220 | 220 | return ucfirst($name); |
221 | 221 | }, explode('_', $name)))); |
222 | 222 | } |
@@ -259,43 +259,43 @@ discard block |
||
259 | 259 | $varName = 'string'; |
260 | 260 | } |
261 | 261 | |
262 | - $tmpProp = '' . PHP_EOL; |
|
263 | - $tmpProp .= ' /**' . PHP_EOL; |
|
264 | - $tmpProp .= ' * @var ' . $varName . PHP_EOL; |
|
265 | - $tmpProp .= ' */' . PHP_EOL; |
|
266 | - $tmpProp .= ' private $' . $columnName . ';' . PHP_EOL; |
|
262 | + $tmpProp = ''.PHP_EOL; |
|
263 | + $tmpProp .= ' /**'.PHP_EOL; |
|
264 | + $tmpProp .= ' * @var '.$varName.PHP_EOL; |
|
265 | + $tmpProp .= ' */'.PHP_EOL; |
|
266 | + $tmpProp .= ' private $'.$columnName.';'.PHP_EOL; |
|
267 | 267 | |
268 | 268 | $prop[] = $tmpProp; |
269 | 269 | |
270 | - $tmpGetMethName = $this->toCamelCase('get_' . $columnName); |
|
270 | + $tmpGetMethName = $this->toCamelCase('get_'.$columnName); |
|
271 | 271 | |
272 | - $tmpGet = '' . PHP_EOL; |
|
273 | - $tmpGet .= ' /**' . PHP_EOL; |
|
274 | - $tmpGet .= ' * Get ' . $columnName . PHP_EOL; |
|
275 | - $tmpGet .= ' *' . PHP_EOL; |
|
276 | - $tmpGet .= ' * @return ' . $varName . PHP_EOL; |
|
277 | - $tmpGet .= ' */' . PHP_EOL; |
|
278 | - $tmpGet .= ' public function ' . $tmpGetMethName . '()' . PHP_EOL; |
|
279 | - $tmpGet .= ' {' . PHP_EOL; |
|
280 | - $tmpGet .= ' return $this->' . $columnName . ';' . PHP_EOL; |
|
281 | - $tmpGet .= ' }' . PHP_EOL; |
|
272 | + $tmpGet = ''.PHP_EOL; |
|
273 | + $tmpGet .= ' /**'.PHP_EOL; |
|
274 | + $tmpGet .= ' * Get '.$columnName.PHP_EOL; |
|
275 | + $tmpGet .= ' *'.PHP_EOL; |
|
276 | + $tmpGet .= ' * @return '.$varName.PHP_EOL; |
|
277 | + $tmpGet .= ' */'.PHP_EOL; |
|
278 | + $tmpGet .= ' public function '.$tmpGetMethName.'()'.PHP_EOL; |
|
279 | + $tmpGet .= ' {'.PHP_EOL; |
|
280 | + $tmpGet .= ' return $this->'.$columnName.';'.PHP_EOL; |
|
281 | + $tmpGet .= ' }'.PHP_EOL; |
|
282 | 282 | |
283 | 283 | $getMethods[] = $tmpGet; |
284 | 284 | |
285 | - $tmpSetMethName = $this->toCamelCase('set_' . $columnName); |
|
286 | - |
|
287 | - $tmpSet = '' . PHP_EOL; |
|
288 | - $tmpSet .= ' /**' . PHP_EOL; |
|
289 | - $tmpSet .= ' * Set ' . $columnName . PHP_EOL; |
|
290 | - $tmpSet .= ' *' . PHP_EOL; |
|
291 | - $tmpSet .= ' * @param ' . $varName . ' $' . $columnName . PHP_EOL; |
|
292 | - $tmpSet .= ' * @return ' . $nameFormated . PHP_EOL; |
|
293 | - $tmpSet .= ' */' . PHP_EOL; |
|
294 | - $tmpSet .= ' public function ' . $tmpSetMethName . '( $' . $columnName . ')' . PHP_EOL; |
|
295 | - $tmpSet .= ' {' . PHP_EOL; |
|
296 | - $tmpSet .= ' $this->' . $columnName . ' = $' . $columnName . ';' . PHP_EOL; |
|
297 | - $tmpSet .= ' return $this;' . PHP_EOL; |
|
298 | - $tmpSet .= ' }' . PHP_EOL; |
|
285 | + $tmpSetMethName = $this->toCamelCase('set_'.$columnName); |
|
286 | + |
|
287 | + $tmpSet = ''.PHP_EOL; |
|
288 | + $tmpSet .= ' /**'.PHP_EOL; |
|
289 | + $tmpSet .= ' * Set '.$columnName.PHP_EOL; |
|
290 | + $tmpSet .= ' *'.PHP_EOL; |
|
291 | + $tmpSet .= ' * @param '.$varName.' $'.$columnName.PHP_EOL; |
|
292 | + $tmpSet .= ' * @return '.$nameFormated.PHP_EOL; |
|
293 | + $tmpSet .= ' */'.PHP_EOL; |
|
294 | + $tmpSet .= ' public function '.$tmpSetMethName.'( $'.$columnName.')'.PHP_EOL; |
|
295 | + $tmpSet .= ' {'.PHP_EOL; |
|
296 | + $tmpSet .= ' $this->'.$columnName.' = $'.$columnName.';'.PHP_EOL; |
|
297 | + $tmpSet .= ' return $this;'.PHP_EOL; |
|
298 | + $tmpSet .= ' }'.PHP_EOL; |
|
299 | 299 | $setMethods[] = $tmpSet; |
300 | 300 | } |
301 | 301 | $ret .= PHP_EOL; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $ret .= PHP_EOL; |
306 | 306 | $ret .= join(PHP_EOL, $setMethods); |
307 | 307 | $ret .= PHP_EOL; |
308 | - $ret .= '}' . PHP_EOL; |
|
308 | + $ret .= '}'.PHP_EOL; |
|
309 | 309 | |
310 | 310 | |
311 | 311 | return $ret; |
@@ -316,16 +316,16 @@ discard block |
||
316 | 316 | $line = array(); |
317 | 317 | $line[] = '<?php'; |
318 | 318 | $line[] = '/*'; |
319 | - $line[] = ' * This file is part of ' . $pluginCode; |
|
319 | + $line[] = ' * This file is part of '.$pluginCode; |
|
320 | 320 | $line[] = ' *'; |
321 | 321 | $line[] = ' *'; |
322 | 322 | $line[] = ' * For the full copyright and license information, please view the LICENSE'; |
323 | 323 | $line[] = ' * file that was distributed with this source code.'; |
324 | 324 | $line[] = ' */'; |
325 | 325 | $line[] = ''; |
326 | - $line[] = 'namespace Plugin\\' . $pluginCode . '\Entity;'; |
|
326 | + $line[] = 'namespace Plugin\\'.$pluginCode.'\Entity;'; |
|
327 | 327 | $line[] = ''; |
328 | - $line[] = 'class ' . ucfirst($nameFormated) . ' extends \Eccube\Entity\AbstractEntity'; |
|
328 | + $line[] = 'class '.ucfirst($nameFormated).' extends \Eccube\Entity\AbstractEntity'; |
|
329 | 329 | $line[] = '{'; |
330 | 330 | $line[] = ' /**'; |
331 | 331 | $line[] = ' * @return string'; |
@@ -409,10 +409,10 @@ discard block |
||
409 | 409 | } |
410 | 410 | |
411 | 411 | $yml = array( |
412 | - 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($nameFormated) => array( |
|
412 | + 'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($nameFormated) => array( |
|
413 | 413 | 'type' => 'entity', |
414 | 414 | 'table' => $TableInfo->getName(), |
415 | - 'repositoryClass' => 'Plugin\\' . $pluginCode . '\Repository\\' . ucfirst($nameFormated) . 'Repository', |
|
415 | + 'repositoryClass' => 'Plugin\\'.$pluginCode.'\Repository\\'.ucfirst($nameFormated).'Repository', |
|
416 | 416 | 'id' => array( |
417 | 417 | 'id' => $id |
418 | 418 | ), |
@@ -430,24 +430,24 @@ discard block |
||
430 | 430 | $line = array(); |
431 | 431 | $line[] = '<?php'; |
432 | 432 | $line[] = '/*'; |
433 | - $line[] = ' * This file is part of ' . $pluginCode; |
|
433 | + $line[] = ' * This file is part of '.$pluginCode; |
|
434 | 434 | $line[] = ' *'; |
435 | 435 | $line[] = ' *'; |
436 | 436 | $line[] = ' * For the full copyright and license information, please view the LICENSE'; |
437 | 437 | $line[] = ' * file that was distributed with this source code.'; |
438 | 438 | $line[] = ' */'; |
439 | 439 | $line[] = ''; |
440 | - $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;'; |
|
440 | + $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;'; |
|
441 | 441 | $line[] = ''; |
442 | 442 | $line[] = 'use Doctrine\ORM\EntityRepository;'; |
443 | 443 | $line[] = ''; |
444 | 444 | $line[] = '/**'; |
445 | - $line[] = ' * ' . ucfirst($nameFormated); |
|
445 | + $line[] = ' * '.ucfirst($nameFormated); |
|
446 | 446 | $line[] = ' *'; |
447 | 447 | $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom'; |
448 | 448 | $line[] = ' * repository methods below.'; |
449 | 449 | $line[] = ' */'; |
450 | - $line[] = 'class ' . ucfirst($nameFormated) . 'Repository extends EntityRepository'; |
|
450 | + $line[] = 'class '.ucfirst($nameFormated).'Repository extends EntityRepository'; |
|
451 | 451 | $line[] = '{'; |
452 | 452 | $line[] = ''; |
453 | 453 | $line[] = '}'; |
@@ -458,21 +458,21 @@ discard block |
||
458 | 458 | private function makeMigration($pluginCode, $migration) |
459 | 459 | { |
460 | 460 | if ($this->paramList['supportFlag']['value']) { |
461 | - $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php'); |
|
461 | + $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php'); |
|
462 | 462 | } else { |
463 | - $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php'); |
|
463 | + $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php'); |
|
464 | 464 | } |
465 | 465 | |
466 | 466 | $entityList = $this->createEntityList($pluginCode, $migration); |
467 | 467 | |
468 | - $entityListStr = join(',' . PHP_EOL, $entityList); |
|
468 | + $entityListStr = join(','.PHP_EOL, $entityList); |
|
469 | 469 | $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont); |
470 | 470 | |
471 | 471 | if ($this->paramList['supportFlag']['value']) { |
472 | 472 | $createParts = $this->makeCreateParts($migration); |
473 | 473 | $tableNameArr = array(); |
474 | 474 | foreach ($createParts as $tableName => $tableArr) { |
475 | - $tableNameArr[] = ' $this->createTable' . $tableName . '($schema);'; |
|
475 | + $tableNameArr[] = ' $this->createTable'.$tableName.'($schema);'; |
|
476 | 476 | } |
477 | 477 | $tableNameStr = join(PHP_EOL, $tableNameArr); |
478 | 478 | $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont); |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | { |
496 | 496 | $ret = array(); |
497 | 497 | foreach ($migration as $TableInfo) { |
498 | - $ret[] = " '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($TableInfo->getName())) . "'"; |
|
498 | + $ret[] = " '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($TableInfo->getName()))."'"; |
|
499 | 499 | } |
500 | 500 | return $ret; |
501 | 501 | } |
@@ -512,14 +512,14 @@ discard block |
||
512 | 512 | $nameFormated = $this->getShortClassName($TableInfo->getName()); |
513 | 513 | $tmp = array(); |
514 | 514 | $tmp[] = PHP_EOL; |
515 | - $tmp[] = ' public function createTable' . ucfirst($nameFormated) . '(Schema $schema)'; |
|
515 | + $tmp[] = ' public function createTable'.ucfirst($nameFormated).'(Schema $schema)'; |
|
516 | 516 | $tmp[] = ' {'; |
517 | - $tmp[] = ' $table = $schema->createTable(\'' . $TableInfo->getName() . '\');'; |
|
517 | + $tmp[] = ' $table = $schema->createTable(\''.$TableInfo->getName().'\');'; |
|
518 | 518 | $columns = $TableInfo->getColumns(); |
519 | 519 | foreach ($columns as $column) { |
520 | 520 | |
521 | 521 | $typeName = $column->getType()->getName(); |
522 | - $tmp[] = ' $table->addColumn(\'' . $column->getName() . '\', \'' . $typeName . '\', array('; |
|
522 | + $tmp[] = ' $table->addColumn(\''.$column->getName().'\', \''.$typeName.'\', array('; |
|
523 | 523 | $param = array(); |
524 | 524 | if ($column->getNotNull()) { |
525 | 525 | $param['notnull'] = 'true'; |
@@ -530,16 +530,16 @@ discard block |
||
530 | 530 | $param['unsigned'] = 'true'; |
531 | 531 | } |
532 | 532 | if ($column->getDefault()) { |
533 | - $param['default'] = '\'' . $column->getDefault() . '\''; |
|
533 | + $param['default'] = '\''.$column->getDefault().'\''; |
|
534 | 534 | } |
535 | 535 | if ($column->getAutoincrement()) { |
536 | 536 | $param['autoincrement'] = 'true'; |
537 | 537 | } |
538 | 538 | if ($column->getComment()) { |
539 | - $param['comment'] = '\'' . str_replace('\'', '\\\'', $column->getComment()) . '\''; |
|
539 | + $param['comment'] = '\''.str_replace('\'', '\\\'', $column->getComment()).'\''; |
|
540 | 540 | } |
541 | 541 | if ($column->getLength()) { |
542 | - $param['length'] = '\'' . $column->getLength() . '\''; |
|
542 | + $param['length'] = '\''.$column->getLength().'\''; |
|
543 | 543 | } |
544 | 544 | |
545 | 545 | if ($typeName == 'decimal') { |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | $param['scale'] = $column->getScale(); |
548 | 548 | } |
549 | 549 | foreach ($param as $parKey => $parVal) { |
550 | - $tmp[] = ' \'' . $parKey . '\' => ' . $parVal . ','; |
|
550 | + $tmp[] = ' \''.$parKey.'\' => '.$parVal.','; |
|
551 | 551 | } |
552 | 552 | $tmp[] = ' ));'; |
553 | 553 | } |
@@ -557,20 +557,20 @@ discard block |
||
557 | 557 | if ($index->isPrimary()) { |
558 | 558 | $tmpCol = $index->getColumns(); |
559 | 559 | foreach ($tmpCol as $colName) { |
560 | - $tmp[] = ' $table->setPrimaryKey(array(\'' . $colName . '\'));'; |
|
560 | + $tmp[] = ' $table->setPrimaryKey(array(\''.$colName.'\'));'; |
|
561 | 561 | break; |
562 | 562 | } |
563 | 563 | } else { |
564 | 564 | $tmp[] = ' $columnNames = array();'; |
565 | 565 | foreach ($index->getColumns() as $IdentName) { |
566 | - $tmp[] = ' $columnNames[] = \'' . $IdentName . '\';'; |
|
566 | + $tmp[] = ' $columnNames[] = \''.$IdentName.'\';'; |
|
567 | 567 | } |
568 | - $tmp[] = ' $indexName = \'' . $index->getName() . '\';'; |
|
569 | - $tmp[] = ' $options = ' . var_export($index->getOptions(), true) . ';'; |
|
568 | + $tmp[] = ' $indexName = \''.$index->getName().'\';'; |
|
569 | + $tmp[] = ' $options = '.var_export($index->getOptions(), true).';'; |
|
570 | 570 | if ($index->isUnique()) { |
571 | 571 | $tmp[] = ' $table->addUniqueIndex($columnNames, $indexName, $options);'; |
572 | 572 | } else { |
573 | - $tmp[] = ' $flags = ' . var_export($index->getFlags(), true) . ';'; |
|
573 | + $tmp[] = ' $flags = '.var_export($index->getFlags(), true).';'; |
|
574 | 574 | $tmp[] = ' $table->addIndex($columnNames, $indexName,$flags, $options);'; |
575 | 575 | } |
576 | 576 | } |
@@ -587,7 +587,7 @@ discard block |
||
587 | 587 | { |
588 | 588 | $ret = array(); |
589 | 589 | foreach ($migration as $TableInfo) { |
590 | - $ret[] = ' $schema->dropTable(\'' . $TableInfo->getName() . '\');'; |
|
590 | + $ret[] = ' $schema->dropTable(\''.$TableInfo->getName().'\');'; |
|
591 | 591 | } |
592 | 592 | |
593 | 593 | return $ret; |