Completed
Pull Request — experimental/sf (#3426)
by k-yamamura
122:47 queued 115:15
created
codeception/acceptance/EF06OtherCest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 use Codeception\Util\Fixtures;
4
-use Eccube\Entity\Master\CustomerStatus;
5 4
 
6 5
 /**
7 6
  * @group front
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,6 +153,9 @@  discard block
 block discarded – undo
153 153
         $this->addWarning('admin.delete.warning', 'admin');
154 154
     }
155 155
 
156
+    /**
157
+     * @param string $targetPath
158
+     */
156 159
     public function setLoginTargetPath($targetPath, $namespace = null)
157 160
     {
158 161
         if (is_null($namespace)) {
@@ -169,7 +172,7 @@  discard block
 block discarded – undo
169 172
      * @param array  $path An array of path parameters
170 173
      * @param array  $query An array of query parameters
171 174
      *
172
-     * @return Response A Response instance
175
+     * @return \Symfony\Component\HttpFoundation\Response A Response instance
173 176
      */
174 177
     public function forwardToRoute($route, array $path = [], array $query = [])
175 178
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/AdminController.php 1 patch
Doc Comments   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
334 334
     }
335 335
 
336 336
     /**
337
-     * @param $em
337
+     * @param \Doctrine\ORM\EntityManagerInterface $em
338 338
      * @param array $excludes
339 339
      *
340
-     * @return array
340
+     * @return null|Request
341 341
      */
342 342
     protected function findOrderStatus($em, array $excludes)
343 343
     {
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
     }
355 355
 
356 356
     /**
357
-     * @param $em
357
+     * @param \Doctrine\ORM\EntityManagerInterface $em
358 358
      * @param array $excludes
359 359
      *
360
-     * @return array
360
+     * @return null|Request
361 361
      */
362 362
     protected function getOrderEachStatus($em, array $excludes)
363 363
     {
@@ -387,11 +387,11 @@  discard block
 block discarded – undo
387 387
     }
388 388
 
389 389
     /**
390
-     * @param $em
391
-     * @param $dateTime
390
+     * @param \Doctrine\ORM\EntityManagerInterface $em
391
+     * @param \DateTime $dateTime
392 392
      * @param array $excludes
393 393
      *
394
-     * @return array
394
+     * @return null|Request
395 395
      */
396 396
     protected function getSalesByMonth($em, $dateTime, array $excludes)
397 397
     {
@@ -425,11 +425,11 @@  discard block
 block discarded – undo
425 425
     }
426 426
 
427 427
     /**
428
-     * @param $em
429
-     * @param $dateTime
428
+     * @param \Doctrine\ORM\EntityManagerInterface $em
429
+     * @param \DateTime $dateTime
430 430
      * @param array $excludes
431 431
      *
432
-     * @return array
432
+     * @return null|Request
433 433
      */
434 434
     protected function getSalesByDay($em, $dateTime, array $excludes)
435 435
     {
@@ -463,9 +463,9 @@  discard block
 block discarded – undo
463 463
     }
464 464
 
465 465
     /**
466
-     * @param $em
466
+     * @param \Doctrine\ORM\EntityManagerInterface $em
467 467
      *
468
-     * @return mixed
468
+     * @return null|Request
469 469
      *
470 470
      * @throws NoResultException
471 471
      * @throws \Doctrine\ORM\NonUniqueResultException
@@ -486,9 +486,9 @@  discard block
 block discarded – undo
486 486
     }
487 487
 
488 488
     /**
489
-     * @param $em
489
+     * @param \Doctrine\ORM\EntityManagerInterface $em
490 490
      *
491
-     * @return mixed
491
+     * @return null|Request
492 492
      *
493 493
      * @throws NoResultException
494 494
      * @throws \Doctrine\ORM\NonUniqueResultException
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -278,6 +278,10 @@  discard block
 block discarded – undo
278 278
         return $paths;
279 279
     }
280 280
 
281
+    /**
282
+     * @param string $topDir
283
+     * @param Request $request
284
+     */
281 285
     private function getTree($topDir, $request)
282 286
     {
283 287
         $finder = Finder::create()->in($topDir)
@@ -314,6 +318,9 @@  discard block
 block discarded – undo
314 318
         return $tree;
315 319
     }
316 320
 
321
+    /**
322
+     * @param string $nowDir
323
+     */
317 324
     private function getFileList($nowDir)
318 325
     {
319 326
         $topDir = $this->getuserDataDir();
@@ -366,6 +373,9 @@  discard block
 block discarded – undo
366 373
         return str_replace('\\', '/', realpath($path));
367 374
     }
368 375
 
376
+    /**
377
+     * @param string $topDir
378
+     */
369 379
     protected function checkDir($targetDir, $topDir)
370 380
     {
371 381
         $targetDir = realpath($targetDir);
@@ -374,6 +384,9 @@  discard block
 block discarded – undo
374 384
         return strpos($targetDir, $topDir) === 0;
375 385
     }
376 386
 
387
+    /**
388
+     * @return string
389
+     */
377 390
     private function convertStrFromServer($target)
378 391
     {
379 392
         if ($this->encode == self::SJIS) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Customer/CustomerController.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -273,7 +273,6 @@
 block discarded – undo
273 273
      *
274 274
      * @Route("/%eccube_admin_route%/customer/export", name="admin_customer_export")
275 275
      *
276
-     * @param Application $app
277 276
      * @param Request $request
278 277
      *
279 278
      * @return StreamedResponse
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -784,6 +784,7 @@  discard block
 block discarded – undo
784 784
      *
785 785
      * @param $row
786 786
      * @param Product $Product
787
+     * @param CsvImportService $data
787 788
      */
788 789
     protected function createProductImage($row, Product $Product, $data, $headerByKey)
789 790
     {
@@ -830,7 +831,7 @@  discard block
 block discarded – undo
830 831
      *
831 832
      * @param $row
832 833
      * @param Product $Product
833
-     * @param $data
834
+     * @param CsvImportService $data
834 835
      * @param $headerByKey
835 836
      */
836 837
     protected function createProductCategory($row, Product $Product, $data, $headerByKey)
@@ -950,7 +951,7 @@  discard block
 block discarded – undo
950 951
      *
951 952
      * @param $row
952 953
      * @param Product $Product
953
-     * @param $data
954
+     * @param CsvImportService $data
954 955
      * @param $headerByKey
955 956
      * @param null $ClassCategory1
956 957
      * @param null $ClassCategory2
@@ -1102,7 +1103,7 @@  discard block
 block discarded – undo
1102 1103
      * @param $row
1103 1104
      * @param Product $Product
1104 1105
      * @param ProductClass $ProductClass
1105
-     * @param $data
1106
+     * @param CsvImportService $data
1106 1107
      *
1107 1108
      * @return ProductClass
1108 1109
      */
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -976,6 +976,7 @@
 block discarded – undo
976 976
      *
977 977
      * @param \Eccube\Entity\Product $Product
978 978
      * @param \Eccube\Entity\Category $Category
979
+     * @param integer $count
979 980
      *
980 981
      * @return \Eccube\Entity\ProductCategory
981 982
      */
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/TagController.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,6 @@
 block discarded – undo
43 43
      * @Template("@admin/Product/tag.twig")
44 44
      *
45 45
      * @param Request $request
46
-     * @param Tag|null $Tag
47 46
      *
48 47
      * @return array|\Symfony\Component\HttpFoundation\RedirectResponse
49 48
      */
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
     /**
77 77
      * parse log file
78 78
      *
79
-     * @param $logFile
79
+     * @param string $logFile
80 80
      * @param $formData
81 81
      *
82 82
      * @return array
Please login to merge, or discard this patch.