EC-CUBE / ec-cube

src/Eccube/Controller/AbstractController.php

Doc Comments +6 added lines

@@ -52,11 +52,17 @@
         return $form;
     }
 
+    /**
+     * @param Application $app
+     */
     protected function getSecurity($app)
     {
         return $app['security.token_storage'];
     }
 
+    /**
+     * @param Application $app
+     */
     protected function isTokenValid($app)
     {
         $csrf = $app['form.csrf_provider'];

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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);
@@ -61,7 +61,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()}"
                 );
             }
 
@@ -115,7 +115,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/Controller/Mypage/WithdrawController.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     // 会員削除
                     $email = $Customer->getEmail();
                     // メールアドレスにダミーをセット
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
                     $Customer->setDelFlg(Constant::ENABLED);
 
                     $app['orm.em']->flush();

src/Eccube/Service/PluginService.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
     public function checkPluginArchiveContent($dir)
     {
         try {
-            $meta = $this->readYml($dir . '/config.yml');
+            $meta = $this->readYml($dir.'/config.yml');
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
             $this->app['monolog']->warning($e->getMessage());
             throw new PluginException($e->getMessage(), $e->getCode(), $e);

src/Eccube/Application.php

Braces +1 added lines, -1 removed lines

@@ -454,7 +454,7 @@
         foreach ($finder as $dir) {
             if (file_exists($dir->getRealPath().'/config.yml')) {
                 $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
-            }else{
+            } else{
                 $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath();
                 $this->log($error, array(), Logger::WARNING);
                 continue;

Doc Comments +1 added lines, -1 removed lines

@@ -725,7 +725,7 @@
      * 成功 : trueを返却
      *　失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
      * 備考 : app['debug']がtrueの際は処理を行わない
-     * @return boolean true
+     * @return null|boolean true
      *
      */
     protected function checkDatabaseConnection()

Spacing +3 added lines, -3 removed lines

@@ -454,7 +454,7 @@ 
         foreach ($finder as $dir) {
             if (file_exists($dir->getRealPath().'/config.yml')) {
                 $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
-            }else{
+            } else {
                 $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath();
                 $this->log($error, array(), Logger::WARNING);
                 continue;
@@ -669,7 +669,7 @@ 
             //config.ymlのないディレクトリは無視する
             try {
                 $this['eccube.service.plugin']->checkPluginArchiveContent($dir->getRealPath());
-            } catch(\Eccube\Exception\PluginException $e) {
+            } catch (\Eccube\Exception\PluginException $e) {
                 $this['monolog']->warning($e->getMessage());
                 continue;
             }
@@ -721,7 +721,7 @@ 
                 foreach ($config['service'] as $service) {
                     $class = '\\Plugin\\'.$config['code'].'\\ServiceProvider\\'.$service;
                     if (!class_exists($class)) {
-                        $this['monolog']->warning('該当クラスが見つかりません:' . $class);
+                        $this['monolog']->warning('該当クラスが見つかりません:'.$class);
                         continue;
                     }
                     $this->register(new $class($this));

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

Doc Comments +6 added lines

@@ -428,6 +428,9 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
+     * @param \Symfony\Component\Form\Form $classForm
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -477,6 +480,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -564,6 +568,7 @@ 
      *
      * @param $productClassDest コピー先となる商品規格
      * @param $productClassOrig コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -605,6 +610,7 @@ 
      * 商品規格を登録
      *
      * @param $ProductClasses 登録される商品規格
+     * @param Application $app
      */
     private function insertProductClass($app, $Product, $ProductClasses) {
 

src/Eccube/Application/ApplicationTrait.php

Spacing +9 added lines, -9 removed lines

@@ -20,32 +20,32 @@ 
      */
     public function addSuccess($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
     }
 
     public function addError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
     }
 
     public function addDanger($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
     }
 
     public function addWarning($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
     }
 
     public function addInfo($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
     }
 
     public function addRequestError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
     }
 
     public function clearMessage()
@@ -230,14 +230,14 @@ 
         $eventName = $view;
         if ($this->isAdminRequest()) {
             // 管理画面の場合、event名に「admin.」を付ける
-            $eventName = 'admin.' . $view;
+            $eventName = 'admin.'.$view;
         }
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
+        $this['monolog']->debug('Template Event Name : '.$eventName);
 
         $this['eccube.event.dispatcher']->dispatch($eventName, $event);
 
         if ($response instanceof StreamedResponse) {
-            $response->setCallback(function () use ($twig, $view, $parameters) {
+            $response->setCallback(function() use ($twig, $view, $parameters) {
                 $twig->display($view, $parameters);
             });
         } else {

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

Spacing +11 added lines, -11 removed lines

@@ -177,7 +177,7 @@ 
             foreach ($images as $img) {
                 foreach ($img as $image) {
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -239,7 +239,7 @@ 
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_PRODUCT_EDIT_INITIALIZE, $event);
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -337,7 +337,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']);
                 }
 
@@ -357,7 +357,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();
@@ -463,7 +463,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) {
                         // エラーが発生しても無視する
                     }
@@ -527,10 +527,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) {
                         // エラーが発生しても無視する
                     }
@@ -585,7 +585,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);
@@ -609,7 +609,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();
 
@@ -641,9 +641,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();
 
         return $response;

src/Eccube/Event/FormEventSubscriber.php

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Yaml\Yaml;
-use Monolog\Logger;
 
 class FormEventSubscriber implements EventSubscriberInterface
 {

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
     {
         $events = array();
         // YamlでParseしてがんばる
-        $basePath = __DIR__ . '/../../../app/Plugin';
+        $basePath = __DIR__.'/../../../app/Plugin';
         $finder = Finder::create()
             ->in($basePath)
             ->directories()
@@ -46,18 +46,18 @@ 
         $app = \Eccube\Application::getInstance();
 
         foreach ($finder as $dir) {
-            $config = Yaml::parse(file_get_contents($dir->getRealPath() . '/config.yml'));
+            $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
             try {
                 $app['eccube.service.plugin']->checkPluginArchiveContent($dir->getRealPath());
-            } catch(\Eccube\Exception\PluginException $e) {
+            } catch (\Eccube\Exception\PluginException $e) {
                 $app['monolog']->warning($e->getMessage());
                 continue;
             }
-            $config = $app['eccube.service.plugin']->readYml($dir->getRealPath() . '/config.yml');
+            $config = $app['eccube.service.plugin']->readYml($dir->getRealPath().'/config.yml');
 
             if (isset($config['form'])) {
                 foreach ($config['form'] as $event => $class) {
-                    $events[$event][] = '\\Plugin\\' . $config['code'] . '\\' . $class;
+                    $events[$event][] = '\\Plugin\\'.$config['code'].'\\'.$class;
                 }
             }
         }
@@ -81,7 +81,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPreSetData'])) {
-            foreach($events['onPreSetData'] as $formEventClass) {
+            foreach ($events['onPreSetData'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPreSetData($event);
             }
@@ -93,7 +93,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPostSetData'])) {
-            foreach($events['onPostSetData'] as $formEventClass) {
+            foreach ($events['onPostSetData'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPostSetData($event);
             }
@@ -105,7 +105,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPreSubmit'])) {
-            foreach($events['onPreSubmit'] as $formEventClass) {
+            foreach ($events['onPreSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPreSubmit($event);
             }
@@ -117,7 +117,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onSubmit'])) {
-            foreach($events['onSubmit'] as $formEventClass) {
+            foreach ($events['onSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onSubmit($event);
             }
@@ -129,7 +129,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPostSubmit'])) {
-            foreach($events['onPostSubmit'] as $formEventClass) {
+            foreach ($events['onPostSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPostSubmit($event);
             }