@@ -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; |
@@ -36,6 +36,9 @@ discard block |
||
36 | 36 | const EVENT_YML = 'event.yml'; |
37 | 37 | private $app; |
38 | 38 | |
39 | + /** |
|
40 | + * @param \Silex\Application $app |
|
41 | + */ |
|
39 | 42 | public function __construct($app) |
40 | 43 | { |
41 | 44 | $this->app = $app; |
@@ -98,6 +101,9 @@ discard block |
||
98 | 101 | } |
99 | 102 | } |
100 | 103 | |
104 | + /** |
|
105 | + * @param string $dir |
|
106 | + */ |
|
101 | 107 | public function unpackPluginArchive($archive, $dir) |
102 | 108 | { |
103 | 109 | $extension = pathinfo($archive, PATHINFO_EXTENSION); |
@@ -116,6 +122,9 @@ discard block |
||
116 | 122 | } |
117 | 123 | } |
118 | 124 | |
125 | + /** |
|
126 | + * @param string $dir |
|
127 | + */ |
|
119 | 128 | public function checkPluginArchiveContent($dir) |
120 | 129 | { |
121 | 130 | $meta = $this->readYml($dir.'/config.yml'); |
@@ -138,6 +147,9 @@ discard block |
||
138 | 147 | } |
139 | 148 | } |
140 | 149 | |
150 | + /** |
|
151 | + * @param string $yml |
|
152 | + */ |
|
141 | 153 | public function readYml($yml) |
142 | 154 | { |
143 | 155 | return Yaml::Parse($yml); |
@@ -151,6 +163,9 @@ discard block |
||
151 | 163 | // ディレクトリ名などに使われれるので厳しめ |
152 | 164 | } |
153 | 165 | |
166 | + /** |
|
167 | + * @param string $path |
|
168 | + */ |
|
154 | 169 | public function deleteFile($path) |
155 | 170 | { |
156 | 171 | $f = new Filesystem(); |
@@ -170,6 +185,9 @@ discard block |
||
170 | 185 | return $this->app['config']['plugin_realdir'].'/'.$name; |
171 | 186 | } |
172 | 187 | |
188 | + /** |
|
189 | + * @param string $d |
|
190 | + */ |
|
173 | 191 | public function createPluginDir($d) |
174 | 192 | { |
175 | 193 | $b = mkdir($d); |
@@ -229,6 +247,9 @@ discard block |
||
229 | 247 | return $p; |
230 | 248 | } |
231 | 249 | |
250 | + /** |
|
251 | + * @param string $method |
|
252 | + */ |
|
232 | 253 | public function callPluginManagerMethod($meta, $method) |
233 | 254 | { |
234 | 255 | $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager'; |
@@ -119,7 +119,7 @@ |
||
119 | 119 | public function checkPluginArchiveContent($dir) |
120 | 120 | { |
121 | 121 | try { |
122 | - $meta = $this->readYml($dir . '/config.yml'); |
|
122 | + $meta = $this->readYml($dir.'/config.yml'); |
|
123 | 123 | } catch (\Symfony\Component\Yaml\Exception\ParseException $e) { |
124 | 124 | $this->app['monolog']->warning($e->getMessage()); |
125 | 125 | throw new PluginException($e->getMessage(), $e->getCode(), $e); |
@@ -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 |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | ->setFax03($Customer->getFax03()) |
271 | 271 | ->setZip01($Customer->getZip01()) |
272 | 272 | ->setZip02($Customer->getZip02()) |
273 | - ->setZipCode($Customer->getZip01() . $Customer->getZip02()) |
|
273 | + ->setZipCode($Customer->getZip01().$Customer->getZip02()) |
|
274 | 274 | ->setPref($Customer->getPref()) |
275 | 275 | ->setAddr01($Customer->getAddr01()) |
276 | 276 | ->setAddr02($Customer->getAddr02()) |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | ->setFax03($CustomerAddress->getFax03()) |
410 | 410 | ->setZip01($CustomerAddress->getZip01()) |
411 | 411 | ->setZip02($CustomerAddress->getZip02()) |
412 | - ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02()) |
|
412 | + ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02()) |
|
413 | 413 | ->setPref($CustomerAddress->getPref()) |
414 | 414 | ->setAddr01($CustomerAddress->getAddr01()) |
415 | 415 | ->setAddr02($CustomerAddress->getAddr02()); |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | ->setFax03($Customer->getFax03()) |
429 | 429 | ->setZip01($Customer->getZip01()) |
430 | 430 | ->setZip02($Customer->getZip02()) |
431 | - ->setZipCode($Customer->getZip01() . $Customer->getZip02()) |
|
431 | + ->setZipCode($Customer->getZip01().$Customer->getZip02()) |
|
432 | 432 | ->setPref($Customer->getPref()) |
433 | 433 | ->setAddr01($Customer->getAddr01()) |
434 | 434 | ->setAddr02($Customer->getAddr02()); |
@@ -913,10 +913,10 @@ discard block |
||
913 | 913 | |
914 | 914 | // 配送日数が設定されている |
915 | 915 | if ($deliveryDateFlag) { |
916 | - $period = new \DatePeriod ( |
|
917 | - new \DateTime($minDate . ' day'), |
|
916 | + $period = new \DatePeriod( |
|
917 | + new \DateTime($minDate.' day'), |
|
918 | 918 | new \DateInterval('P1D'), |
919 | - new \DateTime($minDate + $this->app['config']['deliv_date_end_max'] . ' day') |
|
919 | + new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day') |
|
920 | 920 | ); |
921 | 921 | |
922 | 922 | foreach ($period as $day) { |
@@ -25,7 +25,7 @@ |
||
25 | 25 | require __DIR__.'/../autoload.php'; |
26 | 26 | |
27 | 27 | ini_set('display_errors', 'Off'); |
28 | -error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); |
|
28 | +error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT); |
|
29 | 29 | |
30 | 30 | $app = new Eccube\Application(); |
31 | 31 |