@@ -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 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | $MailHistory = new MailHistory(); |
| 223 | 223 | $MailHistory |
| 224 | - ->setSubject('[' . $app['eccube.repository.base_info']->get()->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
| 224 | + ->setSubject('['.$app['eccube.repository.base_info']->get()->getShopName().'] '.$MailTemplate->getSubject()) |
|
| 225 | 225 | ->setMailBody($body) |
| 226 | 226 | ->setMailTemplate($MailTemplate) |
| 227 | 227 | ->setSendDate(new \DateTime()) |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | ->setTel03($data['customer_tel03']) |
| 635 | 635 | ->setZip01($data['customer_zip01']) |
| 636 | 636 | ->setZip02($data['customer_zip02']) |
| 637 | - ->setZipCode($data['customer_zip01'] . $data['customer_zip02']) |
|
| 637 | + ->setZipCode($data['customer_zip01'].$data['customer_zip02']) |
|
| 638 | 638 | ->setPref($pref) |
| 639 | 639 | ->setAddr01($data['customer_addr01']) |
| 640 | 640 | ->setAddr02($data['customer_addr02']) |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | ->setTel03($data['tel03']) |
| 734 | 734 | ->setZip01($data['zip01']) |
| 735 | 735 | ->setZip02($data['zip02']) |
| 736 | - ->setZipCode($data['zip01'] . $data['zip02']) |
|
| 736 | + ->setZipCode($data['zip01'].$data['zip02']) |
|
| 737 | 737 | ->setPref($data['pref']) |
| 738 | 738 | ->setAddr01($data['addr01']) |
| 739 | 739 | ->setAddr02($data['addr02']); |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | ->setTel03($data['tel03']) |
| 753 | 753 | ->setZip01($data['zip01']) |
| 754 | 754 | ->setZip02($data['zip02']) |
| 755 | - ->setZipCode($data['zip01'] . $data['zip02']) |
|
| 755 | + ->setZipCode($data['zip01'].$data['zip02']) |
|
| 756 | 756 | ->setPref($data['pref']) |
| 757 | 757 | ->setAddr01($data['addr01']) |
| 758 | 758 | ->setAddr02($data['addr02']) |
@@ -1070,7 +1070,7 @@ discard block |
||
| 1070 | 1070 | |
| 1071 | 1071 | $errors[] = $app['validator']->validateValue($data['customer_name02'], array( |
| 1072 | 1072 | new Assert\NotBlank(), |
| 1073 | - new Assert\Length(array('max' => $app['config']['name_len'], )), |
|
| 1073 | + new Assert\Length(array('max' => $app['config']['name_len'],)), |
|
| 1074 | 1074 | new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace')) |
| 1075 | 1075 | )); |
| 1076 | 1076 | |
@@ -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 | { |
@@ -36,6 +36,9 @@ |
||
| 36 | 36 | { |
| 37 | 37 | protected $app; |
| 38 | 38 | |
| 39 | + /** |
|
| 40 | + * @param \Silex\Application $app |
|
| 41 | + */ |
|
| 39 | 42 | public function __construct($app) |
| 40 | 43 | { |
| 41 | 44 | $this->app = $app; |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | ))); |
| 92 | 92 | |
| 93 | 93 | $app = $this->app; |
| 94 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 94 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 95 | 95 | // モーダルからのPOST時に、金額等をセットする. |
| 96 | 96 | if ('modal' === $app['request']->get('modal')) { |
| 97 | 97 | $data = $event->getData(); |
@@ -25,9 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | use Symfony\Component\Form\AbstractType; |
| 27 | 27 | use Symfony\Component\Form\FormBuilderInterface; |
| 28 | -use Symfony\Component\Form\FormEvents; |
|
| 29 | 28 | use Symfony\Component\Validator\Constraints as Assert; |
| 30 | -use Symfony\Component\OptionsResolver\Options; |
|
| 31 | 29 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 32 | 30 | |
| 33 | 31 | /** |
@@ -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 | */ |
@@ -201,7 +201,7 @@ |
||
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /** |
| 204 | - * @param \Eccube\Entity\ProductClass|integer $ProductClass |
|
| 204 | + * @param string $ProductClass |
|
| 205 | 205 | * @param integer $quantity |
| 206 | 206 | * @return \Eccube\Service\CartService |
| 207 | 207 | * @throws CartException |
@@ -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 |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | { |
| 308 | 308 | $config = $this->config; |
| 309 | 309 | |
| 310 | - return function ($value) use ($config) { |
|
| 310 | + return function($value) use ($config) { |
|
| 311 | 311 | return mb_convert_encoding( |
| 312 | 312 | (string) $value, $config['csv_export_encoding'], 'UTF-8' |
| 313 | 313 | ); |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | if ($Conditions instanceof ArrayCollection) { |
| 432 | 432 | $Conditions = new ArrayCollection( |
| 433 | 433 | array_map( |
| 434 | - function ($Entity) use ($em) { |
|
| 434 | + function($Entity) use ($em) { |
|
| 435 | 435 | return $em->getRepository(get_class($Entity))->find($Entity->getId()); |
| 436 | 436 | }, $Conditions->toArray() |
| 437 | 437 | ) |
@@ -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 | { |
@@ -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]> |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $this->file = $file; |
| 119 | 119 | $this->file->setFlags( |
| 120 | - \SplFileObject::READ_CSV | |
|
| 121 | - \SplFileObject::SKIP_EMPTY | |
|
| 122 | - \SplFileObject::READ_AHEAD | |
|
| 120 | + \SplFileObject::READ_CSV| |
|
| 121 | + \SplFileObject::SKIP_EMPTY| |
|
| 122 | + \SplFileObject::READ_AHEAD| |
|
| 123 | 123 | \SplFileObject::DROP_NEW_LINE |
| 124 | 124 | ); |
| 125 | 125 | $this->file->setCsvControl( |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | if ($count > 1) { |
| 359 | 359 | $incrementedHeaders[] = $header; |
| 360 | 360 | for ($i = 1; $i < $count; $i++) { |
| 361 | - $incrementedHeaders[] = $header . $i; |
|
| 361 | + $incrementedHeaders[] = $header.$i; |
|
| 362 | 362 | } |
| 363 | 363 | } else { |
| 364 | 364 | $incrementedHeaders[] = $header; |