@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Codeception\Util\Fixtures; |
|
4 | 3 | use Page\Admin\OwnersPluginPage; |
5 | 4 | |
6 | 5 | /** |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | use Codeception\Util\Fixtures; |
4 | -use Page\Admin\CustomerManagePage; |
|
5 | 4 | use Page\Admin\OrderManagePage; |
6 | 5 | use Page\Admin\TopPage; |
7 | 6 |
@@ -44,7 +44,7 @@ |
||
44 | 44 | // 購入された商品が受注管理画面のページにて反映されていることを確認 |
45 | 45 | $config = Fixtures::get('config'); |
46 | 46 | $findOrders = Fixtures::get('findOrders'); |
47 | - $NewOrders = array_filter($findOrders(), function ($Order) use ($config) { |
|
47 | + $NewOrders = array_filter($findOrders(), function($Order) use ($config) { |
|
48 | 48 | return $Order->getOrderStatus()->getId() == \Eccube\Entity\Master\OrderStatus::NEW; |
49 | 49 | }); |
50 | 50 | $I->see(count($NewOrders), TopPage::$受付状況_新規受付数); |
@@ -1,7 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Codeception\Util\Fixtures; |
|
4 | - |
|
5 | 3 | /** |
6 | 4 | * @group admin |
7 | 5 | * @group admin01 |
@@ -1,8 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Codeception\Util\Fixtures; |
|
4 | 3 | use Page\Admin\CsvSettingsPage; |
5 | -use Page\Admin\CustomerAgreementSettingPage; |
|
6 | 4 | use Page\Admin\DeliveryEditPage; |
7 | 5 | use Page\Admin\DeliveryManagePage; |
8 | 6 | use Page\Admin\MailSettingsPage; |
@@ -10,7 +8,6 @@ discard block |
||
10 | 8 | use Page\Admin\PaymentManagePage; |
11 | 9 | use Page\Admin\ShopSettingPage; |
12 | 10 | use Page\Admin\TaxManagePage; |
13 | -use Page\Admin\TradelawSettingPage; |
|
14 | 11 | |
15 | 12 | /** |
16 | 13 | * @group admin |
@@ -1,7 +1,6 @@ |
||
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 |
@@ -81,7 +81,7 @@ |
||
81 | 81 | $createCustomer = Fixtures::get('createCustomer'); |
82 | 82 | $customer = $createCustomer(); |
83 | 83 | $I->resetEmails(); |
84 | - $I->submitForm('#form1',[ |
|
84 | + $I->submitForm('#form1', [ |
|
85 | 85 | 'login_email' => $customer->getEmail() |
86 | 86 | ]); |
87 | 87 | $I->see('パスワード発行メールの送信 完了', 'div.ec-pageHeader h1'); |
@@ -153,6 +153,9 @@ discard block |
||
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 |
||
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 | { |
@@ -334,10 +334,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -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; |
@@ -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) { |
@@ -317,7 +317,7 @@ |
||
317 | 317 | private function getFileList($nowDir) |
318 | 318 | { |
319 | 319 | $topDir = $this->getuserDataDir(); |
320 | - $filter = function (\SplFileInfo $file) use ($topDir) { |
|
320 | + $filter = function(\SplFileInfo $file) use ($topDir) { |
|
321 | 321 | $acceptPath = realpath($topDir); |
322 | 322 | $targetPath = $file->getRealPath(); |
323 | 323 |
@@ -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 |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $em->getConfiguration()->setSQLLogger(null); |
289 | 289 | |
290 | 290 | $response = new StreamedResponse(); |
291 | - $response->setCallback(function () use ($request) { |
|
291 | + $response->setCallback(function() use ($request) { |
|
292 | 292 | // CSV種別を元に初期化. |
293 | 293 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
294 | 294 | |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | |
302 | 302 | // データ行の出力. |
303 | 303 | $this->csvExportService->setExportQueryBuilder($qb); |
304 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { |
|
304 | + $this->csvExportService->exportData(function($entity, $csvService) use ($request) { |
|
305 | 305 | $Csvs = $csvService->getCsvs(); |
306 | 306 | |
307 | 307 | /** @var $Customer \Eccube\Entity\Customer */ |
@@ -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 | { |