@@ -278,6 +278,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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) { |
@@ -14,22 +14,22 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Content; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | +use Eccube\Util\FilesystemUtil; |
|
18 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
17 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
18 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
21 | +use Symfony\Component\Filesystem\Exception\IOException; |
|
20 | 22 | use Symfony\Component\Filesystem\Filesystem; |
21 | 23 | use Symfony\Component\Finder\Finder; |
22 | 24 | use Symfony\Component\Form\Extension\Core\Type\FileType; |
23 | 25 | use Symfony\Component\Form\Extension\Core\Type\FormType; |
24 | 26 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
25 | 27 | use Symfony\Component\HttpFoundation\BinaryFileResponse; |
28 | +use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
26 | 29 | use Symfony\Component\HttpFoundation\Request; |
27 | 30 | use Symfony\Component\HttpFoundation\ResponseHeaderBag; |
28 | 31 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
29 | -use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
30 | 32 | use Symfony\Component\Validator\Constraints as Assert; |
31 | -use Eccube\Util\FilesystemUtil; |
|
32 | -use Symfony\Component\Filesystem\Exception\IOException; |
|
33 | 33 | |
34 | 34 | class FileController extends AbstractController |
35 | 35 | { |
@@ -273,7 +273,6 @@ |
||
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 |
@@ -36,8 +36,8 @@ |
||
36 | 36 | use Symfony\Component\HttpFoundation\Request; |
37 | 37 | use Symfony\Component\HttpFoundation\StreamedResponse; |
38 | 38 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
39 | -use Symfony\Component\Translation\TranslatorInterface; |
|
40 | 39 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
40 | +use Symfony\Component\Translation\TranslatorInterface; |
|
41 | 41 | |
42 | 42 | class CustomerController extends AbstractController |
43 | 43 | { |
@@ -784,6 +784,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | */ |
@@ -31,8 +31,8 @@ |
||
31 | 31 | use Eccube\Repository\DeliveryDurationRepository; |
32 | 32 | use Eccube\Repository\Master\ProductStatusRepository; |
33 | 33 | use Eccube\Repository\Master\SaleTypeRepository; |
34 | -use Eccube\Repository\TagRepository; |
|
35 | 34 | use Eccube\Repository\ProductRepository; |
35 | +use Eccube\Repository\TagRepository; |
|
36 | 36 | use Eccube\Service\CsvImportService; |
37 | 37 | use Eccube\Util\StringUtil; |
38 | 38 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -976,6 +976,7 @@ |
||
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 | */ |
@@ -17,7 +17,14 @@ discard block |
||
17 | 17 | use Eccube\Common\Constant; |
18 | 18 | use Eccube\Controller\AbstractController; |
19 | 19 | use Eccube\Entity\BaseInfo; |
20 | +use Eccube\Entity\ExportCsvRow; |
|
20 | 21 | use Eccube\Entity\Master\CsvType; |
22 | +use Eccube\Entity\Master\ProductStatus; |
|
23 | +use Eccube\Entity\Product; |
|
24 | +use Eccube\Entity\ProductCategory; |
|
25 | +use Eccube\Entity\ProductClass; |
|
26 | +use Eccube\Entity\ProductImage; |
|
27 | +use Eccube\Entity\ProductStock; |
|
21 | 28 | use Eccube\Entity\ProductTag; |
22 | 29 | use Eccube\Event\EccubeEvents; |
23 | 30 | use Eccube\Event\EventArgs; |
@@ -32,28 +39,21 @@ discard block |
||
32 | 39 | use Eccube\Repository\TagRepository; |
33 | 40 | use Eccube\Repository\TaxRuleRepository; |
34 | 41 | use Eccube\Service\CsvExportService; |
42 | +use Eccube\Util\FormUtil; |
|
35 | 43 | use Knp\Component\Pager\Paginator; |
36 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
37 | 45 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
38 | 46 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
39 | 47 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
40 | -use Eccube\Util\FormUtil; |
|
41 | 48 | use Symfony\Component\Filesystem\Filesystem; |
42 | 49 | use Symfony\Component\HttpFoundation\File\File; |
43 | 50 | use Symfony\Component\HttpFoundation\JsonResponse; |
51 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
44 | 52 | use Symfony\Component\HttpFoundation\Request; |
45 | 53 | use Symfony\Component\HttpFoundation\StreamedResponse; |
46 | 54 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
47 | 55 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
48 | 56 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
49 | -use Eccube\Entity\Product; |
|
50 | -use Eccube\Entity\ProductClass; |
|
51 | -use Eccube\Entity\Master\ProductStatus; |
|
52 | -use Eccube\Entity\ProductStock; |
|
53 | -use Eccube\Entity\ProductImage; |
|
54 | -use Eccube\Entity\ProductCategory; |
|
55 | -use Eccube\Entity\ExportCsvRow; |
|
56 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
57 | 57 | |
58 | 58 | class ProductController extends AbstractController |
59 | 59 | { |
@@ -43,7 +43,6 @@ |
||
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 | */ |
@@ -76,7 +76,7 @@ |
||
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 |
@@ -258,7 +258,6 @@ |
||
258 | 258 | * @Method("PUT") |
259 | 259 | * @Route("/%eccube_admin_route%/shipping/notify_mail/{id}", requirements={"id" = "\d+"}, name="admin_shipping_notify_mail") |
260 | 260 | * |
261 | - * @param Request $request |
|
262 | 261 | * @param Shipping $Shipping |
263 | 262 | * |
264 | 263 | * @return JsonResponse |
@@ -16,8 +16,8 @@ |
||
16 | 16 | use Eccube\Common\Constant; |
17 | 17 | use Eccube\Controller\AbstractController; |
18 | 18 | use Eccube\Entity\Master\ShippingStatus; |
19 | -use Eccube\Entity\Shipping; |
|
20 | 19 | use Eccube\Entity\OrderItem; |
20 | +use Eccube\Entity\Shipping; |
|
21 | 21 | use Eccube\Event\EccubeEvents; |
22 | 22 | use Eccube\Event\EventArgs; |
23 | 23 | use Eccube\Form\Type\Admin\SearchShippingType; |
@@ -112,7 +112,7 @@ |
||
112 | 112 | * @param Request $request |
113 | 113 | * @param \Eccube\Entity\Template $Template |
114 | 114 | * |
115 | - * @return mixed |
|
115 | + * @return BinaryFileResponse |
|
116 | 116 | */ |
117 | 117 | public function download(Request $request, \Eccube\Entity\Template $Template) |
118 | 118 | { |
@@ -561,7 +561,6 @@ |
||
561 | 561 | } |
562 | 562 | |
563 | 563 | /** |
564 | - * @param array $options |
|
565 | 564 | * |
566 | 565 | * @return string |
567 | 566 | * |