Completed
Pull Request — master (#2152)
by NOBU
82:06 queued 38:49
created
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
                 'constraints' => array(
54 54
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
55 55
                     new Assert\File(array(
56
-                        'maxSize' => $app['config']['csv_size'] . 'M',
57
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
56
+                        'maxSize' => $app['config']['csv_size'].'M',
57
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
58 58
                     )),
59 59
                 ),
60 60
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListMaxType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
             $options = $event->getForm()->getConfig()->getOptions();
43 43
             if (!$event->getData()) {
44 44
                 $data = current(array_keys($options['choice_list']->getValues()));
45 45
                 $event->setData($data);
46 46
             }
47 47
         });
48
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
             $options = $event->getForm()->getConfig()->getOptions();
50 50
             $values = $options['choice_list']->getValues();
51 51
             if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListOrderByType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
             $options = $event->getForm()->getConfig()->getOptions();
43 43
             if (!$event->getData()) {
44 44
                 $data = current(array_keys($options['choice_list']->getValues()));
45 45
                 $event->setData($data);
46 46
             }
47 47
         });
48
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
             $options = $event->getForm()->getConfig()->getOptions();
50 50
             $values = $options['choice_list']->getValues();
51 51
             if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step4Type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
                 'label' => 'パスワード',
93 93
                 'required' => false,
94 94
             ))
95
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
95
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
96 96
                 $form = $event->getForm();
97 97
                 $data = $form->getData();
98 98
                 try {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
118 118
                     $conn->connect();
119 119
                 } catch (\Exception $e) {
120
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
120
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
121 121
                 }
122 122
             });
123 123
     }
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     public function validate($data, ExecutionContext $context, $param = null)
134 134
     {
135 135
         $parameters = $this->app['request']->get('install_step4');
136
-        if ($parameters['database'] != 'pdo_sqlite'){
136
+        if ($parameters['database'] != 'pdo_sqlite') {
137 137
             $context->validateValue($data, array(
138 138
                 new Assert\NotBlank()
139 139
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 }
113 113
             }
114 114
 
115
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
115
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
116 116
                 $data = $event->getData();
117 117
                 $form = $event->getForm();
118 118
                 if (!is_null($Product->getClassName2())) {
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
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
         $this->app = $this->getSilexApplication();
54 54
         
55
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
55
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
56 56
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
57 57
 
58 58
     }
Please login to merge, or discard this patch.
src/Eccube/Log/Monolog/Helper/LogHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         $webProcessor = new WebProcessor();
112 112
         $uidProcessor = new UidProcessor(8);
113 113
 
114
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
114
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
115 115
             // ログフォーマットに出力する値を独自に設定
116 116
 
117 117
             $record['level_name'] = sprintf("%-5s", $record['level_name']);
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
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
             return $log;
84 84
         }
85 85
 
86
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
86
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
87 87
             // 上限に達した場合、処理を抜ける
88 88
             if (count($log) >= $formData['line_max']) {
89 89
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
                 // ファイルアップロード
94 94
                 $file = $form['payment_image']->getData();
95 95
                 $fs = new Filesystem();
96
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
96
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
97 97
                     $fs->rename(
98
-                        $app['config']['image_temp_realdir'] . '/' . $file,
99
-                        $app['config']['image_save_realdir'] . '/' . $file
98
+                        $app['config']['image_temp_realdir'].'/'.$file,
99
+                        $app['config']['image_save_realdir'].'/'.$file
100 100
                     );
101 101
                 }
102 102
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             }
145 145
 
146 146
             $extension = $image->guessExtension();
147
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
147
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
148 148
             $image->move($app['config']['image_temp_realdir'], $filename);
149 149
         }
150 150
         $event = new EventArgs(
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         foreach ($Payments as $Payment) {
181 181
             if ($Payment->getId() != $id) {
182 182
                 $Payment->setRank($rank);
183
-                $rank ++;
183
+                $rank++;
184 184
             }
185 185
         }
186 186
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
         );
195 195
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
196 196
 
197
-        $app->addSuccess('admin.delete.complete', 'admin') ;
197
+        $app->addSuccess('admin.delete.complete', 'admin');
198 198
 
199 199
         return $app->redirect($app->url('admin_setting_shop_payment'));
200 200
     }
Please login to merge, or discard this patch.