@@ -326,7 +326,6 @@ |
||
| 326 | 326 | |
| 327 | 327 | /** |
| 328 | 328 | * @param $row |
| 329 | - * @param null $callback |
|
| 330 | 329 | */ |
| 331 | 330 | public function fputcsv($row) |
| 332 | 331 | { |
@@ -16,7 +16,10 @@ discard block |
||
| 16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
| 17 | 17 | use Doctrine\Common\Util\ClassUtils; |
| 18 | 18 | use Doctrine\ORM\EntityManagerInterface; |
| 19 | +use Doctrine\ORM\QueryBuilder; |
|
| 19 | 20 | use Eccube\Common\EccubeConfig; |
| 21 | +use Eccube\Entity\Csv; |
|
| 22 | +use Eccube\Entity\Master\CsvType; |
|
| 20 | 23 | use Eccube\Form\Type\Admin\SearchProductType; |
| 21 | 24 | use Eccube\Form\Type\Admin\SearchShippingType; |
| 22 | 25 | use Eccube\Repository\CsvRepository; |
@@ -29,9 +32,6 @@ discard block |
||
| 29 | 32 | use Eccube\Util\FormUtil; |
| 30 | 33 | use Symfony\Component\Form\FormFactoryInterface; |
| 31 | 34 | use Symfony\Component\HttpFoundation\Request; |
| 32 | -use Doctrine\ORM\QueryBuilder; |
|
| 33 | -use Eccube\Entity\Master\CsvType; |
|
| 34 | -use Eccube\Entity\Csv; |
|
| 35 | 35 | |
| 36 | 36 | class CsvExportService |
| 37 | 37 | { |
@@ -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. |
@@ -53,6 +53,9 @@ |
||
| 53 | 53 | $this->params = $params; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | + /** |
|
| 57 | + * @param Expr\Comparison $expr |
|
| 58 | + */ |
|
| 56 | 59 | private static function newWhereClause($expr, $x, $y) |
| 57 | 60 | { |
| 58 | 61 | if ($y) { |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Doctrine\Query; |
| 15 | 15 | |
| 16 | -use Doctrine\ORM\Query\Expr; |
|
| 17 | 16 | use Doctrine\ORM\QueryBuilder; |
| 17 | +use Doctrine\ORM\Query\Expr; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * WHERE句を組み立てるクラス。 |
@@ -817,7 +817,7 @@ |
||
| 817 | 817 | if ($dispatcher instanceof Response |
| 818 | 818 | && ($dispatcher->isRedirection() || $dispatcher->getContent()) |
| 819 | 819 | ) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
| 820 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
| 820 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
| 821 | 821 | } |
| 822 | 822 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
| 823 | 823 | if (!$PaymentResult->isSuccess()) { |
@@ -689,12 +689,12 @@ |
||
| 689 | 689 | $builder = $this->formFactory->createBuilder(OrderType::class, $Order); |
| 690 | 690 | |
| 691 | 691 | $event = new EventArgs( |
| 692 | - [ |
|
| 693 | - 'builder' => $builder, |
|
| 694 | - 'Order' => $Order, |
|
| 695 | - ], |
|
| 696 | - $request |
|
| 697 | - ); |
|
| 692 | + [ |
|
| 693 | + 'builder' => $builder, |
|
| 694 | + 'Order' => $Order, |
|
| 695 | + ], |
|
| 696 | + $request |
|
| 697 | + ); |
|
| 698 | 698 | $this->eventDispatcher->dispatch(EccubeEvents::FRONT_SHOPPING_INDEX_INITIALIZE, $event); |
| 699 | 699 | |
| 700 | 700 | $form = $builder->getForm(); |
@@ -16,7 +16,6 @@ |
||
| 16 | 16 | * This method should only be used to configure services and parameters. |
| 17 | 17 | * It should not get services. |
| 18 | 18 | * |
| 19 | - * @param Container $pimple A container instance |
|
| 20 | 19 | */ |
| 21 | 20 | public function register(Container $app) |
| 22 | 21 | { |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | use Eccube\Entity\Plugin; |
| 34 | 34 | use Eccube\Entity\PluginEventHandler; |
| 35 | 35 | use Eccube\Exception\PluginException; |
| 36 | -use Eccube\Plugin\ConfigManager; |
|
| 37 | 36 | use Eccube\Plugin\ConfigManager as PluginConfigManager; |
| 38 | 37 | use Eccube\Repository\PluginEventHandlerRepository; |
| 39 | 38 | use Eccube\Repository\PluginRepository; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @param string $path path to tar.gz/zip plugin file |
| 148 | 148 | * @param int $source |
| 149 | 149 | * |
| 150 | - * @return mixed |
|
| 150 | + * @return boolean |
|
| 151 | 151 | * |
| 152 | 152 | * @throws PluginException |
| 153 | 153 | * @throws \Exception |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | /** |
| 277 | - * @param $archive |
|
| 278 | - * @param $dir |
|
| 277 | + * @param string $archive |
|
| 278 | + * @param string $dir |
|
| 279 | 279 | * |
| 280 | 280 | * @throws PluginException |
| 281 | 281 | */ |
@@ -344,6 +344,9 @@ discard block |
||
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | + /** |
|
| 348 | + * @param string $yml |
|
| 349 | + */ |
|
| 347 | 350 | public function readYml($yml) |
| 348 | 351 | { |
| 349 | 352 | if (file_exists($yml)) { |
@@ -361,6 +364,9 @@ discard block |
||
| 361 | 364 | // ディレクトリ名などに使われれるので厳しめ |
| 362 | 365 | } |
| 363 | 366 | |
| 367 | + /** |
|
| 368 | + * @param string $path |
|
| 369 | + */ |
|
| 364 | 370 | public function deleteFile($path) |
| 365 | 371 | { |
| 366 | 372 | $f = new Filesystem(); |
@@ -381,7 +387,7 @@ discard block |
||
| 381 | 387 | } |
| 382 | 388 | |
| 383 | 389 | /** |
| 384 | - * @param $d |
|
| 390 | + * @param string $d |
|
| 385 | 391 | * |
| 386 | 392 | * @throws PluginException |
| 387 | 393 | */ |
@@ -456,7 +462,7 @@ discard block |
||
| 456 | 462 | |
| 457 | 463 | /** |
| 458 | 464 | * @param $meta |
| 459 | - * @param $method |
|
| 465 | + * @param string $method |
|
| 460 | 466 | */ |
| 461 | 467 | public function callPluginManagerMethod($meta, $method) |
| 462 | 468 | { |
@@ -997,7 +1003,7 @@ discard block |
||
| 997 | 1003 | * [プラグインコード]/Resource/assets |
| 998 | 1004 | * 配下に置かれているファイルが所定の位置へコピーされる |
| 999 | 1005 | * |
| 1000 | - * @param $pluginBaseDir |
|
| 1006 | + * @param string $pluginBaseDir |
|
| 1001 | 1007 | * @param $pluginCode |
| 1002 | 1008 | */ |
| 1003 | 1009 | public function copyAssets($pluginBaseDir, $pluginCode) |
@@ -1033,7 +1039,7 @@ discard block |
||
| 1033 | 1039 | * @param string $pluginVersion |
| 1034 | 1040 | * @param string $remoteVersion |
| 1035 | 1041 | * |
| 1036 | - * @return mixed |
|
| 1042 | + * @return boolean |
|
| 1037 | 1043 | */ |
| 1038 | 1044 | public function isUpdate($pluginVersion, $remoteVersion) |
| 1039 | 1045 | { |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * |
| 28 | 28 | * @param Application $app |
| 29 | 29 | * |
| 30 | - * @return \Symfony\Component\HttpFoundation\Response |
|
| 30 | + * @return string |
|
| 31 | 31 | */ |
| 32 | 32 | public function testAdmin(Application $app) |
| 33 | 33 | { |
@@ -12,6 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | class DragAndDropBy extends WebDriverActions |
| 14 | 14 | { |
| 15 | + /** |
|
| 16 | + * @param \Facebook\WebDriver\Remote\RemoteWebElement $source |
|
| 17 | + */ |
|
| 15 | 18 | public function __construct(WebDriver $driver, $source, $x_offset, $y_offset) |
| 16 | 19 | { |
| 17 | 20 | parent::__construct($driver); |
@@ -14,6 +14,9 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | private $timeout_in_second; |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param integer $timeout_in_second |
|
| 19 | + */ |
|
| 17 | 20 | function __construct($timeout_in_second) |
| 18 | 21 | { |
| 19 | 22 | $this->timeout_in_second = $timeout_in_second; |