@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | /** |
42 | 42 | * @deprecated 呼び出し元で制御する |
43 | - * @param $id |
|
43 | + * @param integer $id |
|
44 | 44 | * @return \Eccube\Entity\Delivery|null|object |
45 | 45 | */ |
46 | 46 | public function findOrCreate($id) |
@@ -77,6 +77,9 @@ discard block |
||
77 | 77 | const CONFIG_YML = 'config.yml'; |
78 | 78 | const EVENT_YML = 'event.yml'; |
79 | 79 | |
80 | + /** |
|
81 | + * @param string $path |
|
82 | + */ |
|
80 | 83 | public function install($path, $source = 0) |
81 | 84 | { |
82 | 85 | $pluginBaseDir = null; |
@@ -137,6 +140,9 @@ discard block |
||
137 | 140 | } |
138 | 141 | } |
139 | 142 | |
143 | + /** |
|
144 | + * @param string $dir |
|
145 | + */ |
|
140 | 146 | public function unpackPluginArchive($archive, $dir) |
141 | 147 | { |
142 | 148 | $extension = pathinfo($archive, PATHINFO_EXTENSION); |
@@ -196,6 +202,9 @@ discard block |
||
196 | 202 | } |
197 | 203 | } |
198 | 204 | |
205 | + /** |
|
206 | + * @param string $yml |
|
207 | + */ |
|
199 | 208 | public function readYml($yml) |
200 | 209 | { |
201 | 210 | if (file_exists($yml)) { |
@@ -213,6 +222,9 @@ discard block |
||
213 | 222 | // ディレクトリ名などに使われれるので厳しめ |
214 | 223 | } |
215 | 224 | |
225 | + /** |
|
226 | + * @param string $path |
|
227 | + */ |
|
216 | 228 | public function deleteFile($path) |
217 | 229 | { |
218 | 230 | $f = new Filesystem(); |
@@ -232,6 +244,9 @@ discard block |
||
232 | 244 | return $this->appConfig['plugin_realdir'].'/'.$name; |
233 | 245 | } |
234 | 246 | |
247 | + /** |
|
248 | + * @param string $d |
|
249 | + */ |
|
235 | 250 | public function createPluginDir($d) |
236 | 251 | { |
237 | 252 | $b = @mkdir($d); |
@@ -291,6 +306,9 @@ discard block |
||
291 | 306 | return $p; |
292 | 307 | } |
293 | 308 | |
309 | + /** |
|
310 | + * @param string $method |
|
311 | + */ |
|
294 | 312 | public function callPluginManagerMethod($meta, $method) |
295 | 313 | { |
296 | 314 | $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager'; |
@@ -363,6 +381,9 @@ discard block |
||
363 | 381 | return true; |
364 | 382 | } |
365 | 383 | |
384 | + /** |
|
385 | + * @param string $path |
|
386 | + */ |
|
366 | 387 | public function update(\Eccube\Entity\Plugin $plugin, $path) |
367 | 388 | { |
368 | 389 | $pluginBaseDir = null; |
@@ -31,7 +31,6 @@ |
||
31 | 31 | use Eccube\Common\Constant; |
32 | 32 | use Eccube\Entity\Plugin; |
33 | 33 | use Eccube\Exception\PluginException; |
34 | -use Eccube\Plugin\ConfigManager; |
|
35 | 34 | use Eccube\Plugin\ConfigManager as PluginConfigManager; |
36 | 35 | use Eccube\Repository\PluginEventHandlerRepository; |
37 | 36 | use Eccube\Repository\PluginRepository; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | // Proxyのクラスをロードせずにスキーマを更新するために、 |
99 | 99 | // インストール時には一時的なディレクトリにProxyを生成する |
100 | - $tmpProxyOutputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12); |
|
100 | + $tmpProxyOutputDir = sys_get_temp_dir().'/proxy_'.Str::random(12); |
|
101 | 101 | @mkdir($tmpProxyOutputDir); |
102 | 102 | |
103 | 103 | try { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | if (!empty($config_cache)) { |
190 | 190 | $meta = $config_cache; |
191 | 191 | } else { |
192 | - $meta = $this->readYml($dir . '/config.yml'); |
|
192 | + $meta = $this->readYml($dir.'/config.yml'); |
|
193 | 193 | } |
194 | 194 | } catch (\Symfony\Component\Yaml\Exception\ParseException $e) { |
195 | 195 | throw new PluginException($e->getMessage(), $e->getCode(), $e); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * 非会員情報を取得 |
222 | 222 | * |
223 | - * @param $sesisonKey |
|
223 | + * @param string $sesisonKey |
|
224 | 224 | * @return $Customer|null |
225 | 225 | */ |
226 | 226 | public function getNonMember($sesisonKey) |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | /** |
253 | 253 | * 受注情報を作成 |
254 | 254 | * |
255 | - * @param $Customer |
|
255 | + * @param null|Customer $Customer |
|
256 | 256 | * @return \Eccube\Entity\Order |
257 | 257 | */ |
258 | 258 | public function createOrder($Customer) |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | * 仮受注情報作成 |
282 | 282 | * |
283 | 283 | * @param $Customer |
284 | - * @param $preOrderId |
|
284 | + * @param string $preOrderId |
|
285 | 285 | * @return mixed |
286 | 286 | * @throws \Doctrine\ORM\NoResultException |
287 | 287 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -1403,7 +1403,7 @@ discard block |
||
1403 | 1403 | * 受注メール送信を行う |
1404 | 1404 | * |
1405 | 1405 | * @param Order $Order |
1406 | - * @return MailHistory |
|
1406 | + * @return null|\Symfony\Component\HttpFoundation\Request |
|
1407 | 1407 | */ |
1408 | 1408 | public function sendOrderMail(Order $Order) |
1409 | 1409 | { |
@@ -1117,7 +1117,7 @@ |
||
1117 | 1117 | |
1118 | 1118 | // 配送日数が設定されている |
1119 | 1119 | if ($deliveryDateFlag) { |
1120 | - $period = new \DatePeriod ( |
|
1120 | + $period = new \DatePeriod( |
|
1121 | 1121 | new \DateTime($minDate.' day'), |
1122 | 1122 | new \DateInterval('P1D'), |
1123 | 1123 | new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day') |
@@ -23,7 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace Eccube\Service; |
25 | 25 | |
26 | -use Doctrine\DBAL\LockMode; |
|
27 | 26 | use Doctrine\ORM\EntityManager; |
28 | 27 | use Eccube\Annotation\Inject; |
29 | 28 | use Eccube\Annotation\Service; |
@@ -817,7 +817,7 @@ |
||
817 | 817 | if ($dispatcher instanceof Response |
818 | 818 | && ($dispatcher->isRedirection() || $dispatcher->getContent()) |
819 | 819 | ) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
820 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
820 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
821 | 821 | } |
822 | 822 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
823 | 823 | if (!$PaymentResult->isSuccess()) { |
@@ -194,7 +194,7 @@ |
||
194 | 194 | ); |
195 | 195 | $addCartForm = $builder->getForm(); |
196 | 196 | |
197 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
197 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
198 | 198 | $addCartForm->handleRequest($request); |
199 | 199 | |
200 | 200 | if ($addCartForm->isValid()) { |
@@ -38,7 +38,6 @@ |
||
38 | 38 | use Eccube\Form\Type\Master\ProductListMaxType; |
39 | 39 | use Eccube\Form\Type\Master\ProductListOrderByType; |
40 | 40 | use Eccube\Form\Type\SearchProductType; |
41 | -use Eccube\Repository\BaseInfoRepository; |
|
42 | 41 | use Eccube\Repository\CustomerFavoriteProductRepository; |
43 | 42 | use Eccube\Repository\ProductRepository; |
44 | 43 | use Eccube\Service\CartService; |
@@ -90,7 +90,7 @@ |
||
90 | 90 | } |
91 | 91 | if ($dir == 'doctrine') { |
92 | 92 | // doctrineが指定された場合は, cache driver経由で削除. |
93 | - $config = $this->entityManager->getConfiguration(); |
|
93 | + $config = $this->entityManager->getConfiguration(); |
|
94 | 94 | $this->deleteDoctrineCache($config->getMetadataCacheImpl()); |
95 | 95 | $this->deleteDoctrineCache($config->getQueryCacheImpl()); |
96 | 96 | $this->deleteDoctrineCache($config->getResultCacheImpl()); |
@@ -122,12 +122,12 @@ discard block |
||
122 | 122 | { |
123 | 123 | // install.phpのチェック. |
124 | 124 | if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) { |
125 | - $file = $this->appConfig['root_dir'] . '/html/install.php'; |
|
125 | + $file = $this->appConfig['root_dir'].'/html/install.php'; |
|
126 | 126 | if (file_exists($file)) { |
127 | 127 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php')); |
128 | 128 | $app->addWarning($message, 'admin'); |
129 | 129 | } |
130 | - $fileOnRoot = $this->appConfig['root_dir'] . '/install.php'; |
|
130 | + $fileOnRoot = $this->appConfig['root_dir'].'/install.php'; |
|
131 | 131 | if (file_exists($fileOnRoot)) { |
132 | 132 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php')); |
133 | 133 | $app->addWarning($message, 'admin'); |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | t1.status |
376 | 376 | ORDER BY |
377 | 377 | t1.status'; |
378 | - $rsm = new ResultSetMapping();; |
|
378 | + $rsm = new ResultSetMapping(); ; |
|
379 | 379 | $rsm->addScalarResult('status', 'status'); |
380 | 380 | $rsm->addScalarResult('count', 'count'); |
381 | 381 | $query = $em->createNativeQuery($sql, $rsm); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $em->getConfiguration()->setSQLLogger(null); |
328 | 328 | |
329 | 329 | $response = new StreamedResponse(); |
330 | - $response->setCallback(function () use ($app, $request) { |
|
330 | + $response->setCallback(function() use ($app, $request) { |
|
331 | 331 | |
332 | 332 | // CSV種別を元に初期化. |
333 | 333 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | |
342 | 342 | // データ行の出力. |
343 | 343 | $this->csvExportService->setExportQueryBuilder($qb); |
344 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
344 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
345 | 345 | |
346 | 346 | $Csvs = $csvService->getCsvs(); |
347 | 347 | |
@@ -376,9 +376,9 @@ discard block |
||
376 | 376 | }); |
377 | 377 | |
378 | 378 | $now = new \DateTime(); |
379 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
379 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
380 | 380 | $response->headers->set('Content-Type', 'application/octet-stream'); |
381 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
381 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
382 | 382 | |
383 | 383 | $response->send(); |
384 | 384 |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $em->getConfiguration()->setSQLLogger(null); |
273 | 273 | |
274 | 274 | $response = new StreamedResponse(); |
275 | - $response->setCallback(function () use ($app, $request) { |
|
275 | + $response->setCallback(function() use ($app, $request) { |
|
276 | 276 | |
277 | 277 | // CSV種別を元に初期化. |
278 | 278 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | // データ行の出力. |
288 | 288 | $this->csvExportService->setExportQueryBuilder($qb); |
289 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
289 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
290 | 290 | |
291 | 291 | $Csvs = $csvService->getCsvs(); |
292 | 292 | |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | }); |
320 | 320 | |
321 | 321 | $now = new \DateTime(); |
322 | - $filename = 'category_' . $now->format('YmdHis') . '.csv'; |
|
322 | + $filename = 'category_'.$now->format('YmdHis').'.csv'; |
|
323 | 323 | $response->headers->set('Content-Type', 'application/octet-stream'); |
324 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
324 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
325 | 325 | $response->send(); |
326 | 326 | |
327 | 327 | log_info('カテゴリCSV出力ファイル名', array($filename)); |