@@ -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') |
@@ -197,7 +197,7 @@ |
||
| 197 | 197 | $this->appConfig['block_default_realdir'], |
| 198 | 198 | ); |
| 199 | 199 | foreach ($readPaths as $readPath) { |
| 200 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 200 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 201 | 201 | $fs = new Filesystem(); |
| 202 | 202 | if ($fs->exists($filePath)) { |
| 203 | 203 | return array( |
@@ -20,34 +20,34 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function register(Container $app) |
| 22 | 22 | { |
| 23 | - $app['eccube.service.cart'] = function () use ($app) { |
|
| 23 | + $app['eccube.service.cart'] = function() use ($app) { |
|
| 24 | 24 | return $app[CartService::class]; |
| 25 | 25 | }; |
| 26 | - $app['eccube.service.order'] = function () use ($app) { |
|
| 26 | + $app['eccube.service.order'] = function() use ($app) { |
|
| 27 | 27 | return $app[OrderService::class]; |
| 28 | 28 | }; |
| 29 | - $app['eccube.service.tax_rule'] = function () use ($app) { |
|
| 29 | + $app['eccube.service.tax_rule'] = function() use ($app) { |
|
| 30 | 30 | return $app[TaxRuleService::class]; |
| 31 | 31 | }; |
| 32 | - $app['eccube.service.plugin'] = function () use ($app) { |
|
| 32 | + $app['eccube.service.plugin'] = function() use ($app) { |
|
| 33 | 33 | return $app[PluginService::class]; |
| 34 | 34 | }; |
| 35 | - $app['eccube.service.mail'] = function () use ($app) { |
|
| 35 | + $app['eccube.service.mail'] = function() use ($app) { |
|
| 36 | 36 | return $app[MailService::class]; |
| 37 | 37 | }; |
| 38 | - $app['eccube.helper.order'] = function ($app) { |
|
| 38 | + $app['eccube.helper.order'] = function($app) { |
|
| 39 | 39 | return $app[OrderHelper::class]; |
| 40 | 40 | }; |
| 41 | - $app['eccube.service.csv.export'] = function () use ($app) { |
|
| 41 | + $app['eccube.service.csv.export'] = function() use ($app) { |
|
| 42 | 42 | return $app[CsvExportService::class]; |
| 43 | 43 | }; |
| 44 | - $app['eccube.service.shopping'] = function () use ($app) { |
|
| 44 | + $app['eccube.service.shopping'] = function() use ($app) { |
|
| 45 | 45 | return $app[ShoppingService::class]; |
| 46 | 46 | }; |
| 47 | - $app['eccube.service.payment'] = function () use ($app) { |
|
| 47 | + $app['eccube.service.payment'] = function() use ($app) { |
|
| 48 | 48 | return $app[PaymentService::class]; |
| 49 | 49 | }; |
| 50 | - $app['eccube.service.system'] = function () use ($app) { |
|
| 50 | + $app['eccube.service.system'] = function() use ($app) { |
|
| 51 | 51 | return $app[SystemService::class]; |
| 52 | 52 | }; |
| 53 | 53 | |
@@ -11,163 +11,163 @@ |
||
| 11 | 11 | public function register(Container $app) |
| 12 | 12 | { |
| 13 | 13 | // Repository |
| 14 | - $app['eccube.repository.master.authority'] = function () use ($app) { |
|
| 14 | + $app['eccube.repository.master.authority'] = function() use ($app) { |
|
| 15 | 15 | return $app['Eccube\Repository\Master\AuthorityRepository']; |
| 16 | 16 | }; |
| 17 | - $app['eccube.repository.master.tag'] = function () use ($app) { |
|
| 17 | + $app['eccube.repository.master.tag'] = function() use ($app) { |
|
| 18 | 18 | return $app['Eccube\Repository\Master\TagRepository']; |
| 19 | 19 | }; |
| 20 | - $app['eccube.repository.master.pref'] = function () use ($app) { |
|
| 20 | + $app['eccube.repository.master.pref'] = function() use ($app) { |
|
| 21 | 21 | return $app['Eccube\Repository\Master\PrefRepository']; |
| 22 | 22 | }; |
| 23 | - $app['eccube.repository.master.sex'] = function () use ($app) { |
|
| 23 | + $app['eccube.repository.master.sex'] = function() use ($app) { |
|
| 24 | 24 | return $app['Eccube\Repository\Master\SexRepository']; |
| 25 | 25 | }; |
| 26 | - $app['eccube.repository.master.disp'] = function () use ($app) { |
|
| 26 | + $app['eccube.repository.master.disp'] = function() use ($app) { |
|
| 27 | 27 | return $app['Eccube\Repository\Master\DispRepository']; |
| 28 | 28 | }; |
| 29 | - $app['eccube.repository.master.product_type'] = function () use ($app) { |
|
| 29 | + $app['eccube.repository.master.product_type'] = function() use ($app) { |
|
| 30 | 30 | return $app['Eccube\Repository\Master\ProductTypeRepository']; |
| 31 | 31 | }; |
| 32 | - $app['eccube.repository.master.page_max'] = function () use ($app) { |
|
| 32 | + $app['eccube.repository.master.page_max'] = function() use ($app) { |
|
| 33 | 33 | return $app['Eccube\Repository\Master\PageMaxRepository']; |
| 34 | 34 | }; |
| 35 | - $app['eccube.repository.master.order_status'] = function () use ($app) { |
|
| 35 | + $app['eccube.repository.master.order_status'] = function() use ($app) { |
|
| 36 | 36 | return $app['Eccube\Repository\Master\OrderStatusRepository']; |
| 37 | 37 | }; |
| 38 | - $app['eccube.repository.master.product_list_max'] = function () use ($app) { |
|
| 38 | + $app['eccube.repository.master.product_list_max'] = function() use ($app) { |
|
| 39 | 39 | return $app['Eccube\Repository\Master\ProductListMaxRepository']; |
| 40 | 40 | }; |
| 41 | - $app['eccube.repository.master.product_list_order_by'] = function () use ($app) { |
|
| 41 | + $app['eccube.repository.master.product_list_order_by'] = function() use ($app) { |
|
| 42 | 42 | return $app['Eccube\Repository\Master\ProductListOrderByRepository']; |
| 43 | 43 | }; |
| 44 | - $app['eccube.repository.master.device_type'] = function () use ($app) { |
|
| 44 | + $app['eccube.repository.master.device_type'] = function() use ($app) { |
|
| 45 | 45 | return $app['Eccube\Repository\Master\DeviceTypeRepository']; |
| 46 | 46 | }; |
| 47 | - $app['eccube.repository.master.csv_type'] = function () use ($app) { |
|
| 47 | + $app['eccube.repository.master.csv_type'] = function() use ($app) { |
|
| 48 | 48 | return $app['Eccube\Repository\Master\CsvTypeRepository']; |
| 49 | 49 | }; |
| 50 | - $app['eccube.repository.master.order_item_type'] = function () use ($app) { |
|
| 50 | + $app['eccube.repository.master.order_item_type'] = function() use ($app) { |
|
| 51 | 51 | return $app['Eccube\Repository\Master\OrderItemTypeRepository']; |
| 52 | 52 | }; |
| 53 | - $app['eccube.repository.base_info'] = function () use ($app) { |
|
| 53 | + $app['eccube.repository.base_info'] = function() use ($app) { |
|
| 54 | 54 | return $app['Eccube\Repository\BaseInfoRepository']; |
| 55 | 55 | }; |
| 56 | - $app['eccube.repository.delivery'] = function () use ($app) { |
|
| 56 | + $app['eccube.repository.delivery'] = function() use ($app) { |
|
| 57 | 57 | return $app['Eccube\Repository\DeliveryRepository']; |
| 58 | 58 | }; |
| 59 | - $app['eccube.repository.delivery_date'] = function () use ($app) { |
|
| 59 | + $app['eccube.repository.delivery_date'] = function() use ($app) { |
|
| 60 | 60 | return $app['Eccube\Repository\DeliveryDateRepository']; |
| 61 | 61 | }; |
| 62 | - $app['eccube.repository.delivery_fee'] = function () use ($app) { |
|
| 62 | + $app['eccube.repository.delivery_fee'] = function() use ($app) { |
|
| 63 | 63 | return $app['Eccube\Repository\DeliveryFeeRepository']; |
| 64 | 64 | }; |
| 65 | - $app['eccube.repository.delivery_time'] = function () use ($app) { |
|
| 65 | + $app['eccube.repository.delivery_time'] = function() use ($app) { |
|
| 66 | 66 | return $app['Eccube\Repository\DeliveryTimeRepository']; |
| 67 | 67 | }; |
| 68 | - $app['eccube.repository.payment'] = function () use ($app) { |
|
| 68 | + $app['eccube.repository.payment'] = function() use ($app) { |
|
| 69 | 69 | return $app['Eccube\Repository\PaymentRepository']; |
| 70 | 70 | }; |
| 71 | - $app['eccube.repository.payment_option'] = function () use ($app) { |
|
| 71 | + $app['eccube.repository.payment_option'] = function() use ($app) { |
|
| 72 | 72 | return $app['Eccube\Repository\PaymentOptionRepository']; |
| 73 | 73 | }; |
| 74 | - $app['eccube.repository.customer'] = function () use ($app) { |
|
| 74 | + $app['eccube.repository.customer'] = function() use ($app) { |
|
| 75 | 75 | return $app['Eccube\Repository\CustomerRepository']; |
| 76 | 76 | }; |
| 77 | - $app['eccube.repository.news'] = function () use ($app) { |
|
| 77 | + $app['eccube.repository.news'] = function() use ($app) { |
|
| 78 | 78 | return $app['Eccube\Repository\NewsRepository']; |
| 79 | 79 | }; |
| 80 | - $app['eccube.repository.mail_history'] = function () use ($app) { |
|
| 80 | + $app['eccube.repository.mail_history'] = function() use ($app) { |
|
| 81 | 81 | return $app['Eccube\Repository\MailHistoryRepository']; |
| 82 | 82 | }; |
| 83 | - $app['eccube.repository.member'] = function () use ($app) { |
|
| 83 | + $app['eccube.repository.member'] = function() use ($app) { |
|
| 84 | 84 | return $app['Eccube\Repository\MemberRepository']; |
| 85 | 85 | }; |
| 86 | - $app['eccube.repository.order'] = function () use ($app) { |
|
| 86 | + $app['eccube.repository.order'] = function() use ($app) { |
|
| 87 | 87 | return $app['Eccube\Repository\OrderRepository']; |
| 88 | 88 | }; |
| 89 | - $app['eccube.repository.product'] = function () use ($app) { |
|
| 89 | + $app['eccube.repository.product'] = function() use ($app) { |
|
| 90 | 90 | return $app['Eccube\Repository\ProductRepository']; |
| 91 | 91 | }; |
| 92 | - $app['eccube.repository.product_image'] = function () use ($app) { |
|
| 92 | + $app['eccube.repository.product_image'] = function() use ($app) { |
|
| 93 | 93 | return $app['Eccube\Repository\ProductImageRepository']; |
| 94 | 94 | }; |
| 95 | - $app['eccube.repository.product_class'] = function () use ($app) { |
|
| 95 | + $app['eccube.repository.product_class'] = function() use ($app) { |
|
| 96 | 96 | return $app['Eccube\Repository\ProductClassRepository']; |
| 97 | 97 | }; |
| 98 | - $app['eccube.repository.product_stock'] = function () use ($app) { |
|
| 98 | + $app['eccube.repository.product_stock'] = function() use ($app) { |
|
| 99 | 99 | return $app['Eccube\Repository\ProductStockRepository']; |
| 100 | 100 | }; |
| 101 | - $app['eccube.repository.product_tag'] = function () use ($app) { |
|
| 101 | + $app['eccube.repository.product_tag'] = function() use ($app) { |
|
| 102 | 102 | return $app['Eccube\Repository\ProductTagRepository']; |
| 103 | 103 | }; |
| 104 | - $app['eccube.repository.class_name'] = function () use ($app) { |
|
| 104 | + $app['eccube.repository.class_name'] = function() use ($app) { |
|
| 105 | 105 | return $app['Eccube\Repository\ClassNameRepository']; |
| 106 | 106 | }; |
| 107 | - $app['eccube.repository.class_category'] = function () use ($app) { |
|
| 107 | + $app['eccube.repository.class_category'] = function() use ($app) { |
|
| 108 | 108 | return $app['Eccube\Repository\ClassCategoryRepository']; |
| 109 | 109 | }; |
| 110 | - $app['eccube.repository.customer_favorite_product'] = function () use ($app) { |
|
| 110 | + $app['eccube.repository.customer_favorite_product'] = function() use ($app) { |
|
| 111 | 111 | return $app['Eccube\Repository\CustomerFavoriteProductRepository']; |
| 112 | 112 | }; |
| 113 | - $app['eccube.repository.tax_rule'] = function () use ($app) { |
|
| 113 | + $app['eccube.repository.tax_rule'] = function() use ($app) { |
|
| 114 | 114 | return $app['Eccube\Repository\TaxRuleRepository']; |
| 115 | 115 | }; |
| 116 | - $app['eccube.repository.page_layout'] = function () use ($app) { |
|
| 116 | + $app['eccube.repository.page_layout'] = function() use ($app) { |
|
| 117 | 117 | return $app['Eccube\Repository\PageLayoutRepository']; |
| 118 | 118 | }; |
| 119 | - $app['eccube.repository.block'] = function () use ($app) { |
|
| 119 | + $app['eccube.repository.block'] = function() use ($app) { |
|
| 120 | 120 | return $app['Eccube\Repository\BlockRepository']; |
| 121 | 121 | }; |
| 122 | - $app['eccube.repository.order'] = function () use ($app) { |
|
| 122 | + $app['eccube.repository.order'] = function() use ($app) { |
|
| 123 | 123 | return $app['Eccube\Repository\OrderRepository']; |
| 124 | 124 | }; |
| 125 | - $app['eccube.repository.customer_address'] = function () use ($app) { |
|
| 125 | + $app['eccube.repository.customer_address'] = function() use ($app) { |
|
| 126 | 126 | return $app['Eccube\Repository\CustomerAddressRepository']; |
| 127 | 127 | }; |
| 128 | - $app['eccube.repository.shipping'] = function () use ($app) { |
|
| 128 | + $app['eccube.repository.shipping'] = function() use ($app) { |
|
| 129 | 129 | return $app['Eccube\Repository\ShippingRepository']; |
| 130 | 130 | }; |
| 131 | - $app['eccube.repository.shipment_item'] = function () use ($app) { |
|
| 131 | + $app['eccube.repository.shipment_item'] = function() use ($app) { |
|
| 132 | 132 | return $app['Eccube\Repository\ShipmentItemRepository']; |
| 133 | 133 | }; |
| 134 | - $app['eccube.repository.master.customer_status'] = function () use ($app) { |
|
| 134 | + $app['eccube.repository.master.customer_status'] = function() use ($app) { |
|
| 135 | 135 | return $app['Eccube\Repository\Master\CustomerStatusRepository']; |
| 136 | 136 | }; |
| 137 | 137 | |
| 138 | - $app['eccube.repository.mail_template'] = function () use ($app) { |
|
| 138 | + $app['eccube.repository.mail_template'] = function() use ($app) { |
|
| 139 | 139 | return $app['Eccube\Repository\MailTemplateRepository']; |
| 140 | 140 | }; |
| 141 | - $app['eccube.repository.csv'] = function () use ($app) { |
|
| 141 | + $app['eccube.repository.csv'] = function() use ($app) { |
|
| 142 | 142 | return $app['Eccube\Repository\CsvRepository']; |
| 143 | 143 | }; |
| 144 | - $app['eccube.repository.template'] = function () use ($app) { |
|
| 144 | + $app['eccube.repository.template'] = function() use ($app) { |
|
| 145 | 145 | return $app['Eccube\Repository\TemplateRepository']; |
| 146 | 146 | }; |
| 147 | - $app['eccube.repository.authority_role'] = function () use ($app) { |
|
| 147 | + $app['eccube.repository.authority_role'] = function() use ($app) { |
|
| 148 | 148 | return $app['Eccube\Repository\AuthorityRoleRepository']; |
| 149 | 149 | }; |
| 150 | - $app['eccube.repository.category'] = function () use ($app) { |
|
| 150 | + $app['eccube.repository.category'] = function() use ($app) { |
|
| 151 | 151 | return $app['Eccube\Repository\CategoryRepository']; |
| 152 | 152 | }; |
| 153 | - $app['eccube.repository.help'] = function () use ($app) { |
|
| 153 | + $app['eccube.repository.help'] = function() use ($app) { |
|
| 154 | 154 | return $app['Eccube\Repository\HelpRepository']; |
| 155 | 155 | }; |
| 156 | - $app['eccube.repository.plugin'] = function () use ($app) { |
|
| 156 | + $app['eccube.repository.plugin'] = function() use ($app) { |
|
| 157 | 157 | return $app['Eccube\Repository\PluginRepository']; |
| 158 | 158 | }; |
| 159 | - $app['eccube.repository.plugin_event_handler'] = function () use ($app) { |
|
| 159 | + $app['eccube.repository.plugin_event_handler'] = function() use ($app) { |
|
| 160 | 160 | return $app['Eccube\Repository\PluginEventHandlerRepository']; |
| 161 | 161 | }; |
| 162 | - $app['eccube.repository.layout'] = function () use ($app) { |
|
| 162 | + $app['eccube.repository.layout'] = function() use ($app) { |
|
| 163 | 163 | return $app['Eccube\Repository\LayoutRepository']; |
| 164 | 164 | }; |
| 165 | 165 | |
| 166 | 166 | // alias |
| 167 | - $app['eccube.repository.order_status'] = function () use ($app) { |
|
| 167 | + $app['eccube.repository.order_status'] = function() use ($app) { |
|
| 168 | 168 | return $app['Eccube\Repository\Master\OrderStatusRepository']; |
| 169 | 169 | }; |
| 170 | - $app['eccube.repository.customer_status'] = function () use ($app) { |
|
| 170 | + $app['eccube.repository.customer_status'] = function() use ($app) { |
|
| 171 | 171 | return $app['Eccube\Repository\Master\CustomerStatusRepository']; |
| 172 | 172 | }; |
| 173 | 173 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | out('EC-CUBE3 installer use database driver of ', null, false); |
| 32 | 32 | |
| 33 | 33 | $database_driver = 'pdo_sqlite'; |
| 34 | -switch($argv[1]) { |
|
| 34 | +switch ($argv[1]) { |
|
| 35 | 35 | case 'mysql': |
| 36 | 36 | $database_driver = 'pdo_mysql'; |
| 37 | 37 | break; |
@@ -166,8 +166,7 @@ discard block |
||
| 166 | 166 | putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null)); |
| 167 | 167 | putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin')); |
| 168 | 168 | putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null)); |
| 169 | - putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : |
|
| 170 | - substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
| 169 | + putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
| 171 | 170 | } |
| 172 | 171 | |
| 173 | 172 | function getExampleVariables() |
@@ -277,7 +276,7 @@ discard block |
||
| 277 | 276 | { |
| 278 | 277 | $app = \Eccube\Application::getInstance(); |
| 279 | 278 | $app['debug'] = true; |
| 280 | - $app['annotations'] = function () { |
|
| 279 | + $app['annotations'] = function() { |
|
| 281 | 280 | return new \Doctrine\Common\Annotations\AnnotationReader(); |
| 282 | 281 | }; |
| 283 | 282 | $app->initDoctrine(); |
@@ -389,15 +388,15 @@ discard block |
||
| 389 | 388 | foreach ($finder as $content) { |
| 390 | 389 | $permission = $content->getPerms(); |
| 391 | 390 | // see also http://www.php.net/fileperms |
| 392 | - if (!($permission & 0x0010) || !($permission & 0x0002)) { |
|
| 391 | + if (!($permission&0x0010) || !($permission&0x0002)) { |
|
| 393 | 392 | $realPath = $content->getRealPath(); |
| 394 | 393 | if ($verbose) { |
| 395 | 394 | out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false); |
| 396 | 395 | } |
| 397 | - $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r |
|
| 398 | - $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w |
|
| 399 | - $permission = !($permission & 0x0004) ? $permission += 04 : $permission; // o+r |
|
| 400 | - $permission = !($permission & 0x0002) ? $permission += 02 : $permission; // o+w |
|
| 396 | + $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r |
|
| 397 | + $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w |
|
| 398 | + $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r |
|
| 399 | + $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w |
|
| 401 | 400 | $result = chmod($realPath, $permission); |
| 402 | 401 | if ($verbose) { |
| 403 | 402 | if ($result) { |
@@ -428,13 +427,13 @@ discard block |
||
| 428 | 427 | |
| 429 | 428 | function getConfig() |
| 430 | 429 | { |
| 431 | - $config = array ( |
|
| 430 | + $config = array( |
|
| 432 | 431 | 'auth_magic' => getenv('AUTH_MAGIC'), |
| 433 | 432 | 'password_hash_algos' => 'sha256', |
| 434 | 433 | 'shop_name' => getenv('SHOP_NAME'), |
| 435 | 434 | 'force_ssl' => NULL, |
| 436 | 435 | 'admin_allow_host' => |
| 437 | - array ( |
|
| 436 | + array( |
|
| 438 | 437 | ), |
| 439 | 438 | 'cookie_lifetime' => 0, |
| 440 | 439 | 'locale' => 'ja', |
@@ -447,9 +446,9 @@ discard block |
||
| 447 | 446 | |
| 448 | 447 | function getDatabaseConfig($database_driver) |
| 449 | 448 | { |
| 450 | - $database = array ( |
|
| 449 | + $database = array( |
|
| 451 | 450 | 'database' => |
| 452 | - array ( |
|
| 451 | + array( |
|
| 453 | 452 | 'driver' => $database_driver, |
| 454 | 453 | ) |
| 455 | 454 | ); |
@@ -476,9 +475,9 @@ discard block |
||
| 476 | 475 | |
| 477 | 476 | function getMailConfig() |
| 478 | 477 | { |
| 479 | - $mail = array ( |
|
| 478 | + $mail = array( |
|
| 480 | 479 | 'mail' => |
| 481 | - array ( |
|
| 480 | + array( |
|
| 482 | 481 | 'transport' => getenv('MAIL_BACKEND'), |
| 483 | 482 | 'host' => getenv('MAIL_HOST'), |
| 484 | 483 | 'port' => getenv('MAIL_PORT'), |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | ); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - $app[TwigLintValidator::class] = function (Container $app) { |
|
| 26 | + $app[TwigLintValidator::class] = function(Container $app) { |
|
| 27 | 27 | return new TwigLintValidator($app['twig']); |
| 28 | 28 | }; |
| 29 | 29 | |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | /** |
| 253 | 253 | * 複数配送オプション有効時の画面制御を行う. |
| 254 | 254 | */ |
| 255 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 255 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 256 | 256 | |
| 257 | 257 | if ($this->BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) { |
| 258 | 258 | return; |
@@ -262,17 +262,16 @@ discard block |
||
| 262 | 262 | $orderDetails = &$data['OrderDetails']; |
| 263 | 263 | |
| 264 | 264 | // 数量0フィルター |
| 265 | - $quantityFilter = function ($v) { |
|
| 265 | + $quantityFilter = function($v) { |
|
| 266 | 266 | return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity']))); |
| 267 | 267 | }; |
| 268 | 268 | |
| 269 | 269 | // $shippings = &$data['Shippings']; |
| 270 | 270 | |
| 271 | 271 | // 数量を抽出 |
| 272 | - $getQuantity = function ($v) { |
|
| 272 | + $getQuantity = function($v) { |
|
| 273 | 273 | return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ? |
| 274 | - trim($v['quantity']) : |
|
| 275 | - 0; |
|
| 274 | + trim($v['quantity']) : 0; |
|
| 276 | 275 | }; |
| 277 | 276 | |
| 278 | 277 | // foreach ($shippings as &$shipping) { |
@@ -289,7 +288,7 @@ discard block |
||
| 289 | 288 | $orderDetail['quantity'] = 0; |
| 290 | 289 | |
| 291 | 290 | // 受注詳細と同じ商品規格のみ抽出 |
| 292 | - $productClassFilter = function ($v) use ($orderDetail) { |
|
| 291 | + $productClassFilter = function($v) use ($orderDetail) { |
|
| 293 | 292 | return $orderDetail['ProductClass'] === $v['ProductClass']; |
| 294 | 293 | }; |
| 295 | 294 | |
@@ -298,10 +297,9 @@ discard block |
||
| 298 | 297 | if (!empty($shipping['ShipmentItems'])) { |
| 299 | 298 | |
| 300 | 299 | // 同じ商品規格の受注詳細の価格を適用 |
| 301 | - $applyPrice = function (&$v) use ($orderDetail) { |
|
| 300 | + $applyPrice = function(&$v) use ($orderDetail) { |
|
| 302 | 301 | $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ? |
| 303 | - $orderDetail['price'] : |
|
| 304 | - $v['price']; |
|
| 302 | + $orderDetail['price'] : $v['price']; |
|
| 305 | 303 | }; |
| 306 | 304 | array_walk($shipping['ShipmentItems'], $applyPrice); |
| 307 | 305 | |
@@ -330,7 +328,7 @@ discard block |
||
| 330 | 328 | // } |
| 331 | 329 | // }); |
| 332 | 330 | // 選択された支払い方法の名称をエンティティにコピーする |
| 333 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 331 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 334 | 332 | $Order = $event->getData(); |
| 335 | 333 | $Payment = $Order->getPayment(); |
| 336 | 334 | if (!is_null($Payment)) { |
@@ -338,7 +336,7 @@ discard block |
||
| 338 | 336 | } |
| 339 | 337 | }); |
| 340 | 338 | // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする |
| 341 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 339 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 342 | 340 | $Order = $event->getData(); |
| 343 | 341 | $Customer = $Order->getCustomer(); |
| 344 | 342 | if (!is_null($Customer)) { |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | 'prototype' => true, |
| 200 | 200 | )) |
| 201 | 201 | |
| 202 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 202 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 203 | 203 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
| 204 | 204 | $form = $event->getForm(); |
| 205 | 205 | $form->add('ShipmentItems', CollectionType::class, array( |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | )); |
| 211 | 211 | } |
| 212 | 212 | }) |
| 213 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 213 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 214 | 214 | /** @var \Eccube\Entity\Shipping $data */ |
| 215 | 215 | $data = $event->getData(); |
| 216 | 216 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | 'choice_label' => 'delivery_time', |
| 230 | 230 | 'placeholder' => '指定なし', |
| 231 | 231 | 'required' => false, |
| 232 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
| 232 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
| 233 | 233 | return $er->createQueryBuilder('dt') |
| 234 | 234 | ->where('dt.Delivery = :Delivery') |
| 235 | 235 | ->setParameter('Delivery', $Delivery); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | )); |
| 238 | 238 | |
| 239 | 239 | }) |
| 240 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 240 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 241 | 241 | $data = $event->getData(); |
| 242 | 242 | $form = $event->getForm(); |
| 243 | 243 | if (!$data) { |
@@ -257,14 +257,14 @@ discard block |
||
| 257 | 257 | 'choice_label' => 'delivery_time', |
| 258 | 258 | 'placeholder' => '指定なし', |
| 259 | 259 | 'required' => false, |
| 260 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
| 260 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
| 261 | 261 | return $er->createQueryBuilder('dt') |
| 262 | 262 | ->where('dt.Delivery = :Delivery') |
| 263 | 263 | ->setParameter('Delivery', $Delivery); |
| 264 | 264 | }, |
| 265 | 265 | )); |
| 266 | 266 | }) |
| 267 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 267 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 268 | 268 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
| 269 | 269 | $form = $event->getForm(); |
| 270 | 270 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | }) |
| 278 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 278 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 279 | 279 | $Shipping = $event->getData(); |
| 280 | 280 | $Delivery = $Shipping->getDelivery(); |
| 281 | 281 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $this->register(new MobileDetectServiceProvider()); |
| 174 | 174 | $this->register(new TwigLintServiceProvider()); |
| 175 | 175 | |
| 176 | - $this->error(function (\Exception $e, Request $request, $code) { |
|
| 176 | + $this->error(function(\Exception $e, Request $request, $code) { |
|
| 177 | 177 | if ($this['debug']) { |
| 178 | 178 | return; |
| 179 | 179 | } |
@@ -279,14 +279,14 @@ discard block |
||
| 279 | 279 | return $router; |
| 280 | 280 | }); |
| 281 | 281 | |
| 282 | - $this['eccube.router.origin'] = function ($app) { |
|
| 282 | + $this['eccube.router.origin'] = function($app) { |
|
| 283 | 283 | $resource = __DIR__.'/Controller'; |
| 284 | 284 | $cachePrefix = 'Origin'; |
| 285 | 285 | |
| 286 | 286 | return $app['eccube.router']($resource, $cachePrefix); |
| 287 | 287 | }; |
| 288 | 288 | |
| 289 | - $this['eccube.routers.plugin'] = function ($app) { |
|
| 289 | + $this['eccube.routers.plugin'] = function($app) { |
|
| 290 | 290 | // TODO 有効なプラグインを対象とする必要がある. |
| 291 | 291 | $dirs = Finder::create() |
| 292 | 292 | ->in($app['config']['root_dir'].'/app/Plugin') |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | return $routers; |
| 304 | 304 | }; |
| 305 | 305 | |
| 306 | - $this['eccube.router.extend'] = function ($app) { |
|
| 306 | + $this['eccube.router.extend'] = function($app) { |
|
| 307 | 307 | // TODO ディレクトリ名は暫定 |
| 308 | 308 | $resource = $app['config']['root_dir'].'/app/Acme/Controller'; |
| 309 | 309 | $cachePrefix = 'Extend'; |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | return $router; |
| 314 | 314 | }; |
| 315 | 315 | |
| 316 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
| 316 | + $this->extend('request_matcher', function($matcher, $app) { |
|
| 317 | 317 | $matchers = []; |
| 318 | 318 | $matchers[] = $app['eccube.router.extend']; |
| 319 | 319 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | return new ChainUrlMatcher($matchers, $app['request_context']); |
| 326 | 326 | }); |
| 327 | 327 | |
| 328 | - $this->extend('url_generator', function ($generator, $app) { |
|
| 328 | + $this->extend('url_generator', function($generator, $app) { |
|
| 329 | 329 | $generators = []; |
| 330 | 330 | $generators[] = $app['eccube.router.extend']; |
| 331 | 331 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | }); |
| 339 | 339 | |
| 340 | 340 | // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため) |
| 341 | - $this->extend('routes', function ($routes, $app) { |
|
| 341 | + $this->extend('routes', function($routes, $app) { |
|
| 342 | 342 | $routes->addCollection($app['eccube.router.extend']->getRouteCollection()); |
| 343 | 343 | foreach ($app['eccube.routers.plugin'] as $router) { |
| 344 | 344 | $routes->addCollection($router->getRouteCollection()); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
| 372 | 372 | 'locale_fallbacks' => ['ja', 'en'], |
| 373 | 373 | )); |
| 374 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
| 374 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
| 375 | 375 | $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader()); |
| 376 | 376 | |
| 377 | 377 | $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php'; |
@@ -414,14 +414,14 @@ discard block |
||
| 414 | 414 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
| 415 | 415 | 'twig.form.templates' => array('Form/form_layout.twig'), |
| 416 | 416 | )); |
| 417 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
| 417 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
| 418 | 418 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
| 419 | 419 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
| 420 | 420 | |
| 421 | 421 | return $twig; |
| 422 | 422 | }); |
| 423 | 423 | |
| 424 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
| 424 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
| 425 | 425 | $app['admin'] = $app['front'] = false; |
| 426 | 426 | $pathinfo = rawurldecode($request->getPathInfo()); |
| 427 | 427 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | } |
| 438 | 438 | $paths[] = $app['config']['template_admin_realdir']; |
| 439 | 439 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 440 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 440 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 441 | 441 | } else { |
| 442 | 442 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
| 443 | 443 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | } |
| 453 | 453 | $paths[] = $app['config']['template_default_realdir']; |
| 454 | 454 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 455 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 455 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 456 | 456 | } |
| 457 | 457 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
| 458 | 458 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | }, self::EARLY_EVENT); |
| 471 | 471 | |
| 472 | 472 | // twigのグローバル変数を定義. |
| 473 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 473 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 474 | 474 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
| 475 | 475 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
| 476 | 476 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
| 556 | 556 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
| 557 | 557 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
| 558 | - \Swift::init(function () { |
|
| 558 | + \Swift::init(function() { |
|
| 559 | 559 | \Swift_DependencyContainer::getInstance() |
| 560 | 560 | ->register('mime.qpheaderencoder') |
| 561 | 561 | ->asAliasOf('mime.base64headerencoder'); |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
| 591 | 591 | |
| 592 | 592 | $app = $this; |
| 593 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
| 593 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
| 594 | 594 | $initSubscriber = new InitSubscriber($app); |
| 595 | 595 | $evm->addEventSubscriber($initSubscriber); |
| 596 | 596 | |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | |
| 686 | 686 | $this->extend( |
| 687 | 687 | 'orm.em.config', |
| 688 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 688 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 689 | 689 | |
| 690 | 690 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
| 691 | 691 | $chain = $config->getMetadataDriverImpl(); |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | } |
| 708 | 708 | ); |
| 709 | 709 | |
| 710 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 710 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 711 | 711 | // save |
| 712 | 712 | $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app); |
| 713 | 713 | $em->getEventManager()->addEventSubscriber($saveEventSubscriber); |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | // second level cacheの設定. |
| 731 | 731 | $this->extend( |
| 732 | 732 | 'orm.em.config', |
| 733 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 733 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 734 | 734 | $config->setSecondLevelCacheEnabled(); |
| 735 | 735 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
| 736 | 736 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -819,31 +819,31 @@ discard block |
||
| 819 | 819 | array('^/mypage', 'ROLE_USER', $channel), |
| 820 | 820 | ); |
| 821 | 821 | |
| 822 | - $this['eccube.password_encoder'] = function ($app) { |
|
| 822 | + $this['eccube.password_encoder'] = function($app) { |
|
| 823 | 823 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
| 824 | 824 | }; |
| 825 | - $this['security.encoder_factory'] = function ($app) { |
|
| 825 | + $this['security.encoder_factory'] = function($app) { |
|
| 826 | 826 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
| 827 | 827 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
| 828 | 828 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
| 829 | 829 | )); |
| 830 | 830 | }; |
| 831 | - $this['eccube.event_listner.security'] = function ($app) { |
|
| 831 | + $this['eccube.event_listner.security'] = function($app) { |
|
| 832 | 832 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
| 833 | 833 | }; |
| 834 | 834 | |
| 835 | 835 | // Voterの設定 |
| 836 | - $this['authority_voter'] = function ($app) { |
|
| 836 | + $this['authority_voter'] = function($app) { |
|
| 837 | 837 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
| 838 | 838 | }; |
| 839 | 839 | |
| 840 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
| 840 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
| 841 | 841 | $voters[] = $app['authority_voter']; |
| 842 | 842 | |
| 843 | 843 | return $voters; |
| 844 | 844 | }); |
| 845 | 845 | |
| 846 | - $this['security.access_manager'] = function ($app) { |
|
| 846 | + $this['security.access_manager'] = function($app) { |
|
| 847 | 847 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
| 848 | 848 | }; |
| 849 | 849 | |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | { |
| 858 | 858 | $config = $this['config']; |
| 859 | 859 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
| 860 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
| 860 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
| 861 | 861 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
| 862 | 862 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
| 863 | 863 | }, self::EARLY_EVENT); |
@@ -874,7 +874,7 @@ discard block |
||
| 874 | 874 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
| 875 | 875 | |
| 876 | 876 | // TODO Acme\ServiceProvider の初期化はここで OK? |
| 877 | - if (array_key_exists('service',$this['config'])) { |
|
| 877 | + if (array_key_exists('service', $this['config'])) { |
|
| 878 | 878 | foreach ($this['config']['service'] as $service) { |
| 879 | 879 | $this->register(new $service); |
| 880 | 880 | } |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | $app = $this; |
| 1031 | 1031 | |
| 1032 | 1032 | // Response Event(http cache対応、event実行は一番遅く設定) |
| 1033 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1033 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1034 | 1034 | |
| 1035 | 1035 | if (!$event->isMasterRequest()) { |
| 1036 | 1036 | return; |