| @@ -230,6 +230,10 @@ discard block | ||
| 230 | 230 | return $str; | 
| 231 | 231 | } | 
| 232 | 232 | |
| 233 | + /** | |
| 234 | + * @param string $topDir | |
| 235 | + * @param Request $request | |
| 236 | + */ | |
| 233 | 237 | private function getTree($topDir, $request) | 
| 234 | 238 |      { | 
| 235 | 239 | $finder = Finder::create()->in($topDir) | 
| @@ -267,6 +271,10 @@ discard block | ||
| 267 | 271 | return $tree; | 
| 268 | 272 | } | 
| 269 | 273 | |
| 274 | + /** | |
| 275 | + * @param Application $app | |
| 276 | + * @param string $nowDir | |
| 277 | + */ | |
| 270 | 278 | private function getFileList($app, $nowDir) | 
| 271 | 279 |      { | 
| 272 | 280 | $topDir = $app['config']['user_data_realdir']; | 
| @@ -326,6 +334,9 @@ discard block | ||
| 326 | 334 | return (strpos($targetDir, $topDir) === 0); | 
| 327 | 335 | } | 
| 328 | 336 | |
| 337 | + /** | |
| 338 | + * @return string | |
| 339 | + */ | |
| 329 | 340 | private function convertStrFromServer($target) | 
| 330 | 341 |      { | 
| 331 | 342 |          if ($this->encode == self::SJIS) { | 
| @@ -259,6 +259,9 @@ | ||
| 259 | 259 | } | 
| 260 | 260 | |
| 261 | 261 | |
| 262 | + /** | |
| 263 | + * @param Application $app | |
| 264 | + */ | |
| 262 | 265 | private function createBody($app, $header, $footer, $Order) | 
| 263 | 266 |      { | 
| 264 | 267 |          return $app->renderView('Mail/order.twig', array( | 
| @@ -130,7 +130,7 @@ | ||
| 130 | 130 | /** | 
| 131 | 131 | * @param \Eccube\Entity\Member $Member | 
| 132 | 132 | * | 
| 133 | - * @return void | |
| 133 | + * @return boolean | |
| 134 | 134 | */ | 
| 135 | 135 | public function up(\Eccube\Entity\Member $Member) | 
| 136 | 136 |      { | 
| @@ -65,7 +65,7 @@ | ||
| 65 | 65 | * @param int|null|\Eccube\Entity\ProductClass $ProductClass 商品規格 | 
| 66 | 66 | * @param int|null|\Eccube\Entity\Master\Pref $Pref 都道府県 | 
| 67 | 67 | * @param int|null|\Eccube\Entity\Master\Country $Country 国 | 
| 68 | - * @return \Eccube\Entity\TaxRule 税設定情報 | |
| 68 | + * @return integer 税設定情報 | |
| 69 | 69 | * | 
| 70 | 70 | * @throws NoResultException | 
| 71 | 71 | */ | 
| @@ -23,8 +23,6 @@ | ||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Service; | 
| 25 | 25 | |
| 26 | -use Eccube\Application; | |
| 27 | - | |
| 28 | 26 | |
| 29 | 27 | /** | 
| 30 | 28 | * Copyright (C) 2012-2014 David de Boer <[email protected]> | 
| @@ -137,7 +137,7 @@ | ||
| 137 | 137 | * 仮受注情報作成 | 
| 138 | 138 | * | 
| 139 | 139 | * @param $Customer | 
| 140 | - * @param $preOrderId | |
| 140 | + * @param string $preOrderId | |
| 141 | 141 | * @return mixed | 
| 142 | 142 | * @throws \Doctrine\ORM\NoResultException | 
| 143 | 143 | * @throws \Doctrine\ORM\NonUniqueResultException | 
| @@ -325,7 +325,6 @@ discard block | ||
| 325 | 325 | |
| 326 | 326 | /** | 
| 327 | 327 | * @param $row | 
| 328 | - * @param null $callback | |
| 329 | 328 | */ | 
| 330 | 329 | public function fputcsv($row) | 
| 331 | 330 |      { | 
| @@ -424,7 +423,6 @@ discard block | ||
| 424 | 423 | * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している | 
| 425 | 424 | * | 
| 426 | 425 | * @param array $searchData セッションから取得した検索条件の配列 | 
| 427 | - * @param EntityManager $em | |
| 428 | 426 | */ | 
| 429 | 427 | protected function findDeserializeObjects(array &$searchData) | 
| 430 | 428 |      { | 
| @@ -27,7 +27,6 @@ | ||
| 27 | 27 | use Doctrine\Common\Collections\ArrayCollection; | 
| 28 | 28 | use Eccube\Common\Constant; | 
| 29 | 29 | use Eccube\Util\EntityUtil; | 
| 30 | -use Symfony\Component\Form\FormFactory; | |
| 31 | 30 | use Symfony\Component\HttpFoundation\Request; | 
| 32 | 31 | |
| 33 | 32 | class CsvExportService | 
| @@ -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) | 
| @@ -529,6 +529,9 @@ discard block | ||
| 529 | 529 | /** | 
| 530 | 530 | * 登録、更新時のエラー画面表示 | 
| 531 | 531 | * | 
| 532 | + * @param Application $app | |
| 533 | + * @param boolean $not_product_class | |
| 534 | + * @param \Symfony\Component\Form\FormInterface $classForm | |
| 532 | 535 | */ | 
| 533 | 536 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) | 
| 534 | 537 |      { | 
| @@ -580,6 +583,7 @@ discard block | ||
| 580 | 583 | |
| 581 | 584 | /** | 
| 582 | 585 | * 規格1と規格2を組み合わせた商品規格を作成 | 
| 586 | + * @param Application $app | |
| 583 | 587 | */ | 
| 584 | 588 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) | 
| 585 | 589 |      { | 
| @@ -667,6 +671,7 @@ discard block | ||
| 667 | 671 | * | 
| 668 | 672 | * @param $productClassDest コピー先となる商品規格 | 
| 669 | 673 | * @param $productClassOrig コピー元となる商品規格 | 
| 674 | + * @param Application $app | |
| 670 | 675 | */ | 
| 671 | 676 |      private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { | 
| 672 | 677 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |