Completed
Pull Request — master (#1504)
by Kentaro
41:35
created
html/index_dev.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 
59 59
 // load config dev
60 60
 $conf = $app['config'];
61
-$app['config'] = $app->share(function () use ($conf) {
61
+$app['config'] = $app->share(function() use ($conf) {
62 62
     $confarray = array();
63 63
     $config_dev_file = __DIR__.'/../app/config/eccube/config_dev.yml';
64 64
     if (file_exists($config_dev_file)) {
Please login to merge, or discard this patch.
html/install.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@
 block discarded – undo
26 26
     apc_clear_cache();
27 27
 }
28 28
 
29
-require __DIR__ . '/../autoload.php';
29
+require __DIR__.'/../autoload.php';
30 30
 
31 31
 $app = new Eccube\InstallApplication();
32 32
 $app['debug'] = true;
33
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
33
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
34 34
     if (!$request->getSession()->isStarted()) {
35 35
         $request->getSession()->start();
36 36
     }
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 
56 56
     protected function execute(InputInterface $input, OutputInterface $output) {
57 57
 
58
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
58
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
59 59
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
60 60
 
61 61
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ClassCategoryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
96 96
             ->select('count(pc.id)')
97 97
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
98
-            ->setParameter('id',$id)
98
+            ->setParameter('id', $id)
99 99
             ->getQuery()
100 100
             ->getSingleScalarResult();
101 101
         if ($num > 0) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         $log = array();
63 63
         $message = array();
64 64
 
65
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
65
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
66 66
             // 上限に達した場合、処理を抜ける
67 67
             if (count($log) >= $formData['line_max']) {
68 68
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/DeliveryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 
80 80
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
81 81
         if (!in_array($parentPage, $allowdParents)) {
82
-            $parentPage  = $app->url('mypage_delivery');
82
+            $parentPage = $app->url('mypage_delivery');
83 83
         }
84 84
 
85 85
         /* @var $form \Symfony\Component\Form\FormInterface */
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151023102323.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
         $PageLayout = new PageLayout();
31 31
         $PageLayout->setDeviceType($DeviceType);
32
-        $PageLayout->setName( '商品購入/お届け先の追加');
32
+        $PageLayout->setName('商品購入/お届け先の追加');
33 33
         $PageLayout->setUrl('shopping_shipping_edit');
34 34
         $PageLayout->setFileName('Shopping/shipping_edit');
35 35
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $PageLayout = new PageLayout();
40 40
         $PageLayout->setDeviceType($DeviceType);
41
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
41
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
42 42
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
43 43
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
44 44
         $PageLayout->setEditFlg(2);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
         $PageLayout = new PageLayout();
49 49
         $PageLayout->setDeviceType($DeviceType);
50
-        $PageLayout->setName( '商品購入/購入エラー');
50
+        $PageLayout->setName('商品購入/購入エラー');
51 51
         $PageLayout->setUrl('shopping_error');
52 52
         $PageLayout->setFileName('Shopping/shopping_error');
53 53
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
         $PageLayout = new PageLayout();
58 58
         $PageLayout->setDeviceType($DeviceType);
59
-        $PageLayout->setName( 'ご利用ガイド');
59
+        $PageLayout->setName('ご利用ガイド');
60 60
         $PageLayout->setUrl('help_guide');
61 61
         $PageLayout->setFileName('Help/guide');
62 62
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
67
+        $PageLayout->setName('パスワード再発行(入力ページ)');
68 68
         $PageLayout->setUrl('forgot');
69 69
         $PageLayout->setFileName('Forgot/index');
70 70
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
         $PageLayout = new PageLayout();
74 74
         $PageLayout->setDeviceType($DeviceType);
75
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
75
+        $PageLayout->setName('パスワード再発行(完了ページ)');
76 76
         $PageLayout->setUrl('forgot_complete');
77 77
         $PageLayout->setFileName('Forgot/complete');
78 78
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $PageLayout = new PageLayout();
83 83
         $PageLayout->setDeviceType($DeviceType);
84
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
84
+        $PageLayout->setName('パスワード変更((完了ページ)');
85 85
         $PageLayout->setUrl('forgot_reset');
86 86
         $PageLayout->setFileName('Forgot/reset');
87 87
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151116142354.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
         $PageLayout = new PageLayout();
30 30
         $PageLayout->setDeviceType($DeviceType);
31
-        $PageLayout->setName( '商品購入/配送方法選択');
31
+        $PageLayout->setName('商品購入/配送方法選択');
32 32
         $PageLayout->setUrl('shopping_delivery');
33 33
         $PageLayout->setFileName('Shopping/index');
34 34
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
         $PageLayout = new PageLayout();
39 39
         $PageLayout->setDeviceType($DeviceType);
40
-        $PageLayout->setName( '商品購入/支払方法選択');
40
+        $PageLayout->setName('商品購入/支払方法選択');
41 41
         $PageLayout->setUrl('shopping_payment');
42 42
         $PageLayout->setFileName('Shopping/index');
43 43
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
         $PageLayout = new PageLayout();
48 48
         $PageLayout->setDeviceType($DeviceType);
49
-        $PageLayout->setName( '商品購入/お届け先変更');
49
+        $PageLayout->setName('商品購入/お届け先変更');
50 50
         $PageLayout->setUrl('shopping_shipping_change');
51 51
         $PageLayout->setFileName('Shopping/index');
52 52
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         $PageLayout = new PageLayout();
57 57
         $PageLayout->setDeviceType($DeviceType);
58
-        $PageLayout->setName( '商品購入/お届け先変更');
58
+        $PageLayout->setName('商品購入/お届け先変更');
59 59
         $PageLayout->setUrl('shopping_shipping_edit_change');
60 60
         $PageLayout->setFileName('Shopping/index');
61 61
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
67
+        $PageLayout->setName('商品購入/お届け先の複数指定');
68 68
         $PageLayout->setUrl('shopping_shipping_multiple_change');
69 69
         $PageLayout->setFileName('Shopping/index');
70 70
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/silex-doctrine-migrations/MigrationServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $app['db.migrations.table_name'] = null;
25 25
         $app['db.migrations.name'] = null;
26 26
 
27
-        $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) {
27
+        $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) {
28 28
             $application = $event->getApplication();
29 29
 
30 30
             $helpers = array('dialog' => new DialogHelper());
Please login to merge, or discard this patch.