kiy0taka / ec-cube

src/Eccube/Controller/Admin/Order/MailController.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      * @param MailService $mailService
      * @param MailHistoryRepository $mailHistoryRepository
      * @param OrderRepository $orderRepository
-     * @param twig $twig
+     * @param Environment $twig
      */
     public function __construct(
         MailService $mailService,

src/Eccube/Service/PluginApiService.php

Doc Comments +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
     /**
      * Get a plugin
      *
-     * @param int|string $id Id or plugin code
+     * @param string $id Id or plugin code
      * @return array [$result, $info]
      */
     public function getPlugin($id)

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
      */
     public function getPlugin($id)
     {
-        $url = $this->getApiUrl() . '/plugin/'.$id;
+        $url = $this->getApiUrl().'/plugin/'.$id;
 
         return $this->getRequestApi($url);
     }

src/Eccube/EventListener/TwigInitializeListener.php

Spacing +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@ 
         $Member = $this->requestContext->getCurrentUser();
         if ($Member instanceof Member) {
             $AuthorityRoles = $this->authorityRoleRepository->findBy(['Authority' => $Member->getAuthority()]);
-            $baseUrl = $event->getRequest()->getBaseUrl() . '/' . $this->eccubeConfig['eccube_admin_route'];
+            $baseUrl = $event->getRequest()->getBaseUrl().'/'.$this->eccubeConfig['eccube_admin_route'];
             $eccubeNav = $this->getDisplayEccubeNav($eccubeNav, $AuthorityRoles, $baseUrl);
         }
         $this->twig->addGlobal('eccubeNav', $eccubeNav);
@@ -219,7 +219,7 @@ 
                 $param = array_key_exists('param', $childNav) ? $childNav['param'] : [];
                 $url = $this->router->generate($childNav['url'], $param);
                 foreach ($AuthorityRoles as $AuthorityRole) {
-                    $denyUrl = str_replace('/', '\/', $baseUrl . $AuthorityRole->getDenyUrl());
+                    $denyUrl = str_replace('/', '\/', $baseUrl.$AuthorityRole->getDenyUrl());
                     if (preg_match("/^({$denyUrl})/i", $url)) {
                         // 権限がないURLの場合は配列から削除
                         unset($parentNav[$key]);