@@ -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 | */ |
@@ -59,14 +59,14 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | public function getCategory() |
| 61 | 61 | { |
| 62 | - $urlCategory = $this->getApiUrl() . '/category'; |
|
| 62 | + $urlCategory = $this->getApiUrl().'/category'; |
|
| 63 | 63 | |
| 64 | 64 | return $this->getRequestApi($urlCategory); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function getPlugins($data = array()) |
| 68 | 68 | { |
| 69 | - $url = $this->getApiUrl() . '/plugins'; |
|
| 69 | + $url = $this->getApiUrl().'/plugins'; |
|
| 70 | 70 | $params['category_id'] = $data['category_id']; |
| 71 | 71 | $params['price_type'] = empty($data['price_type']) ? 'all' : $data['price_type']; |
| 72 | 72 | $params['keyword'] = $data['keyword']; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | public function getRequestApi($url, $data = array()) |
| 89 | 89 | { |
| 90 | 90 | if (count($data) > 0) { |
| 91 | - $url .= '?' . http_build_query($data); |
|
| 91 | + $url .= '?'.http_build_query($data); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | $curl = curl_init($url); |