@@ -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 = ' '; |
@@ -792,6 +792,7 @@ |
||
| 792 | 792 | * ProductCategory作成 |
| 793 | 793 | * @param \Eccube\Entity\Product $Product |
| 794 | 794 | * @param \Eccube\Entity\Category $Category |
| 795 | + * @param integer $count |
|
| 795 | 796 | * @return \Eccube\Entity\ProductCategory |
| 796 | 797 | */ |
| 797 | 798 | private function createProductCategory($Product, $Category, $count) |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | $extension = $image->getClientOriginalExtension(); |
| 321 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
| 321 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
| 322 | 322 | $image->move($this->appConfig['image_temp_realdir'], $filename); |
| 323 | 323 | $files[] = $filename; |
| 324 | 324 | } |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | $Categories = $form->get('Category')->getData(); |
| 480 | 480 | $categoriesIdList = array(); |
| 481 | 481 | foreach ($Categories as $Category) { |
| 482 | - foreach($Category->getPath() as $ParentCategory){ |
|
| 483 | - if (!isset($categoriesIdList[$ParentCategory->getId()])){ |
|
| 482 | + foreach ($Category->getPath() as $ParentCategory) { |
|
| 483 | + if (!isset($categoriesIdList[$ParentCategory->getId()])) { |
|
| 484 | 484 | $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count); |
| 485 | 485 | $this->entityManager->persist($ProductCategory); |
| 486 | 486 | $count++; |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $categoriesIdList[$ParentCategory->getId()] = true; |
| 490 | 490 | } |
| 491 | 491 | } |
| 492 | - if (!isset($categoriesIdList[$Category->getId()])){ |
|
| 492 | + if (!isset($categoriesIdList[$Category->getId()])) { |
|
| 493 | 493 | $ProductCategory = $this->createProductCategory($Product, $Category, $count); |
| 494 | 494 | $this->entityManager->persist($ProductCategory); |
| 495 | 495 | $count++; |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | $this->entityManager->persist($ProductImage); |
| 512 | 512 | |
| 513 | 513 | // 移動 |
| 514 | - $file = new File($this->appConfig['image_temp_realdir'] . '/' . $add_image); |
|
| 514 | + $file = new File($this->appConfig['image_temp_realdir'].'/'.$add_image); |
|
| 515 | 515 | $file->move($this->appConfig['image_save_realdir']); |
| 516 | 516 | } |
| 517 | 517 | |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | |
| 532 | 532 | // 削除 |
| 533 | 533 | $fs = new Filesystem(); |
| 534 | - $fs->remove($this->appConfig['image_save_realdir'] . '/' . $delete_image); |
|
| 534 | + $fs->remove($this->appConfig['image_save_realdir'].'/'.$delete_image); |
|
| 535 | 535 | } |
| 536 | 536 | $this->entityManager->persist($Product); |
| 537 | 537 | $this->entityManager->flush(); |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | foreach ($deleteImages as $deleteImage) { |
| 667 | 667 | try { |
| 668 | 668 | $fs = new Filesystem(); |
| 669 | - $fs->remove($this->appConfig['image_save_realdir'] . '/' . $deleteImage); |
|
| 669 | + $fs->remove($this->appConfig['image_save_realdir'].'/'.$deleteImage); |
|
| 670 | 670 | } catch (\Exception $e) { |
| 671 | 671 | // エラーが発生しても無視する |
| 672 | 672 | } |
@@ -741,10 +741,10 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | // 画像ファイルを新規作成 |
| 743 | 743 | $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION); |
| 744 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
| 744 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
| 745 | 745 | try { |
| 746 | 746 | $fs = new Filesystem(); |
| 747 | - $fs->copy($this->appConfig['image_save_realdir'] . '/' . $Image->getFileName(), $this->appConfig['image_save_realdir'] . '/' . $filename); |
|
| 747 | + $fs->copy($this->appConfig['image_save_realdir'].'/'.$Image->getFileName(), $this->appConfig['image_save_realdir'].'/'.$filename); |
|
| 748 | 748 | } catch (\Exception $e) { |
| 749 | 749 | // エラーが発生しても無視する |
| 750 | 750 | } |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | $em->getConfiguration()->setSQLLogger(null); |
| 825 | 825 | |
| 826 | 826 | $response = new StreamedResponse(); |
| 827 | - $response->setCallback(function () use ($app, $request) { |
|
| 827 | + $response->setCallback(function() use ($app, $request) { |
|
| 828 | 828 | |
| 829 | 829 | // CSV種別を元に初期化. |
| 830 | 830 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT); |
@@ -864,7 +864,7 @@ discard block |
||
| 864 | 864 | // データ行の出力. |
| 865 | 865 | $this->csvExportService->setExportQueryBuilder($qb); |
| 866 | 866 | |
| 867 | - $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($app, $request) { |
|
| 867 | + $this->csvExportService->exportData(function($entity, CsvExportService $csvService) use ($app, $request) { |
|
| 868 | 868 | $Csvs = $csvService->getCsvs(); |
| 869 | 869 | |
| 870 | 870 | /** @var $Product \Eccube\Entity\Product */ |
@@ -907,9 +907,9 @@ discard block |
||
| 907 | 907 | }); |
| 908 | 908 | |
| 909 | 909 | $now = new \DateTime(); |
| 910 | - $filename = 'product_' . $now->format('YmdHis') . '.csv'; |
|
| 910 | + $filename = 'product_'.$now->format('YmdHis').'.csv'; |
|
| 911 | 911 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 912 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 912 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 913 | 913 | $response->send(); |
| 914 | 914 | |
| 915 | 915 | log_info('商品CSV出力ファイル名', array($filename)); |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | if (is_writable($logDir)) { |
| 41 | 41 | if (file_exists($installLog) && !is_writable($installLog)) { |
| 42 | - die($installLog . ' の書込権限を変更して下さい。'); |
|
| 42 | + die($installLog.' の書込権限を変更して下さい。'); |
|
| 43 | 43 | } |
| 44 | 44 | // install step2 でログディレクトリに書き込み権限が付与されればログ出力を開始する. |
| 45 | 45 | $app->register(new \Silex\Provider\MonologServiceProvider(), array( |
@@ -164,7 +164,7 @@ |
||
| 164 | 164 | $cmf->setEntityManager($em); |
| 165 | 165 | $metadatas = $cmf->getAllMetadata(); |
| 166 | 166 | |
| 167 | - $filters = array_map(function ($value) { |
|
| 167 | + $filters = array_map(function($value) { |
|
| 168 | 168 | return ucfirst(Inflector::camelize(str_replace('plg_', '', $value))); |
| 169 | 169 | }, $tableList); |
| 170 | 170 | $metadatas = MetadataFilter::filter($metadatas, $filters); |
@@ -964,7 +964,7 @@ |
||
| 964 | 964 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
| 965 | 965 | * 備考 : app['debug']がtrueの際は処理を行わない |
| 966 | 966 | * |
| 967 | - * @return boolean true |
|
| 967 | + * @return null|boolean true |
|
| 968 | 968 | * |
| 969 | 969 | */ |
| 970 | 970 | protected function checkDatabaseConnection() |
@@ -660,13 +660,13 @@ |
||
| 660 | 660 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
| 661 | 661 | $ormMappings = array(); |
| 662 | 662 | $ormMappings[] = array( |
| 663 | - 'type' => 'annotation', |
|
| 664 | - 'namespace' => 'Eccube\Entity', |
|
| 665 | - 'path' => array( |
|
| 666 | - __DIR__.'/Entity' |
|
| 667 | - ), |
|
| 668 | - 'use_simple_annotation_reader' => false, |
|
| 669 | - ); |
|
| 663 | + 'type' => 'annotation', |
|
| 664 | + 'namespace' => 'Eccube\Entity', |
|
| 665 | + 'path' => array( |
|
| 666 | + __DIR__.'/Entity' |
|
| 667 | + ), |
|
| 668 | + 'use_simple_annotation_reader' => false, |
|
| 669 | + ); |
|
| 670 | 670 | |
| 671 | 671 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) { |
| 672 | 672 | |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | $this->register(new MobileDetectServiceProvider()); |
| 237 | 237 | $this->register(new TwigLintServiceProvider()); |
| 238 | 238 | |
| 239 | - $this->error(function (\Exception $e, Request $request, $code) { |
|
| 239 | + $this->error(function(\Exception $e, Request $request, $code) { |
|
| 240 | 240 | if ($this['debug']) { |
| 241 | 241 | return; |
| 242 | 242 | } |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) { |
| 303 | 303 | return array_map(function($pluginDir) use ($dirName) { |
| 304 | - return $pluginDir . '/' . $dirName; |
|
| 304 | + return $pluginDir.'/'.$dirName; |
|
| 305 | 305 | }, $enabledPluginDirs); |
| 306 | 306 | }); |
| 307 | 307 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | return $router; |
| 379 | 379 | }); |
| 380 | 380 | |
| 381 | - $this['eccube.router.origin'] = function ($app) { |
|
| 381 | + $this['eccube.router.origin'] = function($app) { |
|
| 382 | 382 | $resource = __DIR__.'/Controller'; |
| 383 | 383 | $cachePrefix = 'Origin'; |
| 384 | 384 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | $this['eccube.routers.plugin'] = []; |
| 389 | 389 | |
| 390 | 390 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Controller')) { |
| 391 | - $this['eccube.router.extend'] = function ($app) { |
|
| 391 | + $this['eccube.router.extend'] = function($app) { |
|
| 392 | 392 | $resource = $app['config']['vendor_dir'].'/Controller'; |
| 393 | 393 | $cachePrefix = 'Extend'; |
| 394 | 394 | |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | return $router; |
| 398 | 398 | }; |
| 399 | 399 | } |
| 400 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
| 400 | + $this->extend('request_matcher', function($matcher, $app) { |
|
| 401 | 401 | $matchers = []; |
| 402 | 402 | if (isset($app['eccube.router.extend'])) { |
| 403 | 403 | $matchers[] = $app['eccube.router.extend']; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | return new ChainUrlMatcher($matchers, $app['request_context']); |
| 412 | 412 | }); |
| 413 | 413 | |
| 414 | - $this->extend('url_generator', function ($generator, $app) { |
|
| 414 | + $this->extend('url_generator', function($generator, $app) { |
|
| 415 | 415 | $generators = []; |
| 416 | 416 | if (isset($app['eccube.router.extend'])) { |
| 417 | 417 | $generators[] = $app['eccube.router.extend']; |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | }); |
| 427 | 427 | |
| 428 | 428 | // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため) |
| 429 | - $this->extend('routes', function ($routes, $app) { |
|
| 429 | + $this->extend('routes', function($routes, $app) { |
|
| 430 | 430 | if (isset($app['eccube.router.extend'])) { |
| 431 | 431 | $routes->addCollection($app['eccube.router.extend']->getRouteCollection()); |
| 432 | 432 | } |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
| 462 | 462 | 'locale_fallbacks' => [$this['config']['locale'], 'en'], |
| 463 | 463 | )); |
| 464 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
| 464 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
| 465 | 465 | $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader()); |
| 466 | 466 | |
| 467 | 467 | $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php'; |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
| 505 | 505 | 'twig.form.templates' => array('Form/form_div_layout.twig'), |
| 506 | 506 | )); |
| 507 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
| 507 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
| 508 | 508 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
| 509 | 509 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
| 510 | 510 | |
@@ -522,7 +522,7 @@ discard block |
||
| 522 | 522 | return $runtimes; |
| 523 | 523 | }); |
| 524 | 524 | |
| 525 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
| 525 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
| 526 | 526 | $app['admin'] = $app['front'] = false; |
| 527 | 527 | $pathinfo = rawurldecode($request->getPathInfo()); |
| 528 | 528 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | } |
| 539 | 539 | $paths[] = $app['config']['template_admin_realdir']; |
| 540 | 540 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 541 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 541 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 542 | 542 | } else { |
| 543 | 543 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
| 544 | 544 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | } |
| 554 | 554 | $paths[] = $app['config']['template_default_realdir']; |
| 555 | 555 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 556 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 556 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 557 | 557 | } |
| 558 | 558 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
| 559 | 559 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | }, self::EARLY_EVENT); |
| 572 | 572 | |
| 573 | 573 | // twigのグローバル変数を定義. |
| 574 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 574 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 575 | 575 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
| 576 | 576 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
| 577 | 577 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
| 657 | 657 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
| 658 | 658 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
| 659 | - \Swift::init(function () { |
|
| 659 | + \Swift::init(function() { |
|
| 660 | 660 | \Swift_DependencyContainer::getInstance() |
| 661 | 661 | ->register('mime.qpheaderencoder') |
| 662 | 662 | ->asAliasOf('mime.base64headerencoder'); |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
| 692 | 692 | |
| 693 | 693 | $app = $this; |
| 694 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
| 694 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
| 695 | 695 | $initSubscriber = new InitSubscriber($app); |
| 696 | 696 | $evm->addEventSubscriber($initSubscriber); |
| 697 | 697 | |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | |
| 809 | 809 | $this->extend( |
| 810 | 810 | 'orm.em.config', |
| 811 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 811 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 812 | 812 | |
| 813 | 813 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
| 814 | 814 | $chain = $config->getMetadataDriverImpl(); |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | } |
| 831 | 831 | ); |
| 832 | 832 | |
| 833 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 833 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 834 | 834 | // save |
| 835 | 835 | $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app); |
| 836 | 836 | $em->getEventManager()->addEventSubscriber($saveEventSubscriber); |
@@ -855,7 +855,7 @@ discard block |
||
| 855 | 855 | // second level cacheの設定. |
| 856 | 856 | $this->extend( |
| 857 | 857 | 'orm.em.config', |
| 858 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 858 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 859 | 859 | $config->setSecondLevelCacheEnabled(); |
| 860 | 860 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
| 861 | 861 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -944,31 +944,31 @@ discard block |
||
| 944 | 944 | array('^/mypage', 'ROLE_USER', $channel), |
| 945 | 945 | ); |
| 946 | 946 | |
| 947 | - $this['eccube.password_encoder'] = function ($app) { |
|
| 947 | + $this['eccube.password_encoder'] = function($app) { |
|
| 948 | 948 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
| 949 | 949 | }; |
| 950 | - $this['security.encoder_factory'] = function ($app) { |
|
| 950 | + $this['security.encoder_factory'] = function($app) { |
|
| 951 | 951 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
| 952 | 952 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
| 953 | 953 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
| 954 | 954 | )); |
| 955 | 955 | }; |
| 956 | - $this['eccube.event_listner.security'] = function ($app) { |
|
| 956 | + $this['eccube.event_listner.security'] = function($app) { |
|
| 957 | 957 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
| 958 | 958 | }; |
| 959 | 959 | |
| 960 | 960 | // Voterの設定 |
| 961 | - $this['authority_voter'] = function ($app) { |
|
| 961 | + $this['authority_voter'] = function($app) { |
|
| 962 | 962 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
| 963 | 963 | }; |
| 964 | 964 | |
| 965 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
| 965 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
| 966 | 966 | $voters[] = $app['authority_voter']; |
| 967 | 967 | |
| 968 | 968 | return $voters; |
| 969 | 969 | }); |
| 970 | 970 | |
| 971 | - $this['security.access_manager'] = function ($app) { |
|
| 971 | + $this['security.access_manager'] = function($app) { |
|
| 972 | 972 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
| 973 | 973 | }; |
| 974 | 974 | |
@@ -983,7 +983,7 @@ discard block |
||
| 983 | 983 | // ロードバランサやプロキシの設定をする |
| 984 | 984 | $config = $this['config']; |
| 985 | 985 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
| 986 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
| 986 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
| 987 | 987 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
| 988 | 988 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
| 989 | 989 | }, self::EARLY_EVENT); |
@@ -1002,7 +1002,7 @@ discard block |
||
| 1002 | 1002 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
| 1003 | 1003 | |
| 1004 | 1004 | // TODO Acme\ServiceProvider の初期化はここで OK? |
| 1005 | - if (array_key_exists('service',$this['config'])) { |
|
| 1005 | + if (array_key_exists('service', $this['config'])) { |
|
| 1006 | 1006 | foreach ($this['config']['service'] as $service) { |
| 1007 | 1007 | $this->register(new $service); |
| 1008 | 1008 | } |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | $app = $this; |
| 1125 | 1125 | |
| 1126 | 1126 | // Response Event(http cache対応、event実行は一番遅く設定) |
| 1127 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1127 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1128 | 1128 | |
| 1129 | 1129 | if (!$event->isMasterRequest()) { |
| 1130 | 1130 | return; |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | $webProcessor = new WebProcessor(); |
| 112 | 112 | $uidProcessor = new UidProcessor(8); |
| 113 | 113 | |
| 114 | - $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) { |
|
| 114 | + $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) { |
|
| 115 | 115 | // ログフォーマットに出力する値を独自に設定 |
| 116 | 116 | |
| 117 | 117 | $record['level_name'] = sprintf("%-5s", $record['level_name']); |