@@ -147,6 +147,9 @@ discard block |
||
| 147 | 147 | return $version; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | + /** |
|
| 151 | + * @param string $pluginDir |
|
| 152 | + */ |
|
| 150 | 153 | protected function createDirectories($pluginDir) |
| 151 | 154 | { |
| 152 | 155 | $dirs = [ |
@@ -165,6 +168,9 @@ discard block |
||
| 165 | 168 | } |
| 166 | 169 | } |
| 167 | 170 | |
| 171 | + /** |
|
| 172 | + * @param string $pluginDir |
|
| 173 | + */ |
|
| 168 | 174 | protected function createConfig($pluginDir, $name, $code, $version) |
| 169 | 175 | { |
| 170 | 176 | $source = <<<EOL |
@@ -176,12 +182,18 @@ discard block |
||
| 176 | 182 | $this->fs->dumpFile($pluginDir.'/config.yml', $source); |
| 177 | 183 | } |
| 178 | 184 | |
| 185 | + /** |
|
| 186 | + * @param string $pluginDir |
|
| 187 | + */ |
|
| 179 | 188 | protected function createMessages($pluginDir) |
| 180 | 189 | { |
| 181 | 190 | $this->fs->dumpFile($pluginDir.'/Resource/locale/messages.ja.yaml', ''); |
| 182 | 191 | $this->fs->dumpFile($pluginDir.'/Resource/locale/validators.ja.yaml', ''); |
| 183 | 192 | } |
| 184 | 193 | |
| 194 | + /** |
|
| 195 | + * @param string $pluginDir |
|
| 196 | + */ |
|
| 185 | 197 | protected function createTwigBlock($pluginDir, $code) |
| 186 | 198 | { |
| 187 | 199 | $source = <<<EOL |
@@ -206,6 +218,9 @@ discard block |
||
| 206 | 218 | $this->fs->dumpFile($pluginDir.'/TwigBlock.php', $source); |
| 207 | 219 | } |
| 208 | 220 | |
| 221 | + /** |
|
| 222 | + * @param string $pluginDir |
|
| 223 | + */ |
|
| 209 | 224 | protected function createNav($pluginDir, $code) |
| 210 | 225 | { |
| 211 | 226 | $source = <<<EOL |
@@ -230,6 +245,9 @@ discard block |
||
| 230 | 245 | $this->fs->dumpFile($pluginDir.'/Nav.php', $source); |
| 231 | 246 | } |
| 232 | 247 | |
| 248 | + /** |
|
| 249 | + * @param string $pluginDir |
|
| 250 | + */ |
|
| 233 | 251 | protected function createEvent($pluginDir, $code) |
| 234 | 252 | { |
| 235 | 253 | $source = <<<EOL |
@@ -254,6 +272,9 @@ discard block |
||
| 254 | 272 | $this->fs->dumpFile($pluginDir.'/Event.php', $source); |
| 255 | 273 | } |
| 256 | 274 | |
| 275 | + /** |
|
| 276 | + * @param string $pluginDir |
|
| 277 | + */ |
|
| 257 | 278 | protected function createConfigController($pluginDir, $code) |
| 258 | 279 | { |
| 259 | 280 | $snakecased = Container::underscore($code); |
@@ -348,7 +348,7 @@ |
||
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | /** |
| 351 | - * @return boolean |
|
| 351 | + * @return integer |
|
| 352 | 352 | */ |
| 353 | 353 | public function isVisible() |
| 354 | 354 | { |
@@ -21,10 +21,10 @@ |
||
| 21 | 21 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 22 | 22 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 23 | 23 | use Symfony\Component\HttpFoundation\RequestStack; |
| 24 | +use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 24 | 25 | use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent; |
| 25 | 26 | use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; |
| 26 | 27 | use Symfony\Component\Security\Http\SecurityEvents; |
| 27 | -use Symfony\Component\Security\Core\AuthenticationEvents; |
|
| 28 | 28 | |
| 29 | 29 | class SecurityListener implements EventSubscriberInterface |
| 30 | 30 | { |
@@ -161,6 +161,9 @@ |
||
| 161 | 161 | return empty($tables) ? false : true; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | + /** |
|
| 165 | + * @param string $pluginDir |
|
| 166 | + */ |
|
| 164 | 167 | protected function getPluginDirectories($pluginDir) |
| 165 | 168 | { |
| 166 | 169 | $finder = (new Finder()) |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use Eccube\Entity\Master\SaleType; |
| 20 | 20 | use Eccube\Entity\Payment; |
| 21 | 21 | use Eccube\Repository\DeliveryRepository; |
| 22 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 23 | 22 | use Eccube\Service\PurchaseFlow\ItemHolderValidator; |
| 23 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * 支払い方法が一致しない明細がないかどうか. |
@@ -32,11 +32,17 @@ |
||
| 32 | 32 | $this->message = $message; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | + /** |
|
| 36 | + * @param string $message |
|
| 37 | + */ |
|
| 35 | 38 | public static function warn($message) |
| 36 | 39 | { |
| 37 | 40 | return new self(self::WARNING, $message); |
| 38 | 41 | } |
| 39 | 42 | |
| 43 | + /** |
|
| 44 | + * @param string $message |
|
| 45 | + */ |
|
| 40 | 46 | public static function error($message) |
| 41 | 47 | { |
| 42 | 48 | return new self(self::ERROR, $message); |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | * @param ProductClassRepository $productClassRepository |
| 57 | 57 | * @param CartService $cartService |
| 58 | 58 | * @param PurchaseFlow $cartPurchaseFlow |
| 59 | - * @param BaseInfo $BaseInfo |
|
| 59 | + * @param BaseInfo $baseInfo |
|
| 60 | 60 | */ |
| 61 | 61 | public function __construct( |
| 62 | 62 | ProductClassRepository $productClassRepository, |
@@ -13,6 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Controller; |
| 15 | 15 | |
| 16 | +use Eccube\Entity\BaseInfo; |
|
| 16 | 17 | use Eccube\Entity\Cart; |
| 17 | 18 | use Eccube\Entity\ProductClass; |
| 18 | 19 | use Eccube\Event\EccubeEvents; |
@@ -26,7 +27,6 @@ discard block |
||
| 26 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 27 | 28 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 28 | 29 | use Symfony\Component\HttpFoundation\Request; |
| 29 | -use Eccube\Entity\BaseInfo; |
|
| 30 | 30 | |
| 31 | 31 | class CartController extends AbstractController |
| 32 | 32 | { |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | /** |
| 356 | 356 | * @param Request $request |
| 357 | 357 | * @param $csvTypeId |
| 358 | - * @param $fileName |
|
| 358 | + * @param string $fileName |
|
| 359 | 359 | * |
| 360 | 360 | * @return StreamedResponse |
| 361 | 361 | */ |
@@ -439,9 +439,9 @@ discard block |
||
| 439 | 439 | * @Route("/%eccube_admin_route%/shipping/{id}/order_status", requirements={"id" = "\d+"}, name="admin_shipping_update_order_status") |
| 440 | 440 | * |
| 441 | 441 | * @param Request $request |
| 442 | - * @param Shipping $shipping |
|
| 442 | + * @param Shipping $Shipping |
|
| 443 | 443 | * |
| 444 | - * @return RedirectResponse |
|
| 444 | + * @return \Symfony\Component\HttpFoundation\JsonResponse |
|
| 445 | 445 | */ |
| 446 | 446 | public function updateOrderStatus(Request $request, Shipping $Shipping) |
| 447 | 447 | { |
@@ -33,19 +33,19 @@ |
||
| 33 | 33 | use Eccube\Repository\OrderRepository; |
| 34 | 34 | use Eccube\Repository\PaymentRepository; |
| 35 | 35 | use Eccube\Service\CsvExportService; |
| 36 | +use Eccube\Service\OrderStateMachine; |
|
| 36 | 37 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 37 | 38 | use Eccube\Service\PurchaseFlow\PurchaseException; |
| 38 | 39 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 39 | -use Eccube\Service\OrderStateMachine; |
|
| 40 | 40 | use Eccube\Util\FormUtil; |
| 41 | 41 | use Knp\Component\Pager\PaginatorInterface; |
| 42 | 42 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
| 43 | 43 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 44 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 45 | -use Symfony\Component\HttpFoundation\Response; |
|
| 45 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 46 | 46 | use Symfony\Component\HttpFoundation\Request; |
| 47 | +use Symfony\Component\HttpFoundation\Response; |
|
| 47 | 48 | use Symfony\Component\HttpFoundation\StreamedResponse; |
| 48 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 49 | 49 | use Symfony\Component\Validator\Constraints as Assert; |
| 50 | 50 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
| 51 | 51 | |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | use Eccube\Common\Constant; |
| 17 | 17 | use Eccube\Controller\AbstractController; |
| 18 | -use Eccube\Entity\Master\ShippingStatus; |
|
| 19 | 18 | use Eccube\Entity\OrderItem; |
| 20 | 19 | use Eccube\Entity\Shipping; |
| 21 | 20 | use Eccube\Event\EccubeEvents; |