@@ -87,7 +87,7 @@ |
||
87 | 87 | 'label' => '手数料', |
88 | 88 | )) |
89 | 89 | ->add('fixed', HiddenType::class) |
90 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
90 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
91 | 91 | $form = $event->getForm(); |
92 | 92 | $ruleMax = $form['rule_max']->getData(); |
93 | 93 | $ruleMin = $form['rule_min']->getData(); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | // ファイル生成・更新 |
172 | 172 | $tplDir = $this->appConfig['block_realdir']; |
173 | 173 | |
174 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
174 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
175 | 175 | |
176 | 176 | $fs = new Filesystem(); |
177 | 177 | $blockData = $form->get('block_html')->getData(); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $fs->dumpFile($filePath, $blockData); |
180 | 180 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
181 | 181 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
182 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
182 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
183 | 183 | if ($fs->exists($oldFilePath)) { |
184 | 184 | $fs->remove($oldFilePath); |
185 | 185 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
237 | 237 | if ($Block->isDeletable()) { |
238 | 238 | $tplDir = $this->appConfig['block_realdir']; |
239 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
239 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
240 | 240 | $fs = new Filesystem(); |
241 | 241 | if ($fs->exists($file)) { |
242 | 242 | $fs->remove($file); |
@@ -32,9 +32,9 @@ |
||
32 | 32 | |
33 | 33 | /** |
34 | 34 | * RepositoryDefinition constructor. |
35 | - * @param $id |
|
36 | - * @param $refClass |
|
37 | - * @param $entityClass |
|
35 | + * @param string $id |
|
36 | + * @param \ReflectionClass $refClass |
|
37 | + * @param string $entityClass |
|
38 | 38 | */ |
39 | 39 | public function __construct($id, $refClass, $entityClass) |
40 | 40 | { |
@@ -58,9 +58,9 @@ |
||
58 | 58 | |
59 | 59 | // 同じパッケージのEntityがあれば返す |
60 | 60 | if (count($partsOfFqcn) > 2) { |
61 | - $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2)); |
|
62 | - $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]); |
|
63 | - $result = $parentNamespace . '\\Entity\\' . $entityName; |
|
61 | + $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2)); |
|
62 | + $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]); |
|
63 | + $result = $parentNamespace.'\\Entity\\'.$entityName; |
|
64 | 64 | if (class_exists($result)) { |
65 | 65 | return $result; |
66 | 66 | } |
@@ -127,7 +127,7 @@ |
||
127 | 127 | |
128 | 128 | /** |
129 | 129 | * @param $rowArray |
130 | - * @param $key |
|
130 | + * @param string $key |
|
131 | 131 | * @return array |
132 | 132 | */ |
133 | 133 | private static function parseArrayInfoOutput($rowArray, $key) |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
40 | 40 | $installedLogs = array_filter( |
41 | 41 | array_map( |
42 | - function ($line) { |
|
42 | + function($line) { |
|
43 | 43 | $matches = array(); |
44 | 44 | preg_match('/^ - Installing (.*?) \((.*?)\) .*/', $line, $matches); |
45 | 45 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | public static function parseInfo($output) |
63 | 63 | { |
64 | 64 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
65 | - $infoLogs = array_filter(array_map(function ($line) { |
|
65 | + $infoLogs = array_filter(array_map(function($line) { |
|
66 | 66 | $matches = array(); |
67 | 67 | preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches); |
68 | 68 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public static function parseConfig($output) |
87 | 87 | { |
88 | 88 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
89 | - $rowArray = array_filter($rowArray, function ($line) { |
|
89 | + $rowArray = array_filter($rowArray, function($line) { |
|
90 | 90 | return !preg_match('/^<warning>.*/', $line); |
91 | 91 | }); |
92 | 92 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | public static function parseList($output) |
103 | 103 | { |
104 | 104 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
105 | - $rawConfig = array_map(function ($line) { |
|
105 | + $rawConfig = array_map(function($line) { |
|
106 | 106 | $matches = array(); |
107 | 107 | preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches); |
108 | 108 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @deprecated 呼び出し元で制御する |
45 | - * @param $id |
|
45 | + * @param integer $id |
|
46 | 46 | * @return Delivery|null|object |
47 | 47 | */ |
48 | 48 | public function findOrCreate($id) |
@@ -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.product_status'] = function () use ($app) { |
|
26 | + $app['eccube.repository.master.product_status'] = function() use ($app) { |
|
27 | 27 | return $app['Eccube\Repository\Master\ProductStatusRepository']; |
28 | 28 | }; |
29 | - $app['eccube.repository.master.sale_type'] = function () use ($app) { |
|
29 | + $app['eccube.repository.master.sale_type'] = function() use ($app) { |
|
30 | 30 | return $app['Eccube\Repository\Master\SaleTypeRepository']; |
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'] = function () use ($app) { |
|
116 | + $app['eccube.repository.page'] = function() use ($app) { |
|
117 | 117 | return $app['Eccube\Repository\PageRepository']; |
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.order_item'] = function () use ($app) { |
|
131 | + $app['eccube.repository.order_item'] = function() use ($app) { |
|
132 | 132 | return $app['Eccube\Repository\OrderItemRepository']; |
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 | } |