chihiro-adachi / ec-cube

src/Eccube/Controller/Admin/Product/ProductController.php

Spacing +14 added lines, -14 removed lines

@@ -202,7 +202,7 @@ 
                     }
 
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -278,7 +278,7 @@ 
         $form = $builder->getForm();
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -364,8 +364,8 @@ 
                 $Categories = $form->get('Category')->getData();
                 $categoriesIdList = array();
                 foreach ($Categories as $Category) {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
                             $app['orm.em']->persist($ProductCategory);
                             $count++;
@@ -374,7 +374,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
                         $app['orm.em']->persist($ProductCategory);
                         $count++;
@@ -396,7 +396,7 @@ 
                     $app['orm.em']->persist($ProductImage);
 
                     // 移動
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
                     $file->move($app['config']['image_save_realdir']);
                 }
 
@@ -416,7 +416,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
                 }
                 $app['orm.em']->persist($Product);
                 $app['orm.em']->flush();
@@ -574,7 +574,7 @@ 
                 foreach ($deleteImages as $deleteImage) {
                     try {
                         $fs = new Filesystem();
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -644,10 +644,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -722,7 +722,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -746,7 +746,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -778,9 +778,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
         $response->send();
 
         log_info('商品CSV出力ファイル名', array($filename));

src/Eccube/ServiceProvider/LogServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -20,17 +20,17 @@ 
         $app->register(new \Silex\Provider\MonologServiceProvider());
 
         // Log
-        $app['eccube.logger'] = $app->share(function ($app) {
+        $app['eccube.logger'] = $app->share(function($app) {
             return new Logger($app);
         });
 
         // ヘルパー作成
-        $app['eccube.monolog.helper'] = $app->share(function ($app) {
+        $app['eccube.monolog.helper'] = $app->share(function($app) {
             return new LogHelper($app);
         });
 
         // ログクラス作成ファクトリー
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
 
             $log = new $app['monolog.logger.class']($channelValues['name']);
 
@@ -45,7 +45,7 @@ 
         // monologの設定は除外
         unset($channels['monolog']);
         foreach ($channels as $channel => $channelValues) {
-            $app['monolog.logger.'.$channel] = $app->share(function ($app) use ($channelValues) {
+            $app['monolog.logger.'.$channel] = $app->share(function($app) use ($channelValues) {
                 return $app['eccube.monolog.factory']($channelValues);
             });
         }
@@ -53,15 +53,15 @@ 
         // MonologServiceProviderで定義されているmonolog.handlerの置換
         $channelValues = $app['config']['log']['channel']['monolog'];
         $app['monolog.name'] = $channelValues['name'];
-        $app['monolog.handler'] = $app->share(function ($app) use ($channelValues) {
+        $app['monolog.handler'] = $app->share(function($app) use ($channelValues) {
             return $app['eccube.monolog.helper']->getHandler($channelValues);
         });
 
-        $app['eccube.monolog.listener'] = $app->share(function () use ($app) {
+        $app['eccube.monolog.listener'] = $app->share(function() use ($app) {
             return new LogListener($app['eccube.logger']);
         });
 
-        $app['listener.requestdump'] = $app->share(function ($app) {
+        $app['listener.requestdump'] = $app->share(function($app) {
             return new \Eccube\EventListener\RequestDumpListener($app);
         });
     }

src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php

Spacing +3 added lines, -3 removed lines

@@ -121,7 +121,7 @@ 
         if ($this->count === null) {
             try {
                 $this->count = array_sum(array_map('current', $this->getCountQuery()->getScalarResult()));
-            } catch(NoResultException $e) {
+            } catch (NoResultException $e) {
                 $this->count = 0;
             }
         }
@@ -241,7 +241,7 @@ 
         /* @var $countQuery Query */
         $countQuery = $this->cloneQuery($this->query);
 
-        if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
+        if (!$countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
             $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
         }
 
@@ -267,7 +267,7 @@ 
         foreach ($parameters as $key => $parameter) {
             $parameterName = $parameter->getName();
 
-            if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
+            if (!(isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
                 unset($parameters[$key]);
             }
         }

src/Eccube/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
             $this->orderByClause
-        )) . ')';
+        )).')';
     }
 
     /**

src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php

Spacing +7 added lines, -7 removed lines

@@ -209,8 +209,8 @@ 
         $sqlIdentifier = $this->getSQLIdentifier($AST);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
         }
 
         // Build the counter query
@@ -221,7 +221,7 @@ 
         );
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -368,7 +368,7 @@ 
     {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
         // statement
-        if (! $orderByClause instanceof OrderByClause) {
+        if (!$orderByClause instanceof OrderByClause) {
             return $sql;
         }
 
@@ -420,7 +420,7 @@ 
             = array();
 
         // Generate DQL alias -> SQL table alias mapping
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
         }
@@ -429,7 +429,7 @@ 
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
 
         // Generate search patterns for each field's path expression in the order by clause
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
 
@@ -465,7 +465,7 @@ 
             $replacements[] = $fieldAlias;
         }
 
-        foreach($orderByClause->orderByItems as $orderByItem) {
+        foreach ($orderByClause->orderByItems as $orderByItem) {
             // Walk order by item to get string representation of it
             $orderByItemString = $this->walkOrderByItem($orderByItem);
 

src/Eccube/Doctrine/ORM/Tools/Pagination/CountWalker.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         }
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
             $identifierFieldName
         );
         $pathExpression->type = $pathType;

src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
         );
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
             $rootAlias,
             $identifier
         );
@@ -104,13 +104,13 @@ 
 
         if (isset($AST->orderByClause)) {
             foreach ($AST->orderByClause->orderByItems as $item) {
-                if ( ! $item->expression instanceof PathExpression) {
+                if (!$item->expression instanceof PathExpression) {
                     continue;
                 }
                 
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
                     $this->createSelectExpressionItem($item->expression),
-                    '_dctrn_ord' . $this->_aliasCounter++
+                    '_dctrn_ord'.$this->_aliasCounter++
                 );
             }
         }
@@ -145,7 +145,7 @@ 
                     && isset($queryComponents[$expression->identificationVariable])) {
                     $queryComponent = $queryComponents[$expression->identificationVariable];
                     if (isset($queryComponent['parent'])
-                        && $queryComponent['relation']['type'] & ClassMetadataInfo::TO_MANY) {
+                        && $queryComponent['relation']['type']&ClassMetadataInfo::TO_MANY) {
                         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.");
                     }
                 }

src/Eccube/Doctrine/ORM/Tools/Pagination/WhereInWalker.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
             $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
         }
 
-        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
+        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
         $pathExpression->type = $pathType;
 
         $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);
@@ -100,7 +100,7 @@ 
                 array($pathExpression)
             );
             $expression = new InExpression($arithmeticExpression);
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
 
         } else {
             $expression = new NullComparisonExpression($pathExpression);

src/Eccube/InstallApplication.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
         if (is_writable($logDir)) {
             if (file_exists($installLog) && !is_writable($installLog)) {
-                die($installLog . ' の書込権限を変更して下さい。');
+                die($installLog.' の書込権限を変更して下さい。');
             }
             // install step2 でログディレクトリに書き込み権限が付与されればログ出力を開始する.
             $app->register(new \Silex\Provider\MonologServiceProvider(), array(