@@ -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) { |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | /** |
| 378 | 378 | * フォームからの入直内容に基づいて、受注情報の再計算を行う |
| 379 | 379 | * |
| 380 | - * @param $app |
|
| 380 | + * @param Application $app |
|
| 381 | 381 | * @param $Order |
| 382 | 382 | */ |
| 383 | 383 | protected function calculate($app, \Eccube\Entity\Order $Order) |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | * - 受注ステータスが入金済に設定された場合に入金日を更新 |
| 472 | 472 | * |
| 473 | 473 | * |
| 474 | - * @param $app |
|
| 474 | + * @param Application $app |
|
| 475 | 475 | * @param $TargetOrder |
| 476 | 476 | * @param $OriginOrder |
| 477 | 477 | */ |
@@ -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 |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | return $phpinfo; |
| 51 | 51 | |
| 52 | - break; |
|
| 52 | + break; |
|
| 53 | 53 | default: |
| 54 | 54 | break; |
| 55 | 55 | } |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | )); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getSystemInfo(Application $app) |
|
| 65 | - { |
|
| 64 | + public function getSystemInfo(Application $app) |
|
| 65 | + { |
|
| 66 | 66 | $system = $app['eccube.service.system']; |
| 67 | 67 | $server = $app['request']; |
| 68 | 68 | |
@@ -78,5 +78,5 @@ discard block |
||
| 78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
| 79 | 79 | |
| 80 | 80 | return $arrSystemInfo; |
| 81 | - } |
|
| 81 | + } |
|
| 82 | 82 | } |
@@ -55,8 +55,8 @@ |
||
| 55 | 55 | new Assert\NotBlank(), |
| 56 | 56 | new Assert\Length(array('max' => $this->config['stext_len'])), |
| 57 | 57 | new Assert\Regex(array( |
| 58 | - 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 59 | - )), |
|
| 58 | + 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 59 | + )), |
|
| 60 | 60 | ), |
| 61 | 61 | )) |
| 62 | 62 | ->add('admin_allow_host', 'textarea', array( |
@@ -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 | |