Completed
Pull Request — 4.0 (#3553)
by akira
08:24
created
src/Eccube/Controller/Admin/Store/PluginController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 use Eccube\Entity\Plugin;
20 20
 use Eccube\Entity\PluginEventHandler;
21 21
 use Eccube\Exception\PluginException;
22
-use Eccube\Form\Type\Admin\CaptchaType;
23 22
 use Eccube\Form\Type\Admin\AuthenticationType;
23
+use Eccube\Form\Type\Admin\CaptchaType;
24 24
 use Eccube\Form\Type\Admin\PluginLocalInstallType;
25 25
 use Eccube\Form\Type\Admin\PluginManagementType;
26 26
 use Eccube\Repository\BaseInfoRepository;
Please login to merge, or discard this patch.
codeception/_support/Page/Admin/OrderManagePage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@
 block discarded – undo
238 238
     }
239 239
 
240 240
     public function 件数変更($num) {
241
-        $this->tester->selectOption("#form_bulk > div.row.justify-content-between.mb-2 > div.col-5.text-right > div:nth-child(1) > select", '/admin/order/page/1?page_count=' . $num);
241
+        $this->tester->selectOption("#form_bulk > div.row.justify-content-between.mb-2 > div.col-5.text-right > div:nth-child(1) > select", '/admin/order/page/1?page_count='.$num);
242 242
         return $this;
243 243
     }
244 244
 }
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.