EC-CUBE / ec-cube

src/Eccube/Controller/Admin/Setting/System/LogController.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         $log = array();
         $message = array();
 
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
             // 上限に達した場合、処理を抜ける
             if (count($log) >= $formData['line_max']) {
                 break;

src/Eccube/Controller/Mypage/DeliveryController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
         if (!in_array($parentPage, $allowdParents)) {
-            $parentPage  = $app->url('mypage_delivery');
+            $parentPage = $app->url('mypage_delivery');
         }
 
         /* @var $form \Symfony\Component\Form\FormInterface */

src/Eccube/Resource/doctrine/migration/Version20151023102323.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の追加');
+        $PageLayout->setName('商品購入/お届け先の追加');
         $PageLayout->setUrl('shopping_shipping_edit');
         $PageLayout->setFileName('Shopping/shipping_edit');
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
         $PageLayout->setEditFlg(2);
@@ -47,7 +47,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/購入エラー');
+        $PageLayout->setName('商品購入/購入エラー');
         $PageLayout->setUrl('shopping_error');
         $PageLayout->setFileName('Shopping/shopping_error');
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'ご利用ガイド');
+        $PageLayout->setName('ご利用ガイド');
         $PageLayout->setUrl('help_guide');
         $PageLayout->setFileName('Help/guide');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
+        $PageLayout->setName('パスワード再発行(入力ページ)');
         $PageLayout->setUrl('forgot');
         $PageLayout->setFileName('Forgot/index');
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
+        $PageLayout->setName('パスワード再発行(完了ページ)');
         $PageLayout->setUrl('forgot_complete');
         $PageLayout->setFileName('Forgot/complete');
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
+        $PageLayout->setName('パスワード変更((完了ページ)');
         $PageLayout->setUrl('forgot_reset');
         $PageLayout->setFileName('Forgot/reset');
         $PageLayout->setEditFlg(2);

src/Eccube/Resource/doctrine/migration/Version20151116142354.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/配送方法選択');
+        $PageLayout->setName('商品購入/配送方法選択');
         $PageLayout->setUrl('shopping_delivery');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/支払方法選択');
+        $PageLayout->setName('商品購入/支払方法選択');
         $PageLayout->setUrl('shopping_payment');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_edit_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
+        $PageLayout->setName('商品購入/お届け先の複数指定');
         $PageLayout->setUrl('shopping_shipping_multiple_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);

src/silex-doctrine-migrations/MigrationServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $app['db.migrations.table_name'] = null;
         $app['db.migrations.name'] = null;
 
-        $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) {
+        $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) {
             $application = $event->getApplication();
 
             $helpers = array('dialog' => new DialogHelper());

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

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Eccube\Entity\Master\DeviceType;
 use Eccube\Util\Str;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

src/Eccube/Form/Type/Admin/OrderType.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 {
     protected $app;
 
+    /**
+     * @param \Silex\Application $app
+     */
     public function __construct($app)
     {
         $this->app = $app;

src/Eccube/Security/Voter/AuthorityVoter.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     public function __construct(Application $app)
     {
-        $this->app     = $app;
+        $this->app = $app;
     }
 
     public function supportsAttribute($attribute)

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'];