@@ -57,7 +57,7 @@ |
||
| 57 | 57 | /** |
| 58 | 58 | * Constructor. |
| 59 | 59 | * |
| 60 | - * @param Query|QueryBuilder $query A Doctrine ORM query or query builder. |
|
| 60 | + * @param Query $query A Doctrine ORM query or query builder. |
|
| 61 | 61 | * @param boolean $fetchJoinCollection Whether the query joins a collection (true by default). |
| 62 | 62 | */ |
| 63 | 63 | public function __construct($query, $fetchJoinCollection = true) |
@@ -15,9 +15,9 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Doctrine\ORM\NoResultException; |
| 17 | 17 | use Doctrine\ORM\Query; |
| 18 | +use Doctrine\ORM\QueryBuilder; |
|
| 18 | 19 | use Doctrine\ORM\Query\Parser; |
| 19 | 20 | use Doctrine\ORM\Query\ResultSetMapping; |
| 20 | -use Doctrine\ORM\QueryBuilder; |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * The paginator can handle various complex scenarios with DQL. |
@@ -163,6 +163,9 @@ discard block |
||
| 163 | 163 | $this->addWarning('admin.delete.warning', 'admin'); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | + /** |
|
| 167 | + * @param string $targetPath |
|
| 168 | + */ |
|
| 166 | 169 | public function setLoginTargetPath($targetPath, $namespace = null) |
| 167 | 170 | { |
| 168 | 171 | if (is_null($namespace)) { |
@@ -179,7 +182,7 @@ discard block |
||
| 179 | 182 | * @param array $path An array of path parameters |
| 180 | 183 | * @param array $query An array of query parameters |
| 181 | 184 | * |
| 182 | - * @return Response A Response instance |
|
| 185 | + * @return \Symfony\Component\HttpFoundation\Response A Response instance |
|
| 183 | 186 | */ |
| 184 | 187 | public function forwardToRoute($route, array $path = [], array $query = []) |
| 185 | 188 | { |
@@ -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 |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin; |
| 15 | 15 | |
| 16 | 16 | use Doctrine\ORM\NoResultException; |
| 17 | -use Doctrine\ORM\Query\ResultSetMapping; |
|
| 18 | 17 | use Doctrine\ORM\QueryBuilder; |
| 18 | +use Doctrine\ORM\Query\ResultSetMapping; |
|
| 19 | 19 | use Eccube\Controller\AbstractController; |
| 20 | 20 | use Eccube\Entity\Master\OrderStatus; |
| 21 | 21 | use Eccube\Entity\ProductStock; |
@@ -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) { |
@@ -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 | { |
@@ -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 |
@@ -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 | { |
@@ -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 | */ |
@@ -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; |
@@ -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 | */ |
@@ -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 | { |
@@ -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 |