@@ -19,9 +19,9 @@ |
||
19 | 19 | use Eccube\Event\EventArgs; |
20 | 20 | use Eccube\Form\Type\Admin\MasterdataEditType; |
21 | 21 | use Eccube\Form\Type\Admin\MasterdataType; |
22 | -use Symfony\Component\Routing\Annotation\Route; |
|
23 | 22 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
24 | 23 | use Symfony\Component\HttpFoundation\Request; |
24 | +use Symfony\Component\Routing\Annotation\Route; |
|
25 | 25 | |
26 | 26 | class MasterdataController extends AbstractController |
27 | 27 | { |
@@ -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 | */ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function getCategory() |
75 | 75 | { |
76 | - $urlCategory = $this->getApiUrl() . '/category'; |
|
76 | + $urlCategory = $this->getApiUrl().'/category'; |
|
77 | 77 | |
78 | 78 | return $this->getRequestApi($urlCategory); |
79 | 79 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function getPlugins($data) |
88 | 88 | { |
89 | - $url = $this->getApiUrl() . '/plugins'; |
|
89 | + $url = $this->getApiUrl().'/plugins'; |
|
90 | 90 | $params['category_id'] = $data['category_id']; |
91 | 91 | $params['price_type'] = empty($data['price_type']) ? 'all' : $data['price_type']; |
92 | 92 | $params['keyword'] = $data['keyword']; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | { |
122 | 122 | $apiUrl = $this->getApiUrl().'/api_key'; |
123 | 123 | |
124 | - $baseUrl = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost() . $this->requestStack->getCurrentRequest()->getBasePath(); |
|
124 | + $baseUrl = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost().$this->requestStack->getCurrentRequest()->getBasePath(); |
|
125 | 125 | $data['eccube_url'] = $baseUrl; |
126 | 126 | $data['eccube_version'] = Constant::VERSION; |
127 | 127 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | // Todo: will implement after server worked |
151 | 151 | $key = null; |
152 | - $baseUrl = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost() . $this->requestStack->getCurrentRequest()->getBasePath(); |
|
152 | + $baseUrl = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost().$this->requestStack->getCurrentRequest()->getBasePath(); |
|
153 | 153 | // Option array |
154 | 154 | $options = [ |
155 | 155 | // HEADER |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | public function getRequestApi($url, $data = array()) |
190 | 190 | { |
191 | 191 | if (count($data) > 0) { |
192 | - $url .= '?' . http_build_query($data); |
|
192 | + $url .= '?'.http_build_query($data); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | $curl = curl_init($url); |
@@ -19,8 +19,8 @@ discard block |
||
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; |
@@ -34,14 +34,11 @@ discard block |
||
34 | 34 | use Symfony\Component\DependencyInjection\Container; |
35 | 35 | use Symfony\Component\Filesystem\Filesystem; |
36 | 36 | use Symfony\Component\Finder\Finder; |
37 | -use Symfony\Component\Form\Extension\Core\Type\FormType; |
|
38 | -use Symfony\Component\Form\Extension\Core\Type\TextType; |
|
39 | 37 | use Symfony\Component\HttpFoundation\File\UploadedFile; |
40 | 38 | use Symfony\Component\HttpFoundation\RedirectResponse; |
41 | 39 | use Symfony\Component\HttpFoundation\Request; |
42 | 40 | use Symfony\Component\Routing\Annotation\Route; |
43 | 41 | use Symfony\Component\Routing\Exception\RouteNotFoundException; |
44 | -use Symfony\Component\Validator\Constraints as Assert; |
|
45 | 42 | |
46 | 43 | class PluginController extends AbstractController |
47 | 44 | { |