nanasess / ec-cube

src/Eccube/Repository/AbstractRepository.php

Spacing +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
     {
         // $options = $this->eccubeConfig['doctrine_cache'];
         // return $options['result_cache']['lifetime'];
-        return 0;               // FIXME
+        return 0; // FIXME
     }
 }

src/Eccube/Repository/ShippingRepository.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
                 ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
-                           's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
+                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
                 ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }

Doc Comments +2 added lines, -1 removed lines

@@ -242,7 +242,8 @@
     /**
      * 同一商品のお届け先情報を取得
      *
-     * @param $Order
+     * @param \Eccube\Entity\Order|null $Order
+     * @param \Eccube\Entity\ProductClass|null $productClass
      *
      * @return array
      */

Unused Use Statements +1 added lines, -1 removed lines

@@ -13,10 +13,10 @@
 
 namespace Eccube\Repository;
 
+use Doctrine\ORM\QueryBuilder;
 use Eccube\Entity\Shipping;
 use Eccube\Util\StringUtil;
 use Symfony\Bridge\Doctrine\RegistryInterface;
-use Doctrine\ORM\QueryBuilder;
 
 /**
  * ShippingRepository

src/Eccube/Repository/PluginEventHandlerRepository.php

Indentation +12 added lines, -12 removed lines

@@ -75,11 +75,11 @@ 
 
         $qb = $this->createQueryBuilder('e');
         $qb->andWhere("e.priority >= $range_end ")
-           ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.event = :event')
-           ->setParameter('event', $event)
-           ->setMaxResults(1)
-           ->orderBy('e.priority', 'ASC');
+            ->andWhere("e.priority <= $range_start ")
+            ->andWhere('e.event = :event')
+            ->setParameter('event', $event)
+            ->setMaxResults(1)
+            ->orderBy('e.priority', 'ASC');
 
         $result = $qb->getQuery()->getResult();
         if (count($result)) {
@@ -96,13 +96,13 @@ 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
-           ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
-           ->andWhere('e.event = :event')
-           ->setParameter('event', $pluginEventHandler->getEvent())
-           ->setParameter('pri', $pluginEventHandler->getPriority())
-           ->setMaxResults(1)
-           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
+            ->andWhere("e.priority <= $range_start ")
+            ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
+            ->andWhere('e.event = :event')
+            ->setParameter('event', $pluginEventHandler->getEvent())
+            ->setParameter('pri', $pluginEventHandler->getPriority())
+            ->setMaxResults(1)
+            ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
 
         $result = $qb->getQuery()->getResult();
 

src/Eccube/Form/Type/NameType.php

Indentation +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
                 ],
                 'constraints' => [
                     new Assert\Length([
-                         'max' => $this->eccubeConfig['eccube_name_len'],
+                            'max' => $this->eccubeConfig['eccube_name_len'],
                     ]),
                     new Assert\Regex([
                         'pattern' => '/^[^\s ]+$/u',
@@ -126,7 +126,7 @@ 
                 ],
                 'constraints' => [
                     new Assert\Length([
-                         'max' => $this->eccubeConfig['eccube_name_len'],
+                            'max' => $this->eccubeConfig['eccube_name_len'],
                     ]),
                     new Assert\Regex([
                         'pattern' => '/^[^\s ]+$/u',

src/Eccube/Form/Type/Admin/SecurityType.php

Indentation +2 added lines, -2 removed lines

@@ -79,8 +79,8 @@
                     new Assert\NotBlank(),
                     new Assert\Length(['max' => $this->eccubeConfig['eccube_stext_len']]),
                     new Assert\Regex([
-                       'pattern' => '/^[0-9a-zA-Z]+$/',
-                   ]),
+                        'pattern' => '/^[0-9a-zA-Z]+$/',
+                    ]),
                 ],
                 'data' => $this->eccubeConfig->get('eccube_admin_route'),
             ])

src/Eccube/Controller/Admin/Store/PluginController.php

Spacing +1 added lines, -1 removed lines

@@ -529,7 +529,7 @@
     {
         $curl = curl_init($url);
 
-        $options = [           // オプション配列
+        $options = [// オプション配列
             //HEADER
             CURLOPT_HTTPHEADER => [
                 'Authorization: '.base64_encode($authKey),

Doc Comments +1 added lines, -1 removed lines

@@ -518,7 +518,7 @@
      * APIリクエスト処理
      *
      * @param Request $request
-     * @param $authKey
+     * @param string|null $authKey
      * @param string $url
      *
      * @return array

src/Eccube/Controller/Admin/Setting/Shop/ShopController.php

Indentation +5 added lines, -5 removed lines

@@ -94,15 +94,15 @@
                 $this->entityManager->flush();
 
                 $event = new EventArgs(
-                  [
+                    [
                     'form' => $form,
                     'BaseInfo' => $this->BaseInfo,
-                  ],
-                  $request
+                    ],
+                    $request
                 );
                 $this->eventDispatcher->dispatch(
-                  EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE,
-                  $event
+                    EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE,
+                    $event
                 );
 
                 $cacheUtil->clearCache();

src/Eccube/Controller/Admin/Shipping/EditController.php

Indentation +3 added lines, -3 removed lines

@@ -178,13 +178,13 @@
                     if ($form->get('notify_email')->getData()) {
                         try {
                             $this->mailService->sendShippingNotifyMail(
-                              $TargetShipping
+                                $TargetShipping
                             );
                         } catch (\Exception $e) {
                             log_error('メール通知エラー', [$TargetShipping->getId(), $e]);
                             $this->addError(
-                              'admin.shipping.edit.shipped_mail_failed',
-                              'admin'
+                                'admin.shipping.edit.shipped_mail_failed',
+                                'admin'
                             );
                         }
                     }

Unused Use Statements +1 added lines, -1 removed lines

@@ -24,6 +24,7 @@ 
 use Eccube\Repository\Master\ShippingStatusRepository;
 use Eccube\Repository\OrderItemRepository;
 use Eccube\Repository\ShippingRepository;
+use Eccube\Service\MailService;
 use Eccube\Service\TaxRuleService;
 use Knp\Component\Pager\PaginatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -32,7 +33,6 @@ 
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Serializer\SerializerInterface;
-use Eccube\Service\MailService;
 
 class EditController extends AbstractController
 {

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

Indentation +6 added lines, -6 removed lines

@@ -505,8 +505,8 @@ 
                 if ($flowResult->hasWarning()) {
                     foreach ($flowResult->getWarning() as $warning) {
                         $msg = $this->translator->trans('admin.order.index.bulk_warning', [
-                          '%orderId%' => $Order->getId(),
-                          '%message%' => $warning->getMessage(),
+                            '%orderId%' => $Order->getId(),
+                            '%message%' => $warning->getMessage(),
                         ]);
                         $this->addWarning($msg, 'admin');
                     }
@@ -515,8 +515,8 @@ 
                 if ($flowResult->hasError()) {
                     foreach ($flowResult->getErrors() as $error) {
                         $msg = $this->translator->trans('admin.order.index.bulk_error', [
-                          '%orderId%' => $Order->getId(),
-                          '%message%' => $error->getMessage(),
+                            '%orderId%' => $Order->getId(),
+                            '%message%' => $error->getMessage(),
                         ]);
                         $this->addError($msg, 'admin');
                     }
@@ -527,8 +527,8 @@ 
                     $this->purchaseFlow->purchase($Order, $purchaseContext);
                 } catch (PurchaseException $e) {
                     $msg = $this->translator->trans('admin.order.index.bulk_error', [
-                      '%orderId%' => $Order->getId(),
-                      '%message%' => $e->getMessage(),
+                        '%orderId%' => $Order->getId(),
+                        '%message%' => $e->getMessage(),
                     ]);
                     $this->addError($msg, 'admin');
                     continue;

Unused Use Statements +6 added lines, -6 removed lines

@@ -17,6 +17,8 @@ 
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Csv;
 use Eccube\Entity\Master\CsvType;
+use Eccube\Entity\Master\OrderStatus;
+use Eccube\Entity\Order;
 use Eccube\Entity\OrderItem;
 use Eccube\Entity\Shipping;
 use Eccube\Event\EccubeEvents;
@@ -30,19 +32,17 @@ 
 use Eccube\Repository\OrderRepository;
 use Eccube\Repository\PaymentRepository;
 use Eccube\Service\CsvExportService;
+use Eccube\Service\PurchaseFlow\PurchaseContext;
+use Eccube\Service\PurchaseFlow\PurchaseException;
+use Eccube\Service\PurchaseFlow\PurchaseFlow;
 use Eccube\Util\FormUtil;
 use Knp\Component\Pager\PaginatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Eccube\Entity\Master\OrderStatus;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Eccube\Entity\Order;
-use Eccube\Service\PurchaseFlow\PurchaseContext;
-use Eccube\Service\PurchaseFlow\PurchaseFlow;
-use Eccube\Service\PurchaseFlow\PurchaseException;
 
 class OrderController extends AbstractController
 {