@@ -24,7 +24,6 @@  | 
                                                    ||
| 24 | 24 | |
| 25 | 25 | namespace Eccube\Command;  | 
                                                        
| 26 | 26 | |
| 27 | -use Symfony\Component\Console\Input\InputArgument;  | 
                                                        |
| 28 | 27 | use Symfony\Component\Console\Input\InputInterface;  | 
                                                        
| 29 | 28 | use Symfony\Component\Console\Output\OutputInterface;  | 
                                                        
| 30 | 29 | use Symfony\Component\Console\Input\InputOption;  | 
                                                        
@@ -55,7 +55,7 @@  | 
                                                    ||
| 55 | 55 | |
| 56 | 56 |      protected function execute(InputInterface $input, OutputInterface $output) { | 
                                                        
| 57 | 57 | |
| 58 | -        \Eccube\Util\Cache::clear($this->app,$input->getOption('all')); | 
                                                        |
| 58 | +        \Eccube\Util\Cache::clear($this->app, $input->getOption('all')); | 
                                                        |
| 59 | 59 |          $output->writeln(sprintf("%s <info>success</info>", 'cache:clear')); | 
                                                        
| 60 | 60 | |
| 61 | 61 | }  | 
                                                        
@@ -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( | 
                                                        
@@ -583,6 +583,8 @@ discard block  | 
                                                    ||
| 583 | 583 | /**  | 
                                                        
| 584 | 584 | * 登録、更新時のエラー画面表示  | 
                                                        
| 585 | 585 | *  | 
                                                        
| 586 | + * @param Application $app  | 
                                                        |
| 587 | + * @param string $twig  | 
                                                        |
| 586 | 588 | */  | 
                                                        
| 587 | 589 | protected function render($app, $form, $headers, $twig)  | 
                                                        
| 588 | 590 |      { | 
                                                        
@@ -615,6 +617,7 @@ discard block  | 
                                                    ||
| 615 | 617 | * アップロードされたCSVファイルの行ごとの処理  | 
                                                        
| 616 | 618 | *  | 
                                                        
| 617 | 619 | * @param $formFile  | 
                                                        
| 620 | + * @param Application $app  | 
                                                        |
| 618 | 621 | * @return CsvImportService  | 
                                                        
| 619 | 622 | */  | 
                                                        
| 620 | 623 | protected function getImportData($app, $formFile)  | 
                                                        
@@ -682,6 +685,8 @@ discard block  | 
                                                    ||
| 682 | 685 | |
| 683 | 686 | /**  | 
                                                        
| 684 | 687 | * 商品カテゴリの削除、登録  | 
                                                        
| 688 | + * @param Application $app  | 
                                                        |
| 689 | + * @param CsvImportService $data  | 
                                                        |
| 685 | 690 | */  | 
                                                        
| 686 | 691 | protected function createProductCategory($row, Product $Product, $app, $data)  | 
                                                        
| 687 | 692 |      { | 
                                                        
@@ -725,6 +730,8 @@ discard block  | 
                                                    ||
| 725 | 730 | |
| 726 | 731 | /**  | 
                                                        
| 727 | 732 | * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成  | 
                                                        
| 733 | + * @param Application $app  | 
                                                        |
| 734 | + * @param CsvImportService $data  | 
                                                        |
| 728 | 735 | */  | 
                                                        
| 729 | 736 | protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)  | 
                                                        
| 730 | 737 |      { | 
                                                        
@@ -866,6 +873,8 @@ discard block  | 
                                                    ||
| 866 | 873 | |
| 867 | 874 | /**  | 
                                                        
| 868 | 875 | * 商品規格情報を更新  | 
                                                        
| 876 | + * @param Application $app  | 
                                                        |
| 877 | + * @param CsvImportService $data  | 
                                                        |
| 869 | 878 | */  | 
                                                        
| 870 | 879 | protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)  | 
                                                        
| 871 | 880 |      { | 
                                                        
@@ -1012,6 +1021,7 @@ discard block  | 
                                                    ||
| 1012 | 1021 | /**  | 
                                                        
| 1013 | 1022 | * 登録、更新時のエラー画面表示  | 
                                                        
| 1014 | 1023 | *  | 
                                                        
| 1024 | + * @param string $message  | 
                                                        |
| 1015 | 1025 | */  | 
                                                        
| 1016 | 1026 | protected function addErrors($message)  | 
                                                        
| 1017 | 1027 |      { | 
                                                        
@@ -176,7 +176,7 @@  | 
                                                    ||
| 176 | 176 |                          if ($row['商品削除フラグ'] == '') { | 
                                                        
| 177 | 177 | $Product->setDelFlg(Constant::DISABLED);  | 
                                                        
| 178 | 178 |                          } else { | 
                                                        
| 179 | -                            if ($row['商品削除フラグ'] == (string)Constant::DISABLED || $row['商品削除フラグ'] == (string)Constant::ENABLED) { | 
                                                        |
| 179 | +                            if ($row['商品削除フラグ'] == (string) Constant::DISABLED || $row['商品削除フラグ'] == (string) Constant::ENABLED) { | 
                                                        |
| 180 | 180 | $Product->setDelFlg($row['商品削除フラグ']);  | 
                                                        
| 181 | 181 |                              } else { | 
                                                        
| 182 | 182 | $this->addErrors(($data->key() + 1).'行目の商品削除フラグが設定されていません。');  | 
                                                        
@@ -28,7 +28,6 @@  | 
                                                    ||
| 28 | 28 | use Eccube\Entity\Master\DeviceType;  | 
                                                        
| 29 | 29 | use Eccube\Util\Str;  | 
                                                        
| 30 | 30 | use Symfony\Component\Filesystem\Filesystem;  | 
                                                        
| 31 | -use Symfony\Component\Finder\Finder;  | 
                                                        |
| 32 | 31 | use Symfony\Component\Form\FormError;  | 
                                                        
| 33 | 32 | use Symfony\Component\HttpFoundation\Request;  | 
                                                        
| 34 | 33 | use Symfony\Component\HttpFoundation\Response;  | 
                                                        
@@ -250,6 +250,9 @@  | 
                                                    ||
| 250 | 250 | }  | 
                                                        
| 251 | 251 | |
| 252 | 252 | |
| 253 | + /**  | 
                                                        |
| 254 | + * @param InstallApplication $app  | 
                                                        |
| 255 | + */  | 
                                                        |
| 253 | 256 | private function checkModules($app)  | 
                                                        
| 254 | 257 |      { | 
                                                        
| 255 | 258 |          foreach ($this->required_modules as $module) { | 
                                                        
@@ -171,7 +171,7 @@  | 
                                                    ||
| 171 | 171 |                  if (count($allowHost) > 0) { | 
                                                        
| 172 | 172 |                      $sessionData['admin_allow_hosts'] = Str::convertLineFeed(implode("\n", $allowHost)); | 
                                                        
| 173 | 173 | }  | 
                                                        
| 174 | - $sessionData['admin_force_ssl'] = (bool)$config['force_ssl'];  | 
                                                        |
| 174 | + $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];  | 
                                                        |
| 175 | 175 | |
| 176 | 176 | // メール設定  | 
                                                        
| 177 | 177 | $config_file = $this->config_path.'/mail.yml';  | 
                                                        
@@ -1188,6 +1188,7 @@  | 
                                                    ||
| 1188 | 1188 | |
| 1189 | 1189 | /**  | 
                                                        
| 1190 | 1190 | * 非会員でのお客様情報変更時の入力チェック  | 
                                                        
| 1191 | + * @param Application $app  | 
                                                        |
| 1191 | 1192 | */  | 
                                                        
| 1192 | 1193 |      private function customerValidation($app, $data) { | 
                                                        
| 1193 | 1194 | |
@@ -1333,7 +1333,7 @@  | 
                                                    ||
| 1333 | 1333 | |
| 1334 | 1334 | $errors[] = $app['validator']->validateValue($data['customer_name02'], array(  | 
                                                        
| 1335 | 1335 | new Assert\NotBlank(),  | 
                                                        
| 1336 | -            new Assert\Length(array('max' => $app['config']['name_len'], )), | 
                                                        |
| 1336 | +            new Assert\Length(array('max' => $app['config']['name_len'],)), | 
                                                        |
| 1337 | 1337 |              new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace')) | 
                                                        
| 1338 | 1338 | ));  | 
                                                        
| 1339 | 1339 | |
@@ -42,7 +42,7 @@  | 
                                                    ||
| 42 | 42 | |
| 43 | 43 | /**  | 
                                                        
| 44 | 44 | * @param ObjectManager $om  | 
                                                        
| 45 | - * @param stging $className  | 
                                                        |
| 45 | + * @param string $className  | 
                                                        |
| 46 | 46 | */  | 
                                                        
| 47 | 47 | public function __construct(ObjectManager $om, $className)  | 
                                                        
| 48 | 48 |      { |