Completed
Pull Request — experimental/3.1 (#2684)
by
unknown
24:57
created
src/Eccube/Form/Type/Shopping/OrderType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         // 支払い方法のプルダウンを生成
111 111
         $builder->addEventListener(
112 112
             FormEvents::PRE_SET_DATA,
113
-            function (FormEvent $event) {
113
+            function(FormEvent $event) {
114 114
                 /** @var Order $Order */
115 115
                 $Order = $event->getData();
116 116
                 if (is_null($Order) || !$Order->getId()) {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         // TODO Calculatorで行うのが適切.
159 159
         $builder->addEventListener(
160 160
             FormEvents::POST_SUBMIT,
161
-            function (FormEvent $event) {
161
+            function(FormEvent $event) {
162 162
                 /** @var Order $Order */
163 163
                 $Order = $event->getData();
164 164
                 // XXX 非会員購入の際, use_point が null で submit される?
Please login to merge, or discard this patch.
src/Eccube/DI/DIServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['eccube.di'] = function (Container $app) {
15
+        $app['eccube.di'] = function(Container $app) {
16 16
             $di = new DependencyBuilder(
17 17
                 $app['eccube.di.generator.dir'],
18 18
                 $app['eccube.di.generator.class'],
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
         // XXX これを入れないと EntityEventDispatcher が有効になった時テストがコケる
39 39
         if (!$app->offsetExists('eccube.event.dispatcher')) {
40
-            $app['eccube.event.dispatcher'] = function () use ($app) {
40
+            $app['eccube.event.dispatcher'] = function() use ($app) {
41 41
                 return $app['dispatcher'];
42 42
             };
43 43
         }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ComposerServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      */
39 39
     public function register(Container $app)
40 40
     {
41
-        $app['eccube.service.composer'] = function () use ($app) {
41
+        $app['eccube.service.composer'] = function() use ($app) {
42 42
             /**@var \Eccube\Service\SystemService $systemService */
43 43
             $systemService = $app['eccube.service.system'];
44 44
             $composerMemory = $app['config']['composer_memory_limit'];
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerApiService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
 
235 235
     /**
236 236
      * Get mode
237
-     * @return mixed|string
237
+     * @return string
238 238
      */
239 239
     public function getMode()
240 240
     {
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerProcessService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
 
235 235
     /**
236 236
      * Get mode
237
-     * @return mixed|string
237
+     * @return string
238 238
      */
239 239
     public function getMode()
240 240
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
             if ($returnValue) {
121 121
                 throw new PluginException($outputString);
122 122
             }
123
-            log_info(PHP_EOL . $outputString . PHP_EOL);
123
+            log_info(PHP_EOL.$outputString.PHP_EOL);
124 124
         } catch (\Exception $exception) {
125 125
             throw new PluginException($exception->getMessage());
126 126
         }
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
     public function composerVersion()
274 274
     {
275 275
         $this->init();
276
-        $command = $this->pathPHP . ' ' . $this->composerFile . ' -V';
276
+        $command = $this->pathPHP.' '.$this->composerFile.' -V';
277 277
         return exec($command);
278 278
     }
279 279
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                 'class' => 'Eccube\Entity\Master\OrderStatus',
240 240
                 'choice_label' => 'name',
241 241
                 'placeholder' => '選択してください',
242
-                'query_builder' => function ($er) {
242
+                'query_builder' => function($er) {
243 243
                     return $er->createQueryBuilder('o')
244 244
                         ->orderBy('o.sort_no', 'ASC');
245 245
                 },
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                 )));
276 276
 
277 277
         // 選択された支払い方法の名称をエンティティにコピーする
278
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
278
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
279 279
             $Order = $event->getData();
280 280
             $Payment = $Order->getPayment();
281 281
             if (!is_null($Payment)) {
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
             }
284 284
         });
285 285
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
286
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
286
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
287 287
             $Order = $event->getData();
288 288
             $Customer = $Order->getCustomer();
289 289
             if (!is_null($Customer)) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/AdminController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
     {
128 128
         // install.phpのチェック.
129 129
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
130
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
130
+            $file = $this->appConfig['root_dir'].'/html/install.php';
131 131
             if (file_exists($file)) {
132 132
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
133 133
                 $app->addWarning($message, 'admin');
134 134
             }
135
-            $fileOnRoot = $this->appConfig['root_dir'] . '/install.php';
135
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
136 136
             if (file_exists($fileOnRoot)) {
137 137
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
138 138
                 $app->addWarning($message, 'admin');
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
                     t1.order_status_id
377 377
                 ORDER BY
378 378
                     t1.order_status_id';
379
-        $rsm = new ResultSetMapping();;
379
+        $rsm = new ResultSetMapping(); ;
380 380
         $rsm->addScalarResult('status', 'status');
381 381
         $rsm->addScalarResult('count', 'count');
382 382
         $query = $em->createNativeQuery($sql, $rsm);
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Filter/OrderStatusFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@
 block discarded – undo
33 33
     {
34 34
         // 決済処理中/購入処理中を除く.
35 35
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
36
-            return $targetTableAlias . '.order_status_id <> 7 AND ' . $targetTableAlias . '.order_status_id <> 8';
36
+            return $targetTableAlias.'.order_status_id <> 7 AND '.$targetTableAlias.'.order_status_id <> 8';
37 37
         }
38 38
 
39 39
         // 決済処理中/購入処理中を除く.
40 40
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
41
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
41
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
42 42
         }
43 43
 
44 44
         return '';
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/OwnerStoreController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
         try {
275 275
             $this->composerService->execRequire($packageNames);
276 276
             // Do report to package repo
277
-            $url = $this->appConfig['package_repo_url'] . '/report';
277
+            $url = $this->appConfig['package_repo_url'].'/report';
278 278
             $this->postRequestApi($url, $data);
279 279
             $app->addSuccess('admin.plugin.install.complete', 'admin');
280 280
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         }
285 285
 
286 286
         // Do report to package repo
287
-        $url = $this->appConfig['package_repo_url'] . '/report/fail';
287
+        $url = $this->appConfig['package_repo_url'].'/report/fail';
288 288
         $this->postRequestApi($url, $data);
289 289
         $app->addError('admin.plugin.install.fail', 'admin');
290 290
 
Please login to merge, or discard this patch.