chihiro-adachi / ec-cube

src/Eccube/Controller/Admin/Customer/CustomerController.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,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_CUSTOMER);
@@ -245,7 +245,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();
 
@@ -267,9 +267,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
+        $filename = 'customer_'.$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();
 

src/Eccube/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -65,12 +65,12 @@ 
     {
         // install.phpのチェック.
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
-            $file = $app['config']['root_dir'] . '/html/install.php';
+            $file = $app['config']['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
                 $app->addWarning($message, 'admin');
             }
-            $fileOnRoot = $app['config']['root_dir'] . '/install.php';
+            $fileOnRoot = $app['config']['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -311,7 +311,7 @@ 
                     t1.status
                 ORDER BY
                     t1.status';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

src/Eccube/Controller/Admin/Content/CacheController.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 }
                 if ($dir == 'doctrine') {
                     // doctrineが指定された場合は, cache driver経由で削除.
-                    $config =  $app['orm.em']->getConfiguration();
+                    $config = $app['orm.em']->getConfiguration();
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
                     $this->deleteDoctrineCache($config->getResultCacheImpl());

src/Eccube/Controller/Admin/Content/LayoutController.php

Spacing +9 added lines, -9 removed lines

@@ -109,20 +109,20 @@ 
                 $max = count($Blocks);
                 for ($i = 0; $i < $max; $i++) {
                     // block_id が取得できない場合は INSERT しない
-                    if (!isset($data['id_' . $i])) {
+                    if (!isset($data['id_'.$i])) {
                         continue;
                     }
                     // 未使用は INSERT しない
-                    if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
+                    if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
                         continue;
                     }
                     // 他のページに anywhere が存在する場合は INSERT しない
-                    $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0;
-                    if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) {
+                    $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0;
+                    if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) {
                         $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition')
                             ->findBy(array(
                                 'anywhere' => 1,
-                                'block_id' => $data['id_' . $i],
+                                'block_id' => $data['id_'.$i],
                             ));
                         if (count($Other) > 0) {
                             continue;
@@ -132,14 +132,14 @@ 
                     $BlockPosition = new \Eccube\Entity\BlockPosition();
                     $Block = $app['orm.em']->getRepository('Eccube\Entity\Block')
                         ->findOneBy(array(
-                            'id' => $data['id_' . $i],
+                            'id' => $data['id_'.$i],
                             'DeviceType' => $DeviceType,
                         ));
                     $BlockPosition
                         ->setPageId($id)
-                        ->setBlockId($data['id_' . $i])
-                        ->setBlockRow($data['top_' . $i])
-                        ->setTargetId($data['target_id_' . $i])
+                        ->setBlockId($data['id_'.$i])
+                        ->setBlockRow($data['top_'.$i])
+                        ->setTargetId($data['target_id_'.$i])
                         ->setBlock($Block)
                         ->setPageLayout($TargetPageLayout)
                         ->setAnywhere($anywhere);

src/Eccube/Controller/Admin/Content/BlockController.php

Spacing +3 added lines, -3 removed lines

@@ -114,7 +114,7 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $blockData = $form->get('block_html')->getData();
@@ -122,7 +122,7 @@ 
                 $fs->dumpFile($filePath, $blockData);
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -174,7 +174,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $tplDir = $app['config']['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
                 // リセットキーの発行・有効期限の設定
                 $Customer
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
 
                 // リセットキーを更新
                 $app['orm.em']->persist($Customer);
@@ -87,7 +87,7 @@ 
 
                 // ログ出力
                 $app['monolog']->addInfo(
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
                 );
             }
 
@@ -167,7 +167,7 @@ 
 
             // ログ出力
             $app['monolog']->addInfo(
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
             );
         } else {
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');

src/Eccube/Command/CacheClearCommand.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     protected function execute(InputInterface $input, OutputInterface $output) {
 
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
 
     }

html/index.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 //require __DIR__.'/autoload.php';
 
 ini_set('display_errors', 'Off');
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
 
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);

html/install.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 }
 
 //[INFO]index.php,install.phpをEC-CUBEルート直下に移動させる場合は、コメントアウトしている行に置き換える
-require __DIR__ . '/../autoload.php';
+require __DIR__.'/../autoload.php';
 //require __DIR__ . '/autoload.php';
 
 $app = new Eccube\InstallApplication();
 $app['debug'] = true;
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
     if (!$request->getSession()->isStarted()) {
         $request->getSession()->start();
     }