@@ -20,9 +20,9 @@ |
||
20 | 20 | use Eccube\Event\EventArgs; |
21 | 21 | use Eccube\Form\Type\Admin\MemberType; |
22 | 22 | use Eccube\Repository\MemberRepository; |
23 | -use Symfony\Component\Routing\Annotation\Route; |
|
24 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | 24 | use Symfony\Component\HttpFoundation\Request; |
25 | +use Symfony\Component\Routing\Annotation\Route; |
|
26 | 26 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
27 | 27 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
28 | 28 |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Eccube\Form\Type\Admin\SecurityType; |
18 | 18 | use Eccube\Util\CacheUtil; |
19 | 19 | use Eccube\Util\StringUtil; |
20 | -use Symfony\Component\Routing\Annotation\Route; |
|
21 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
22 | 21 | use Symfony\Component\HttpFoundation\Request; |
22 | +use Symfony\Component\Routing\Annotation\Route; |
|
23 | 23 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
24 | 24 | |
25 | 25 | class SecurityController extends AbstractController |
@@ -15,10 +15,10 @@ |
||
15 | 15 | |
16 | 16 | use Eccube\Common\Constant; |
17 | 17 | use Eccube\Service\SystemService; |
18 | -use Symfony\Component\Routing\Annotation\Route; |
|
19 | 18 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
20 | 19 | use Symfony\Component\HttpFoundation\Request; |
21 | 20 | use Symfony\Component\HttpFoundation\Response; |
21 | +use Symfony\Component\Routing\Annotation\Route; |
|
22 | 22 | |
23 | 23 | class SystemController |
24 | 24 | { |
@@ -126,7 +126,7 @@ |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
129 | - * @param $Carts |
|
129 | + * @param \Eccube\Entity\Cart[] $Carts |
|
130 | 130 | * |
131 | 131 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
132 | 132 | */ |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | $faker = Faker::create('ja_JP'); |
38 | 38 | Fixtures::add('faker', $faker); |
39 | 39 | |
40 | -$progress = (function() { |
|
40 | +$progress = (function () { |
|
41 | 41 | $current = ''; |
42 | - return function($key) use (&$current) { |
|
42 | + return function ($key) use (&$current) { |
|
43 | 43 | if ($current !== $key) { |
44 | 44 | if ($current !== '') { |
45 | 45 | echo PHP_EOL; |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | /** カテゴリ一覧の配列. */ |
195 | 195 | Fixtures::add('categories', $categories); |
196 | 196 | |
197 | -$findOrders = function() use ($entityManager) { |
|
197 | +$findOrders = function () use ($entityManager) { |
|
198 | 198 | return $entityManager->getRepository('Eccube\Entity\Order') |
199 | 199 | ->createQueryBuilder('o') |
200 | 200 | ->getQuery() |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | /** 受注を検索するクロージャ. */ |
204 | 204 | Fixtures::add('findOrders', $findOrders); |
205 | 205 | |
206 | -$findShippings = function() use ($entityManager) { |
|
206 | +$findShippings = function () use ($entityManager) { |
|
207 | 207 | return $entityManager->getRepository('Eccube\Entity\Shipping') |
208 | 208 | ->createQueryBuilder('o') |
209 | 209 | ->getQuery() |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | /** 出荷を検索するクロージャ. */ |
213 | 213 | Fixtures::add('findShippings', $findShippings); |
214 | 214 | |
215 | -$resetShippingDate = function() use ($entityManager) { |
|
215 | +$resetShippingDate = function () use ($entityManager) { |
|
216 | 216 | $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping') |
217 | 217 | ->findAll(); |
218 | 218 | foreach ($Shippings as $Shipping) { |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | /** 出荷準備中に更新するクロージャ. */ |
225 | 225 | Fixtures::add('resetShippingDate', $resetShippingDate); |
226 | 226 | |
227 | -$setShippingDate = function() use ($entityManager) { |
|
227 | +$setShippingDate = function () use ($entityManager) { |
|
228 | 228 | $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping') |
229 | 229 | ->findAll(); |
230 | 230 | foreach ($Shippings as $Shipping) { |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | /** 出荷済みに更新するクロージャ. */ |
237 | 237 | Fixtures::add('setShippingDate', $setShippingDate); |
238 | 238 | |
239 | -$deleteShippingNotExistsOfItem = function() use ($entityManager) { |
|
239 | +$deleteShippingNotExistsOfItem = function () use ($entityManager) { |
|
240 | 240 | |
241 | 241 | $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping')->findAll(); |
242 | 242 | |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | /** OrderItemの存在しない出荷を削除するクロージャ. */ |
255 | 255 | Fixtures::add('deleteShippingNotExistsOfItem', $deleteShippingNotExistsOfItem); |
256 | 256 | |
257 | -$findProducts = function() use ($entityManager) { |
|
257 | +$findProducts = function () use ($entityManager) { |
|
258 | 258 | return $entityManager->getRepository('Eccube\Entity\Product') |
259 | 259 | ->createQueryBuilder('p') |
260 | 260 | ->getQuery() |
@@ -263,12 +263,12 @@ discard block |
||
263 | 263 | /** 商品を検索するクロージャ. */ |
264 | 264 | Fixtures::add('findProducts', $findProducts); |
265 | 265 | |
266 | -$createProduct = function($product_name = null, $product_class_num = 3) use ($container) { |
|
266 | +$createProduct = function ($product_name = null, $product_class_num = 3) use ($container) { |
|
267 | 267 | return createProduct($container, $product_name, $product_class_num); |
268 | 268 | }; |
269 | 269 | Fixtures::add('createProduct', $createProduct); |
270 | 270 | |
271 | -$createCustomer = function($email = null, $active = true) use ($container, $faker) { |
|
271 | +$createCustomer = function ($email = null, $active = true) use ($container, $faker) { |
|
272 | 272 | if (is_null($email)) { |
273 | 273 | $email = microtime(true).'.'.$faker->safeEmail; |
274 | 274 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | /** 会員を生成するクロージャ. */ |
278 | 278 | Fixtures::add('createCustomer', $createCustomer); |
279 | 279 | |
280 | -$createOrders = function($Customer, $numberOfOrders = 5, $ProductClasses = array(), $Status = null) use ($container, $entityManager, $faker) { |
|
280 | +$createOrders = function ($Customer, $numberOfOrders = 5, $ProductClasses = array(), $Status = null) use ($container, $entityManager, $faker) { |
|
281 | 281 | $generator = $container->get('Eccube\Tests\Fixture\Generator'); |
282 | 282 | $Orders = array(); |
283 | 283 | $randomOrderStatus = [ |
@@ -308,19 +308,19 @@ discard block |
||
308 | 308 | /** 受注を生成するクロージャ. */ |
309 | 309 | Fixtures::add('createOrders', $createOrders); |
310 | 310 | |
311 | -$findPlugins = function() use ($entityManager) { |
|
311 | +$findPlugins = function () use ($entityManager) { |
|
312 | 312 | return $entityManager->getRepository('Eccube\Entity\Plugin')->findAll(); |
313 | 313 | }; |
314 | 314 | /** プラグインを検索するクロージャ */ |
315 | 315 | Fixtures::add('findPlugins', $findPlugins); |
316 | 316 | |
317 | -$findPluginByCode = function($code = null) use ($entityManager) { |
|
317 | +$findPluginByCode = function ($code = null) use ($entityManager) { |
|
318 | 318 | return $entityManager->getRepository('Eccube\Entity\Plugin')->findOneBy(['code' => $code]); |
319 | 319 | }; |
320 | 320 | /** プラグインを検索するクロージャ */ |
321 | 321 | Fixtures::add('findPluginByCode', $findPluginByCode); |
322 | 322 | |
323 | -$findCustomers = function() use ($entityManager) { |
|
323 | +$findCustomers = function () use ($entityManager) { |
|
324 | 324 | return $entityManager->getRepository('Eccube\Entity\Customer') |
325 | 325 | ->createQueryBuilder('c') |
326 | 326 | ->getQuery() |
@@ -330,13 +330,13 @@ discard block |
||
330 | 330 | Fixtures::add('findCustomers', $findCustomers); |
331 | 331 | |
332 | 332 | /** 新着情報を検索するクロージャ */ |
333 | -Fixtures::add('findNews', function() use ($entityManager) { |
|
333 | +Fixtures::add('findNews', function () use ($entityManager) { |
|
334 | 334 | return $entityManager->getRepository(\Eccube\Entity\News::class) |
335 | 335 | ->findBy([], ['sort_no' => 'DESC']); |
336 | 336 | }); |
337 | 337 | |
338 | 338 | /** 新着情報を登録するクロージャ */ |
339 | -Fixtures::add('createNews', function($publishDate, $title, $description, $url = null) use ($entityManager) { |
|
339 | +Fixtures::add('createNews', function ($publishDate, $title, $description, $url = null) use ($entityManager) { |
|
340 | 340 | $TopNews = $entityManager->getRepository(\Eccube\Entity\News::class) |
341 | 341 | ->findOneBy([], ['sort_no' => 'DESC']); |
342 | 342 | $sortNo = $TopNews ? $TopNews->getSortNo() + 1 : 1; |