| @@ -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 | */ | 
| @@ -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 | 
| @@ -17,8 +17,8 @@ | ||
| 17 | 17 | $config->registerMigrationsFromDirectory($migrationFilePath ); | 
| 18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); | 
| 19 | 19 | $migration = new Migration($config); | 
| 20 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする | |
| 21 | - // 0か'first'を渡すと最初に戻る | |
| 20 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする | |
| 21 | + // 0か'first'を渡すと最初に戻る | |
| 22 | 22 | $migration->migrate($version, false); | 
| 23 | 23 | |
| 24 | 24 | |
| @@ -274,7 +274,7 @@ | ||
| 274 | 274 |              $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; | 
| 275 | 275 | $qb | 
| 276 | 276 |                  ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . | 
| 277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') | |
| 277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') | |
| 278 | 278 |                  ->setParameter('multi', $multi) | 
| 279 | 279 |                  ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); | 
| 280 | 280 | } | 
| @@ -73,17 +73,17 @@ discard block | ||
| 73 | 73 | |
| 74 | 74 |          $qb = $this->createQueryBuilder('e'); | 
| 75 | 75 |          $qb->andWhere("e.priority >= $range_end ") | 
| 76 | -           ->andWhere("e.priority <= $range_start ") | |
| 77 | -           ->andWhere('e.event = :event') | |
| 78 | -           ->setParameter('event',$event) | |
| 79 | - ->setMaxResults(1) | |
| 80 | -           ->orderBy('e.priority','ASC'); | |
| 76 | +            ->andWhere("e.priority <= $range_start ") | |
| 77 | +            ->andWhere('e.event = :event') | |
| 78 | +            ->setParameter('event',$event) | |
| 79 | + ->setMaxResults(1) | |
| 80 | +            ->orderBy('e.priority','ASC'); | |
| 81 | 81 | |
| 82 | 82 | $result=$qb->getQuery()->getResult(); | 
| 83 | 83 |          if(count($result)){ | 
| 84 | - return $result[0]->getPriority() -1; | |
| 84 | + return $result[0]->getPriority() -1; | |
| 85 | 85 |          }else{ | 
| 86 | - return $range_start; | |
| 86 | + return $range_start; | |
| 87 | 87 | } | 
| 88 | 88 | |
| 89 | 89 | } | 
| @@ -96,14 +96,14 @@ discard block | ||
| 96 | 96 |          $qb = $this->createQueryBuilder('e'); | 
| 97 | 97 | |
| 98 | 98 |          $qb->andWhere("e.priority >= $range_end ") | 
| 99 | -           ->andWhere("e.priority <= $range_start ") | |
| 100 | -           ->andWhere("e.del_flg = 0 ")  | |
| 101 | -           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri') | |
| 102 | -           ->andWhere('e.event = :event') | |
| 103 | -           ->setParameter('event',$pluginEventHandler->getEvent()) | |
| 104 | -           ->setParameter('pri',  $pluginEventHandler->getPriority()  ) | |
| 105 | - ->setMaxResults(1) | |
| 106 | -           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  ); | |
| 99 | +            ->andWhere("e.priority <= $range_start ") | |
| 100 | +            ->andWhere("e.del_flg = 0 ")  | |
| 101 | +            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri') | |
| 102 | +            ->andWhere('e.event = :event') | |
| 103 | +            ->setParameter('event',$pluginEventHandler->getEvent()) | |
| 104 | +            ->setParameter('pri',  $pluginEventHandler->getPriority()  ) | |
| 105 | + ->setMaxResults(1) | |
| 106 | +            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  ); | |
| 107 | 107 | |
| 108 | 108 | $result=$qb->getQuery()->getResult(); | 
| 109 | 109 | |
| @@ -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 |      { |