@@ -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( |
@@ -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 | */ |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){ |
| 56 | 56 | $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START; |
| 57 | 57 | $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END; |
| 58 | - }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ |
|
| 58 | + } elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ |
|
| 59 | 59 | $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START; |
| 60 | 60 | $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END; |
| 61 | - }else{ |
|
| 61 | + } else{ |
|
| 62 | 62 | $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
| 63 | 63 | $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
| 64 | 64 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $result=$qb->getQuery()->getResult(); |
| 83 | 83 | if(count($result)){ |
| 84 | 84 | return $result[0]->getPriority() -1; |
| 85 | - }else{ |
|
| 85 | + } else{ |
|
| 86 | 86 | return $range_start; |
| 87 | 87 | } |
| 88 | 88 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $em->flush(); |
| 120 | 120 | $em->getConnection()->commit(); |
| 121 | 121 | # 移動する |
| 122 | - }else{ |
|
| 122 | + } else{ |
|
| 123 | 123 | # 移動しない |
| 124 | 124 | throw new PluginException("Can't swap"); |
| 125 | 125 | } |
@@ -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 | { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * Returns a list of functions to add to the existing list. |
| 42 | 42 | * |
| 43 | - * @return array An array of functions |
|
| 43 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 44 | 44 | */ |
| 45 | 45 | public function getFunctions() |
| 46 | 46 | { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | /** |
| 62 | 62 | * Returns a list of filters. |
| 63 | 63 | * |
| 64 | - * @return array |
|
| 64 | + * @return \Twig_SimpleFilter[] |
|
| 65 | 65 | */ |
| 66 | 66 | public function getFilters() |
| 67 | 67 | { |
@@ -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()); |
@@ -792,6 +792,7 @@ |
||
| 792 | 792 | * ProductCategory作成 |
| 793 | 793 | * @param \Eccube\Entity\Product $Product |
| 794 | 794 | * @param \Eccube\Entity\Category $Category |
| 795 | + * @param integer $count |
|
| 795 | 796 | * @return \Eccube\Entity\ProductCategory |
| 796 | 797 | */ |
| 797 | 798 | private function createProductCategory($Product, $Category, $count) |
@@ -964,7 +964,7 @@ |
||
| 964 | 964 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
| 965 | 965 | * 備考 : app['debug']がtrueの際は処理を行わない |
| 966 | 966 | * |
| 967 | - * @return boolean true |
|
| 967 | + * @return null|boolean true |
|
| 968 | 968 | * |
| 969 | 969 | */ |
| 970 | 970 | protected function checkDatabaseConnection() |