@@ -347,10 +347,10 @@ discard block |
||
347 | 347 | } |
348 | 348 | |
349 | 349 | /** |
350 | - * @param $em |
|
350 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
351 | 351 | * @param array $excludes |
352 | 352 | * |
353 | - * @return array |
|
353 | + * @return null|Request |
|
354 | 354 | */ |
355 | 355 | protected function findOrderStatus($em, array $excludes) |
356 | 356 | { |
@@ -367,10 +367,10 @@ discard block |
||
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
370 | - * @param $em |
|
370 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
371 | 371 | * @param array $excludes |
372 | 372 | * |
373 | - * @return array |
|
373 | + * @return null|Request |
|
374 | 374 | */ |
375 | 375 | protected function getOrderEachStatus($em, array $excludes) |
376 | 376 | { |
@@ -400,11 +400,11 @@ discard block |
||
400 | 400 | } |
401 | 401 | |
402 | 402 | /** |
403 | - * @param $em |
|
404 | - * @param $dateTime |
|
403 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
404 | + * @param \DateTime $dateTime |
|
405 | 405 | * @param array $excludes |
406 | 406 | * |
407 | - * @return array |
|
407 | + * @return null|Request |
|
408 | 408 | */ |
409 | 409 | protected function getSalesByMonth($em, $dateTime, array $excludes) |
410 | 410 | { |
@@ -438,11 +438,11 @@ discard block |
||
438 | 438 | } |
439 | 439 | |
440 | 440 | /** |
441 | - * @param $em |
|
442 | - * @param $dateTime |
|
441 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
442 | + * @param \DateTime $dateTime |
|
443 | 443 | * @param array $excludes |
444 | 444 | * |
445 | - * @return array |
|
445 | + * @return null|Request |
|
446 | 446 | */ |
447 | 447 | protected function getSalesByDay($em, $dateTime, array $excludes) |
448 | 448 | { |
@@ -476,9 +476,9 @@ discard block |
||
476 | 476 | } |
477 | 477 | |
478 | 478 | /** |
479 | - * @param $em |
|
479 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
480 | 480 | * |
481 | - * @return mixed |
|
481 | + * @return null|Request |
|
482 | 482 | * |
483 | 483 | * @throws NoResultException |
484 | 484 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -499,9 +499,9 @@ discard block |
||
499 | 499 | } |
500 | 500 | |
501 | 501 | /** |
502 | - * @param $em |
|
502 | + * @param \Doctrine\ORM\EntityManagerInterface $em |
|
503 | 503 | * |
504 | - * @return mixed |
|
504 | + * @return null|Request |
|
505 | 505 | * |
506 | 506 | * @throws NoResultException |
507 | 507 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -288,6 +288,10 @@ discard block |
||
288 | 288 | return $paths; |
289 | 289 | } |
290 | 290 | |
291 | + /** |
|
292 | + * @param string $topDir |
|
293 | + * @param Request $request |
|
294 | + */ |
|
291 | 295 | private function getTree($topDir, $request) |
292 | 296 | { |
293 | 297 | $finder = Finder::create()->in($topDir) |
@@ -324,6 +328,9 @@ discard block |
||
324 | 328 | return $tree; |
325 | 329 | } |
326 | 330 | |
331 | + /** |
|
332 | + * @param string $nowDir |
|
333 | + */ |
|
327 | 334 | private function getFileList($nowDir) |
328 | 335 | { |
329 | 336 | $topDir = $this->getuserDataDir(); |
@@ -376,6 +383,9 @@ discard block |
||
376 | 383 | return str_replace('\\', '/', realpath($path)); |
377 | 384 | } |
378 | 385 | |
386 | + /** |
|
387 | + * @param string $topDir |
|
388 | + */ |
|
379 | 389 | protected function checkDir($targetDir, $topDir) |
380 | 390 | { |
381 | 391 | $targetDir = realpath($targetDir); |
@@ -384,6 +394,9 @@ discard block |
||
384 | 394 | return strpos($targetDir, $topDir) === 0; |
385 | 395 | } |
386 | 396 | |
397 | + /** |
|
398 | + * @return string |
|
399 | + */ |
|
387 | 400 | private function convertStrFromServer($target) |
388 | 401 | { |
389 | 402 | if ($this->encode == self::SJIS) { |
@@ -327,7 +327,7 @@ |
||
327 | 327 | private function getFileList($nowDir) |
328 | 328 | { |
329 | 329 | $topDir = $this->getuserDataDir(); |
330 | - $filter = function (\SplFileInfo $file) use ($topDir) { |
|
330 | + $filter = function(\SplFileInfo $file) use ($topDir) { |
|
331 | 331 | $acceptPath = realpath($topDir); |
332 | 332 | $targetPath = $file->getRealPath(); |
333 | 333 |
@@ -283,7 +283,6 @@ |
||
283 | 283 | * |
284 | 284 | * @Route("/%eccube_admin_route%/customer/export", name="admin_customer_export") |
285 | 285 | * |
286 | - * @param Application $app |
|
287 | 286 | * @param Request $request |
288 | 287 | * |
289 | 288 | * @return StreamedResponse |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | $em->getConfiguration()->setSQLLogger(null); |
299 | 299 | |
300 | 300 | $response = new StreamedResponse(); |
301 | - $response->setCallback(function () use ($request) { |
|
301 | + $response->setCallback(function() use ($request) { |
|
302 | 302 | // CSV種別を元に初期化. |
303 | 303 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
304 | 304 | |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | |
312 | 312 | // データ行の出力. |
313 | 313 | $this->csvExportService->setExportQueryBuilder($qb); |
314 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { |
|
314 | + $this->csvExportService->exportData(function($entity, $csvService) use ($request) { |
|
315 | 315 | $Csvs = $csvService->getCsvs(); |
316 | 316 | |
317 | 317 | /** @var $Customer \Eccube\Entity\Customer */ |
@@ -797,6 +797,7 @@ discard block |
||
797 | 797 | * |
798 | 798 | * @param $row |
799 | 799 | * @param Product $Product |
800 | + * @param CsvImportService $data |
|
800 | 801 | */ |
801 | 802 | protected function createProductImage($row, Product $Product, $data, $headerByKey) |
802 | 803 | { |
@@ -843,7 +844,7 @@ discard block |
||
843 | 844 | * |
844 | 845 | * @param $row |
845 | 846 | * @param Product $Product |
846 | - * @param $data |
|
847 | + * @param CsvImportService $data |
|
847 | 848 | * @param $headerByKey |
848 | 849 | */ |
849 | 850 | protected function createProductCategory($row, Product $Product, $data, $headerByKey) |
@@ -963,7 +964,7 @@ discard block |
||
963 | 964 | * |
964 | 965 | * @param $row |
965 | 966 | * @param Product $Product |
966 | - * @param $data |
|
967 | + * @param CsvImportService $data |
|
967 | 968 | * @param $headerByKey |
968 | 969 | * @param null $ClassCategory1 |
969 | 970 | * @param null $ClassCategory2 |
@@ -1115,7 +1116,7 @@ discard block |
||
1115 | 1116 | * @param $row |
1116 | 1117 | * @param Product $Product |
1117 | 1118 | * @param ProductClass $ProductClass |
1118 | - * @param $data |
|
1119 | + * @param CsvImportService $data |
|
1119 | 1120 | * |
1120 | 1121 | * @return ProductClass |
1121 | 1122 | */ |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | |
194 | 194 | return $this->render($form, $headers); |
195 | 195 | } |
196 | - $getId = function ($item) { |
|
196 | + $getId = function($item) { |
|
197 | 197 | return $item['id']; |
198 | 198 | }; |
199 | - $requireHeader = array_keys(array_map($getId, array_filter($headers, function ($value) { |
|
199 | + $requireHeader = array_keys(array_map($getId, array_filter($headers, function($value) { |
|
200 | 200 | return $value['required']; |
201 | 201 | }))); |
202 | 202 | |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | throw new NotFoundHttpException(); |
694 | 694 | } |
695 | 695 | |
696 | - $response->setCallback(function () use ($request, $headers) { |
|
696 | + $response->setCallback(function() use ($request, $headers) { |
|
697 | 697 | // ヘッダ行の出力 |
698 | 698 | $row = []; |
699 | 699 | foreach ($headers as $key => $value) { |
@@ -989,6 +989,7 @@ |
||
989 | 989 | * |
990 | 990 | * @param \Eccube\Entity\Product $Product |
991 | 991 | * @param \Eccube\Entity\Category $Category |
992 | + * @param integer $count |
|
992 | 993 | * |
993 | 994 | * @return \Eccube\Entity\ProductCategory |
994 | 995 | */ |
@@ -645,7 +645,7 @@ discard block |
||
645 | 645 | |
646 | 646 | // ツリー表示のため、ルートからのカテゴリを取得 |
647 | 647 | $TopCategories = $this->categoryRepository->getList(null); |
648 | - $ChoicedCategoryIds = array_map(function ($Category) { |
|
648 | + $ChoicedCategoryIds = array_map(function($Category) { |
|
649 | 649 | return $Category->getId(); |
650 | 650 | }, $form->get('Category')->getData()); |
651 | 651 | |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | $em->getConfiguration()->setSQLLogger(null); |
893 | 893 | |
894 | 894 | $response = new StreamedResponse(); |
895 | - $response->setCallback(function () use ($request) { |
|
895 | + $response->setCallback(function() use ($request) { |
|
896 | 896 | // CSV種別を元に初期化. |
897 | 897 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT); |
898 | 898 | |
@@ -931,7 +931,7 @@ discard block |
||
931 | 931 | // データ行の出力. |
932 | 932 | $this->csvExportService->setExportQueryBuilder($qb); |
933 | 933 | |
934 | - $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($request) { |
|
934 | + $this->csvExportService->exportData(function($entity, CsvExportService $csvService) use ($request) { |
|
935 | 935 | $Csvs = $csvService->getCsvs(); |
936 | 936 | |
937 | 937 | /** @var $Product \Eccube\Entity\Product */ |
@@ -53,7 +53,6 @@ |
||
53 | 53 | * @Template("@admin/Product/tag.twig") |
54 | 54 | * |
55 | 55 | * @param Request $request |
56 | - * @param Tag|null $Tag |
|
57 | 56 | * |
58 | 57 | * @return array|\Symfony\Component\HttpFoundation\RedirectResponse |
59 | 58 | */ |
@@ -89,7 +89,7 @@ |
||
89 | 89 | /** |
90 | 90 | * parse log file |
91 | 91 | * |
92 | - * @param $logFile |
|
92 | + * @param string $logFile |
|
93 | 93 | * @param $formData |
94 | 94 | * |
95 | 95 | * @return array |
@@ -102,7 +102,7 @@ |
||
102 | 102 | return $log; |
103 | 103 | } |
104 | 104 | |
105 | - foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) { |
|
105 | + foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) { |
|
106 | 106 | // 上限に達した場合、処理を抜ける |
107 | 107 | if (count($log) >= $formData['line_max']) { |
108 | 108 | break; |
@@ -247,7 +247,6 @@ |
||
247 | 247 | * @Method("PUT") |
248 | 248 | * @Route("/%eccube_admin_route%/shipping/notify_mail/{id}", requirements={"id" = "\d+"}, name="admin_shipping_notify_mail") |
249 | 249 | * |
250 | - * @param Request $request |
|
251 | 250 | * @param Shipping $Shipping |
252 | 251 | * |
253 | 252 | * @return JsonResponse |
@@ -122,7 +122,7 @@ |
||
122 | 122 | * @param Request $request |
123 | 123 | * @param \Eccube\Entity\Template $Template |
124 | 124 | * |
125 | - * @return mixed |
|
125 | + * @return BinaryFileResponse |
|
126 | 126 | */ |
127 | 127 | public function download(Request $request, \Eccube\Entity\Template $Template) |
128 | 128 | { |
@@ -161,7 +161,7 @@ |
||
161 | 161 | |
162 | 162 | // ダウンロード完了後にファイルを削除する. |
163 | 163 | // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony |
164 | - $this->eventDispatcher->addListener(KernelEvents::TERMINATE, function () use ( |
|
164 | + $this->eventDispatcher->addListener(KernelEvents::TERMINATE, function() use ( |
|
165 | 165 | $tmpDir, |
166 | 166 | $tarFile, |
167 | 167 | $tarGzFile |