@@ -131,7 +131,7 @@ |
||
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | 133 | * @param $rowArray |
| 134 | - * @param $key |
|
| 134 | + * @param string $key |
|
| 135 | 135 | * |
| 136 | 136 | * @return array |
| 137 | 137 | */ |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 41 | 41 | $installedLogs = array_filter( |
| 42 | 42 | array_map( |
| 43 | - function ($line) { |
|
| 43 | + function($line) { |
|
| 44 | 44 | $matches = []; |
| 45 | 45 | preg_match('/^ - Installing (.*?) \((.*?)\) .*/', $line, $matches); |
| 46 | 46 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | public static function parseInfo($output) |
| 65 | 65 | { |
| 66 | 66 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 67 | - $infoLogs = array_filter(array_map(function ($line) { |
|
| 67 | + $infoLogs = array_filter(array_map(function($line) { |
|
| 68 | 68 | $matches = []; |
| 69 | 69 | preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches); |
| 70 | 70 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | public static function parseConfig($output) |
| 90 | 90 | { |
| 91 | 91 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 92 | - $rowArray = array_filter($rowArray, function ($line) { |
|
| 92 | + $rowArray = array_filter($rowArray, function($line) { |
|
| 93 | 93 | return !preg_match('/^<warning>.*/', $line); |
| 94 | 94 | }); |
| 95 | 95 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | public static function parseList($output) |
| 107 | 107 | { |
| 108 | 108 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 109 | - $rawConfig = array_map(function ($line) { |
|
| 109 | + $rawConfig = array_map(function($line) { |
|
| 110 | 110 | $matches = []; |
| 111 | 111 | preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches); |
| 112 | 112 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | public static function parseComposerVersion($output) |
| 167 | 167 | { |
| 168 | 168 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 169 | - $rowArray = array_filter($rowArray, function ($line) { |
|
| 169 | + $rowArray = array_filter($rowArray, function($line) { |
|
| 170 | 170 | return preg_match('/^Composer */', $line); |
| 171 | 171 | }); |
| 172 | 172 | |
@@ -204,7 +204,7 @@ |
||
| 204 | 204 | /** |
| 205 | 205 | * EntityからTraitを削除. |
| 206 | 206 | * |
| 207 | - * @param $entityTokens Tokens Entityのトークン |
|
| 207 | + * @param Tokens $entityTokens Tokens Entityのトークン |
|
| 208 | 208 | * @param $trait string 削除するTraitのFQCN |
| 209 | 209 | */ |
| 210 | 210 | private function removeTrait($entityTokens, $trait) |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | $includedFileSets[] = $includedFiles; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - $declaredTraits = array_map(function ($fqcn) { |
|
| 131 | + $declaredTraits = array_map(function($fqcn) { |
|
| 132 | 132 | // FQCNが'\'で始まるように正規化 |
| 133 | 133 | return strpos($fqcn, '\\') === 0 ? $fqcn : '\\'.$fqcn; |
| 134 | 134 | }, get_declared_traits()); |
| 135 | 135 | |
| 136 | 136 | // ディレクトリセットに含まれるTraitの一覧を作成 |
| 137 | - $traitSets = array_map(function () { return []; }, $dirSets); |
|
| 137 | + $traitSets = array_map(function() { return []; }, $dirSets); |
|
| 138 | 138 | foreach ($declaredTraits as $className) { |
| 139 | 139 | $rc = new \ReflectionClass($className); |
| 140 | 140 | $sourceFile = $rc->getFileName(); |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | $traitsTokens = array_slice($entityTokens->toArray(), $useTraitIndex + 1, $useTraitEndIndex - $useTraitIndex - 1); |
| 216 | 216 | |
| 217 | 217 | // Trait名の配列に変換 |
| 218 | - $traitNames = explode(',', implode(array_map(function ($token) { |
|
| 218 | + $traitNames = explode(',', implode(array_map(function($token) { |
|
| 219 | 219 | return $token->getContent(); |
| 220 | - }, array_filter($traitsTokens, function ($token) { |
|
| 220 | + }, array_filter($traitsTokens, function($token) { |
|
| 221 | 221 | return $token->getId() != T_WHITESPACE; |
| 222 | 222 | })))); |
| 223 | 223 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * Send customer confirm mail. |
| 109 | 109 | * |
| 110 | 110 | * @param $Customer 会員情報 |
| 111 | - * @param $activateUrl アクティベート用url |
|
| 111 | + * @param string $activateUrl アクティベート用url |
|
| 112 | 112 | */ |
| 113 | 113 | public function sendCustomerConfirmMail(\Eccube\Entity\Customer $Customer, $activateUrl) |
| 114 | 114 | { |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | * |
| 306 | 306 | * @param \Eccube\Entity\Order $Order 受注情報 |
| 307 | 307 | * |
| 308 | - * @return string |
|
| 308 | + * @return \Swift_Message |
|
| 309 | 309 | */ |
| 310 | 310 | public function sendOrderMail(\Eccube\Entity\Order $Order) |
| 311 | 311 | { |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * Send admin customer confirm mail. |
| 351 | 351 | * |
| 352 | 352 | * @param $Customer 会員情報 |
| 353 | - * @param $activateUrl アクティベート用url |
|
| 353 | + * @param string $activateUrl アクティベート用url |
|
| 354 | 354 | */ |
| 355 | 355 | public function sendAdminCustomerConfirmMail(\Eccube\Entity\Customer $Customer, $activateUrl) |
| 356 | 356 | { |
@@ -441,6 +441,7 @@ discard block |
||
| 441 | 441 | * Send password reset notification mail. |
| 442 | 442 | * |
| 443 | 443 | * @param $Customer 会員情報 |
| 444 | + * @param string $reset_url |
|
| 444 | 445 | */ |
| 445 | 446 | public function sendPasswordResetNotificationMail(\Eccube\Entity\Customer $Customer, $reset_url) |
| 446 | 447 | { |
@@ -487,6 +488,7 @@ discard block |
||
| 487 | 488 | * Send password reset notification mail. |
| 488 | 489 | * |
| 489 | 490 | * @param $Customer 会員情報 |
| 491 | + * @param string $password |
|
| 490 | 492 | */ |
| 491 | 493 | public function sendPasswordResetCompleteMail(\Eccube\Entity\Customer $Customer, $password) |
| 492 | 494 | { |
@@ -606,7 +606,7 @@ |
||
| 606 | 606 | */ |
| 607 | 607 | public function getShippingNotifyMailBody(Shipping $Shipping, Order $Order, MailTemplate $MailTemplate = null) |
| 608 | 608 | { |
| 609 | - $ShippingItems = array_filter($Shipping->getOrderItems()->toArray(), function (OrderItem $OrderItem) use ($Order) { |
|
| 609 | + $ShippingItems = array_filter($Shipping->getOrderItems()->toArray(), function(OrderItem $OrderItem) use ($Order) { |
|
| 610 | 610 | return $OrderItem->getOrderId() === $Order->getId(); |
| 611 | 611 | }); |
| 612 | 612 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * @param string $path path to tar.gz/zip plugin file |
| 151 | 151 | * @param int $source |
| 152 | 152 | * |
| 153 | - * @return mixed |
|
| 153 | + * @return boolean |
|
| 154 | 154 | * |
| 155 | 155 | * @throws PluginException |
| 156 | 156 | * @throws \Exception |
@@ -274,6 +274,10 @@ discard block |
||
| 274 | 274 | } |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | + /** |
|
| 278 | + * @param string $archive |
|
| 279 | + * @param string $dir |
|
| 280 | + */ |
|
| 277 | 281 | public function unpackPluginArchive($archive, $dir) |
| 278 | 282 | { |
| 279 | 283 | $extension = pathinfo($archive, PATHINFO_EXTENSION); |
@@ -333,6 +337,9 @@ discard block |
||
| 333 | 337 | } |
| 334 | 338 | } |
| 335 | 339 | |
| 340 | + /** |
|
| 341 | + * @param string $yml |
|
| 342 | + */ |
|
| 336 | 343 | public function readYml($yml) |
| 337 | 344 | { |
| 338 | 345 | if (file_exists($yml)) { |
@@ -350,6 +357,9 @@ discard block |
||
| 350 | 357 | // ディレクトリ名などに使われれるので厳しめ |
| 351 | 358 | } |
| 352 | 359 | |
| 360 | + /** |
|
| 361 | + * @param string $path |
|
| 362 | + */ |
|
| 353 | 363 | public function deleteFile($path) |
| 354 | 364 | { |
| 355 | 365 | $f = new Filesystem(); |
@@ -369,6 +379,9 @@ discard block |
||
| 369 | 379 | return $this->projectRoot.'/app/Plugin/'.$name; |
| 370 | 380 | } |
| 371 | 381 | |
| 382 | + /** |
|
| 383 | + * @param string $d |
|
| 384 | + */ |
|
| 372 | 385 | public function createPluginDir($d) |
| 373 | 386 | { |
| 374 | 387 | $b = @mkdir($d); |
@@ -429,6 +442,9 @@ discard block |
||
| 429 | 442 | return $p; |
| 430 | 443 | } |
| 431 | 444 | |
| 445 | + /** |
|
| 446 | + * @param string $method |
|
| 447 | + */ |
|
| 432 | 448 | public function callPluginManagerMethod($meta, $method) |
| 433 | 449 | { |
| 434 | 450 | $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager'; |
@@ -962,7 +978,7 @@ discard block |
||
| 962 | 978 | * [プラグインコード]/Resource/assets |
| 963 | 979 | * 配下に置かれているファイルが所定の位置へコピーされる |
| 964 | 980 | * |
| 965 | - * @param $pluginBaseDir |
|
| 981 | + * @param string $pluginBaseDir |
|
| 966 | 982 | * @param $pluginCode |
| 967 | 983 | */ |
| 968 | 984 | public function copyAssets($pluginBaseDir, $pluginCode) |
@@ -998,7 +1014,7 @@ discard block |
||
| 998 | 1014 | * @param string $pluginVersion |
| 999 | 1015 | * @param string $remoteVersion |
| 1000 | 1016 | * |
| 1001 | - * @return mixed |
|
| 1017 | + * @return boolean |
|
| 1002 | 1018 | */ |
| 1003 | 1019 | public function isUpdate($pluginVersion, $remoteVersion) |
| 1004 | 1020 | { |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | use Eccube\Entity\Plugin; |
| 34 | 34 | use Eccube\Entity\PluginEventHandler; |
| 35 | 35 | use Eccube\Exception\PluginException; |
| 36 | -use Eccube\Plugin\ConfigManager; |
|
| 37 | 36 | use Eccube\Plugin\ConfigManager as PluginConfigManager; |
| 38 | 37 | use Eccube\Repository\PluginEventHandlerRepository; |
| 39 | 38 | use Eccube\Repository\PluginRepository; |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | @mkdir($outputDir); |
| 505 | 505 | |
| 506 | 506 | $enabledPluginCodes = array_map( |
| 507 | - function ($p) { return $p->getCode(); }, |
|
| 507 | + function($p) { return $p->getCode(); }, |
|
| 508 | 508 | $this->pluginRepository->findAllEnabled() |
| 509 | 509 | ); |
| 510 | 510 | |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | - $enabledPluginEntityDirs = array_map(function ($code) { |
|
| 522 | + $enabledPluginEntityDirs = array_map(function($code) { |
|
| 523 | 523 | return $this->projectRoot."/app/Plugin/${code}/Entity"; |
| 524 | 524 | }, $enabledPluginCodes); |
| 525 | 525 | |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | { |
| 949 | 949 | $result = array_keys($packages); |
| 950 | 950 | if ($getVersion) { |
| 951 | - $result = array_map(function ($package, $version) { |
|
| 951 | + $result = array_map(function($package, $version) { |
|
| 952 | 952 | return $package.':'.$version; |
| 953 | 953 | }, array_keys($packages), array_values($packages)); |
| 954 | 954 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | /** |
| 280 | 280 | * 非会員情報を取得 |
| 281 | 281 | * |
| 282 | - * @param $sesisonKey |
|
| 282 | + * @param string $sesisonKey |
|
| 283 | 283 | * |
| 284 | 284 | * @return $Customer|null |
| 285 | 285 | */ |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | /** |
| 311 | 311 | * 受注情報を作成 |
| 312 | 312 | * |
| 313 | - * @param $Customer |
|
| 313 | + * @param null|Customer $Customer |
|
| 314 | 314 | * |
| 315 | 315 | * @return \Eccube\Entity\Order |
| 316 | 316 | */ |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | * 仮受注情報作成 |
| 341 | 341 | * |
| 342 | 342 | * @param $Customer |
| 343 | - * @param $preOrderId |
|
| 343 | + * @param string $preOrderId |
|
| 344 | 344 | * |
| 345 | 345 | * @return mixed |
| 346 | 346 | * |
@@ -1257,7 +1257,7 @@ discard block |
||
| 1257 | 1257 | * |
| 1258 | 1258 | * @param Order $Order |
| 1259 | 1259 | * |
| 1260 | - * @return MailHistory |
|
| 1260 | + * @return null|\Symfony\Component\HttpFoundation\Request |
|
| 1261 | 1261 | */ |
| 1262 | 1262 | public function sendOrderMail(Order $Order) |
| 1263 | 1263 | { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param int|null|\Eccube\Entity\Master\Pref $pref 都道府県 |
| 70 | 70 | * @param int|null|\Eccube\Entity\Master\Country $country 国 |
| 71 | 71 | * |
| 72 | - * @return int |
|
| 72 | + * @return double |
|
| 73 | 73 | */ |
| 74 | 74 | public function getPriceIncTax($price, $product = null, $productClass = null, $pref = null, $country = null) |
| 75 | 75 | { |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | /** |
| 98 | 98 | * 課税規則に応じて端数処理を行う |
| 99 | 99 | * |
| 100 | - * @param float|integer $value 端数処理を行う数値 |
|
| 101 | - * @param integer $calcRule 課税規則 |
|
| 100 | + * @param integer $value 端数処理を行う数値 |
|
| 101 | + * @param integer $RoundingType |
|
| 102 | 102 | * |
| 103 | 103 | * @return double 端数処理後の数値 |
| 104 | 104 | */ |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | * This method should only be used to configure services and parameters. |
| 14 | 14 | * It should not get services. |
| 15 | 15 | * |
| 16 | - * @param Container $pimple A container instance |
|
| 17 | 16 | */ |
| 18 | 17 | public function register(Container $app) |
| 19 | 18 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function register(Container $app) |
| 19 | 19 | { |
| 20 | - $app['eccube.queries'] = function () { |
|
| 20 | + $app['eccube.queries'] = function() { |
|
| 21 | 21 | return new \Eccube\Doctrine\Query\Queries(); |
| 22 | 22 | }; |
| 23 | 23 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | /** |
| 54 | 54 | * Returns a list of functions to add to the existing list. |
| 55 | 55 | * |
| 56 | - * @return array An array of functions |
|
| 56 | + * @return TwigFunction[] An array of functions |
|
| 57 | 57 | */ |
| 58 | 58 | public function getFunctions() |
| 59 | 59 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | /** |
| 78 | 78 | * Returns a list of filters. |
| 79 | 79 | * |
| 80 | - * @return array |
|
| 80 | + * @return TwigFilter[] |
|
| 81 | 81 | */ |
| 82 | 82 | public function getFilters() |
| 83 | 83 | { |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /** |
| 104 | 104 | * Name of this extension |
| 105 | 105 | * |
| 106 | - * @return string |
|
| 106 | + * @return double |
|
| 107 | 107 | */ |
| 108 | 108 | public function getCalcIncTax($price, $tax_rate, $tax_rule) |
| 109 | 109 | { |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | new TwigFunction('calc_inc_tax', [$this, 'getCalcIncTax']), |
| 64 | 64 | new TwigFunction('active_menus', [$this, 'getActiveMenus']), |
| 65 | 65 | new TwigFunction('class_categories_as_json', [$this, 'getClassCategoriesAsJson']), |
| 66 | - new TwigFunction('php_*', function () { |
|
| 66 | + new TwigFunction('php_*', function() { |
|
| 67 | 67 | $arg_list = func_get_args(); |
| 68 | 68 | $function = array_shift($arg_list); |
| 69 | 69 | if (is_callable($function)) { |
@@ -51,6 +51,9 @@ |
||
| 51 | 51 | $this->kernel = $kernel; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $env |
|
| 56 | + */ |
|
| 54 | 57 | public function clearCache($env = null) |
| 55 | 58 | { |
| 56 | 59 | $console = new Application($this->kernel); |