| @@ -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; | 
| @@ -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; | 
| @@ -26,7 +26,6 @@ | ||
| 26 | 26 | |
| 27 | 27 | use Eccube\Common\Constant; | 
| 28 | 28 | use Eccube\Util\EntityUtil; | 
| 29 | -use Symfony\Component\Form\FormFactory; | |
| 30 | 29 | use Symfony\Component\HttpFoundation\Request; | 
| 31 | 30 | |
| 32 | 31 | class CsvExportService | 
| @@ -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]> | 
| @@ -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 | } | 
| @@ -72,10 +72,10 @@ | ||
| 72 | 72 | 'required' => false, | 
| 73 | 73 | )) | 
| 74 | 74 |              ->add('Category', 'category', array( | 
| 75 | - 'label' => '商品カテゴリ', | |
| 76 | - 'multiple' => true, | |
| 77 | - 'expanded' => true, | |
| 78 | - 'mapped' => false, | |
| 75 | + 'label' => '商品カテゴリ', | |
| 76 | + 'multiple' => true, | |
| 77 | + 'expanded' => true, | |
| 78 | + 'mapped' => false, | |
| 79 | 79 | )) | 
| 80 | 80 | |
| 81 | 81 | // 詳細な説明 | 
| @@ -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 | |
| @@ -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 | } |