Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
created
src/Eccube/Repository/DeliveryRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
     /**
42 42
      * @deprecated 呼び出し元で制御する
43
-     * @param $id
43
+     * @param integer $id
44 44
      * @return \Eccube\Entity\Delivery|null|object
45 45
      */
46 46
     public function findOrCreate($id)
Please login to merge, or discard this patch.
src/Eccube/Service/ShoppingService.php 2 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     /**
221 221
      * 非会員情報を取得
222 222
      *
223
-     * @param $sesisonKey
223
+     * @param string $sesisonKey
224 224
      * @return $Customer|null
225 225
      */
226 226
     public function getNonMember($sesisonKey)
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
     /**
253 253
      * 受注情報を作成
254 254
      *
255
-     * @param $Customer
255
+     * @param null|Customer $Customer
256 256
      * @return \Eccube\Entity\Order
257 257
      */
258 258
     public function createOrder($Customer)
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
      * 仮受注情報作成
282 282
      *
283 283
      * @param $Customer
284
-     * @param $preOrderId
284
+     * @param string $preOrderId
285 285
      * @return mixed
286 286
      * @throws \Doctrine\ORM\NoResultException
287 287
      * @throws \Doctrine\ORM\NonUniqueResultException
@@ -1403,7 +1403,7 @@  discard block
 block discarded – undo
1403 1403
      * 受注メール送信を行う
1404 1404
      *
1405 1405
      * @param Order $Order
1406
-     * @return MailHistory
1406
+     * @return null|\Symfony\Component\HttpFoundation\Request
1407 1407
      */
1408 1408
     public function sendOrderMail(Order $Order)
1409 1409
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1117,7 +1117,7 @@
 block discarded – undo
1117 1117
 
1118 1118
         // 配送日数が設定されている
1119 1119
         if ($deliveryDateFlag) {
1120
-            $period = new \DatePeriod (
1120
+            $period = new \DatePeriod(
1121 1121
                 new \DateTime($minDate.' day'),
1122 1122
                 new \DateInterval('P1D'),
1123 1123
                 new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -817,7 +817,7 @@
 block discarded – undo
817 817
                 if ($dispatcher instanceof Response
818 818
                     && ($dispatcher->isRedirection() || $dispatcher->getContent())
819 819
                 ) { // $paymentMethod->apply() が Response を返した場合は画面遷移
820
-                    return $dispatcher;                // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
820
+                    return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
821 821
                 }
822 822
                 $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行
823 823
                 if (!$PaymentResult->isSuccess()) {
Please login to merge, or discard this patch.
src/Eccube/Controller/ProductController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
             );
195 195
             $addCartForm = $builder->getForm();
196 196
 
197
-            if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) {
197
+            if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) {
198 198
                 $addCartForm->handleRequest($request);
199 199
 
200 200
                 if ($addCartForm->isValid()) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/CacheController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
                 }
91 91
                 if ($dir == 'doctrine') {
92 92
                     // doctrineが指定された場合は, cache driver経由で削除.
93
-                    $config =  $this->entityManager->getConfiguration();
93
+                    $config = $this->entityManager->getConfiguration();
94 94
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
95 95
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
96 96
                     $this->deleteDoctrineCache($config->getResultCacheImpl());
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
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
     {
123 123
         // install.phpのチェック.
124 124
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
125
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
125
+            $file = $this->appConfig['root_dir'].'/html/install.php';
126 126
             if (file_exists($file)) {
127 127
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
128 128
                 $app->addWarning($message, 'admin');
129 129
             }
130
-            $fileOnRoot = $this->appConfig['root_dir'] . '/install.php';
130
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
131 131
             if (file_exists($fileOnRoot)) {
132 132
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
133 133
                 $app->addWarning($message, 'admin');
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
                     t1.status
376 376
                 ORDER BY
377 377
                     t1.status';
378
-        $rsm = new ResultSetMapping();;
378
+        $rsm = new ResultSetMapping(); ;
379 379
         $rsm->addScalarResult('status', 'status');
380 380
         $rsm->addScalarResult('count', 'count');
381 381
         $query = $em->createNativeQuery($sql, $rsm);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Customer/CustomerController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         $em->getConfiguration()->setSQLLogger(null);
328 328
 
329 329
         $response = new StreamedResponse();
330
-        $response->setCallback(function () use ($app, $request) {
330
+        $response->setCallback(function() use ($app, $request) {
331 331
 
332 332
             // CSV種別を元に初期化.
333 333
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 
342 342
             // データ行の出力.
343 343
             $this->csvExportService->setExportQueryBuilder($qb);
344
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
344
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
345 345
 
346 346
                 $Csvs = $csvService->getCsvs();
347 347
 
@@ -376,9 +376,9 @@  discard block
 block discarded – undo
376 376
         });
377 377
 
378 378
         $now = new \DateTime();
379
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
379
+        $filename = 'customer_'.$now->format('YmdHis').'.csv';
380 380
         $response->headers->set('Content-Type', 'application/octet-stream');
381
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
381
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
382 382
 
383 383
         $response->send();
384 384
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CategoryController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $em->getConfiguration()->setSQLLogger(null);
273 273
 
274 274
         $response = new StreamedResponse();
275
-        $response->setCallback(function () use ($app, $request) {
275
+        $response->setCallback(function() use ($app, $request) {
276 276
 
277 277
             // CSV種別を元に初期化.
278 278
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
             // データ行の出力.
288 288
             $this->csvExportService->setExportQueryBuilder($qb);
289
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
289
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
290 290
 
291 291
                 $Csvs = $csvService->getCsvs();
292 292
 
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
         });
320 320
 
321 321
         $now = new \DateTime();
322
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
322
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
323 323
         $response->headers->set('Content-Type', 'application/octet-stream');
324
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
324
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
325 325
         $response->send();
326 326
 
327 327
         log_info('カテゴリCSV出力ファイル名', array($filename));
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/TemplateController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@
 block discarded – undo
187 187
         // ダウンロード完了後にファイルを削除する.
188 188
         // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony
189 189
         $app->finish(
190
-            function (Request $request, Response $response, \Silex\Application $app) use (
190
+            function(Request $request, Response $response, \Silex\Application $app) use (
191 191
                 $tmpDir,
192 192
                 $tarFile,
193 193
                 $tarGzFile
Please login to merge, or discard this patch.