Completed
Pull Request — 4.0 (#3654)
by k-yamamura
09:05 queued 26s
created
codeception/_support/Page/Admin/ProductManagePage.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -59,6 +59,9 @@  discard block
 block discarded – undo
59 59
         return $this;
60 60
     }
61 61
 
62
+    /**
63
+     * @param integer $value
64
+     */
62 65
     public function 詳細検索_ステータス($value)
63 66
     {
64 67
         $this->tester->click(self::$詳細検索ボタン);
@@ -155,6 +158,9 @@  discard block
 block discarded – undo
155 158
         return $this;
156 159
     }
157 160
 
161
+    /**
162
+     * @param integer $rowNum
163
+     */
158 164
     public function Accept_複製する($rowNum)
159 165
     {
160 166
         $modalCssSelector = "#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pr-3 > div > div:nth-child(2) div.modal";
Please login to merge, or discard this patch.
src/Eccube/EventListener/TwigInitializeListener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         $Member = $this->requestContext->getCurrentUser();
189 189
         if ($Member instanceof Member) {
190 190
             $AuthorityRoles = $this->authorityRoleRepository->findBy(['Authority' => $Member->getAuthority()]);
191
-            $baseUrl = $event->getRequest()->getBaseUrl() . '/' . $this->eccubeConfig['eccube_admin_route'];
191
+            $baseUrl = $event->getRequest()->getBaseUrl().'/'.$this->eccubeConfig['eccube_admin_route'];
192 192
             $eccubeNav = $this->getDisplayEccubeNav($eccubeNav, $AuthorityRoles, $baseUrl);
193 193
         }
194 194
         $this->twig->addGlobal('eccubeNav', $eccubeNav);
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
                 $param = array_key_exists('param', $childNav) ? $childNav['param'] : [];
220 220
                 $url = $this->router->generate($childNav['url'], $param);
221 221
                 foreach ($AuthorityRoles as $AuthorityRole) {
222
-                    $denyUrl = str_replace('/', '\/', $baseUrl . $AuthorityRole->getDenyUrl());
222
+                    $denyUrl = str_replace('/', '\/', $baseUrl.$AuthorityRole->getDenyUrl());
223 223
                     if (preg_match("/^({$denyUrl})/i", $url)) {
224 224
                         // 権限がないURLの場合は配列から削除
225 225
                         unset($parentNav[$key]);
Please login to merge, or discard this patch.
src/Eccube/Service/PluginApiService.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
      */
109 109
     public function getPlugin($id)
110 110
     {
111
-        $url = $this->getApiUrl() . '/plugin/'.$id;
111
+        $url = $this->getApiUrl().'/plugin/'.$id;
112 112
 
113 113
         return $this->getRequestApi($url);
114 114
     }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@
 block discarded – undo
103 103
     /**
104 104
      * Get a plugin
105 105
      *
106
-     * @param int|string $id Id or plugin code
106
+     * @param string $id Id or plugin code
107 107
      * @return array [$result, $info]
108 108
      */
109 109
     public function getPlugin($id)
Please login to merge, or discard this patch.
codeception/acceptance/_bootstrap.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@  discard block
 block discarded – undo
46 46
 $faker = Faker::create('ja_JP');
47 47
 Fixtures::add('faker', $faker);
48 48
 
49
-$progress = (function() {
49
+$progress = (function () {
50 50
     $current = '';
51
-    return function($key) use (&$current) {
51
+    return function ($key) use (&$current) {
52 52
         if ($current !== $key) {
53 53
             if ($current !== '') {
54 54
                 echo PHP_EOL;
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 /* カテゴリ一覧の配列. */
204 204
 Fixtures::add('categories', $categories);
205 205
 
206
-$findOrders = function() use ($entityManager) {
206
+$findOrders = function () use ($entityManager) {
207 207
     return $entityManager->getRepository('Eccube\Entity\Order')
208 208
         ->createQueryBuilder('o')
209 209
         ->getQuery()
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 /* 受注を検索するクロージャ. */
213 213
 Fixtures::add('findOrders', $findOrders);
214 214
 
215
-$findShippings = function() use ($entityManager) {
215
+$findShippings = function () use ($entityManager) {
216 216
     return $entityManager->getRepository('Eccube\Entity\Shipping')
217 217
         ->createQueryBuilder('o')
218 218
         ->getQuery()
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 /* 出荷を検索するクロージャ. */
222 222
 Fixtures::add('findShippings', $findShippings);
223 223
 
224
-$resetShippingDate = function() use ($entityManager) {
224
+$resetShippingDate = function () use ($entityManager) {
225 225
     $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping')
226 226
         ->findAll();
227 227
     foreach ($Shippings as $Shipping) {
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 /* 出荷準備中に更新するクロージャ. */
235 235
 Fixtures::add('resetShippingDate', $resetShippingDate);
236 236
 
237
-$setShippingDate = function() use ($entityManager) {
237
+$setShippingDate = function () use ($entityManager) {
238 238
     $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping')
239 239
         ->findAll();
240 240
     foreach ($Shippings as $Shipping) {
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 /* 出荷済みに更新するクロージャ. */
248 248
 Fixtures::add('setShippingDate', $setShippingDate);
249 249
 
250
-$deleteShippingNotExistsOfItem = function() use ($entityManager) {
250
+$deleteShippingNotExistsOfItem = function () use ($entityManager) {
251 251
 
252 252
     $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping')->findAll();
253 253
 
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 /* OrderItemの存在しない出荷を削除するクロージャ. */
266 266
 Fixtures::add('deleteShippingNotExistsOfItem', $deleteShippingNotExistsOfItem);
267 267
 
268
-$findProducts = function() use ($entityManager) {
268
+$findProducts = function () use ($entityManager) {
269 269
     return $entityManager->getRepository('Eccube\Entity\Product')
270 270
         ->createQueryBuilder('p')
271 271
         ->getQuery()
@@ -274,12 +274,12 @@  discard block
 block discarded – undo
274 274
 /* 商品を検索するクロージャ. */
275 275
 Fixtures::add('findProducts', $findProducts);
276 276
 
277
-$createProduct = function($product_name = null, $product_class_num = 3) use ($container) {
277
+$createProduct = function ($product_name = null, $product_class_num = 3) use ($container) {
278 278
     return createProduct($container, $product_name, $product_class_num);
279 279
 };
280 280
 Fixtures::add('createProduct', $createProduct);
281 281
 
282
-$createCustomer = function($email = null, $active = true) use ($container, $faker) {
282
+$createCustomer = function ($email = null, $active = true) use ($container, $faker) {
283 283
     if (is_null($email)) {
284 284
         $email = microtime(true).'.'.$faker->safeEmail;
285 285
     }
@@ -319,19 +319,19 @@  discard block
 block discarded – undo
319 319
 /* 受注を生成するクロージャ. */
320 320
 Fixtures::add('createOrders', $createOrders);
321 321
 
322
-$findPlugins = function() use ($entityManager) {
322
+$findPlugins = function () use ($entityManager) {
323 323
     return $entityManager->getRepository('Eccube\Entity\Plugin')->findAll();
324 324
 };
325 325
 /* プラグインを検索するクロージャ */
326 326
 Fixtures::add('findPlugins', $findPlugins);
327 327
 
328
-$findPluginByCode = function($code = null) use ($entityManager) {
328
+$findPluginByCode = function ($code = null) use ($entityManager) {
329 329
     return $entityManager->getRepository('Eccube\Entity\Plugin')->findOneBy(['code' => $code]);
330 330
 };
331 331
 /* プラグインを検索するクロージャ */
332 332
 Fixtures::add('findPluginByCode', $findPluginByCode);
333 333
 
334
-$findCustomers = function() use ($entityManager) {
334
+$findCustomers = function () use ($entityManager) {
335 335
     return $entityManager->getRepository('Eccube\Entity\Customer')
336 336
         ->createQueryBuilder('c')
337 337
         ->getQuery()
@@ -341,13 +341,13 @@  discard block
 block discarded – undo
341 341
 Fixtures::add('findCustomers', $findCustomers);
342 342
 
343 343
 /** 新着情報を検索するクロージャ */
344
-Fixtures::add('findNews', function() use ($entityManager) {
344
+Fixtures::add('findNews', function () use ($entityManager) {
345 345
     return $entityManager->getRepository(\Eccube\Entity\News::class)
346 346
         ->findBy([], ['sort_no' => 'DESC']);
347 347
 });
348 348
 
349 349
 /** 新着情報を登録するクロージャ */
350
-Fixtures::add('createNews', function($publishDate, $title, $description, $url = null) use ($entityManager) {
350
+Fixtures::add('createNews', function ($publishDate, $title, $description, $url = null) use ($entityManager) {
351 351
     $TopNews = $entityManager->getRepository(\Eccube\Entity\News::class)
352 352
         ->findOneBy([], ['sort_no' => 'DESC']);
353 353
     $sortNo = $TopNews ? $TopNews->getSortNo() + 1 : 1;
Please login to merge, or discard this patch.