Completed
Branch modify-scrutinizeryml (c70e79)
by Kentaro
39:02
created
src/Eccube/Form/Type/CustomerType.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
23 23
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
24 24
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
25
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
26 25
 use Symfony\Component\Form\Extension\Core\Type\TextType;
26
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
27 27
 use Symfony\Component\Form\FormBuilderInterface;
28 28
 use Symfony\Component\Validator\Constraints as Assert;
29 29
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleItemType.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
     /**
65 65
      * ShippingMultipleItemType constructor.
66 66
      *
67
-     * @param array $eccubeConfig
67
+     * @param EccubeConfig $eccubeConfig
68 68
      * @param Session $session
69 69
      * @param AuthorizationCheckerInterface $authorizationChecker
70 70
      * @param TokenStorageInterface $tokenStorage
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 2 patches
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@
 block discarded – undo
15 15
 
16 16
 use Doctrine\ORM\QueryBuilder;
17 17
 use Eccube\Doctrine\Query\Queries;
18
-use Eccube\Entity\Order;
19 18
 use Eccube\Entity\Master\OrderStatus;
19
+use Eccube\Entity\Order;
20 20
 use Eccube\Util\StringUtil;
21 21
 use Symfony\Bridge\Doctrine\RegistryInterface;
22 22
 
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -287,8 +287,8 @@
 block discarded – undo
287 287
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
288 288
             $qb
289 289
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
290
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
291
-                           'o.order_code LIKE :likemulti')
290
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
291
+                            'o.order_code LIKE :likemulti')
292 292
                 ->setParameter('multi', $multi)
293 293
                 ->setParameter('likemulti', '%'.$searchData['multi'].'%');
294 294
         }
Please login to merge, or discard this patch.
src/Eccube/Repository/TaxRuleRepository.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 
16 16
 use Doctrine\ORM\NoResultException;
17 17
 use Eccube\Common\EccubeConfig;
18
+use Eccube\Entity\BaseInfo;
18 19
 use Eccube\Entity\Customer;
19 20
 use Eccube\Entity\TaxRule;
20 21
 use Symfony\Bridge\Doctrine\RegistryInterface;
21 22
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
22 23
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
23
-use Eccube\Entity\BaseInfo;
24 24
 
25 25
 /**
26 26
  * TaxRuleRepository
Please login to merge, or discard this patch.
src/Eccube/Service/CartService.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -438,6 +438,9 @@
 block discarded – undo
438 438
         return $user;
439 439
     }
440 440
 
441
+    /**
442
+     * @param string $allocatedId
443
+     */
441 444
     protected function createCartKey($allocatedId, Customer $Customer = null)
442 445
     {
443 446
         if ($Customer instanceof Customer) {
Please login to merge, or discard this patch.
Unused Use Statements   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,6 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 namespace Eccube\Service;
15 15
 
16
+use Doctrine\ORM\EntityManagerInterface;
16 17
 use Doctrine\ORM\UnitOfWork;
17 18
 use Eccube\Entity\Cart;
18 19
 use Eccube\Entity\CartItem;
@@ -20,15 +21,14 @@  discard block
 block discarded – undo
20 21
 use Eccube\Entity\ItemHolderInterface;
21 22
 use Eccube\Entity\ProductClass;
22 23
 use Eccube\Repository\CartRepository;
23
-use Eccube\Repository\ProductClassRepository;
24 24
 use Eccube\Repository\OrderRepository;
25
+use Eccube\Repository\ProductClassRepository;
25 26
 use Eccube\Service\Cart\CartItemAllocator;
26 27
 use Eccube\Service\Cart\CartItemComparator;
27 28
 use Eccube\Util\StringUtil;
28 29
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
29 30
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
30 31
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
31
-use Doctrine\ORM\EntityManagerInterface;
32 32
 
33 33
 class CartService
34 34
 {
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
      * @param \Eccube\Entity\Csv $Csv
297 297
      * @param $entity
298 298
      *
299
-     * @return mixed|null|string|void
299
+     * @return string|null
300 300
      */
301 301
     public function getData(Csv $Csv, $entity)
302 302
     {
@@ -366,7 +366,6 @@  discard block
 block discarded – undo
366 366
 
367 367
     /**
368 368
      * @param $row
369
-     * @param null $callback
370 369
      */
371 370
     public function fputcsv($row)
372 371
     {
Please login to merge, or discard this patch.
Unused Use Statements   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,10 @@  discard block
 block discarded – undo
16 16
 use Doctrine\Common\Collections\ArrayCollection;
17 17
 use Doctrine\Common\Util\ClassUtils;
18 18
 use Doctrine\ORM\EntityManagerInterface;
19
+use Doctrine\ORM\QueryBuilder;
19 20
 use Eccube\Common\EccubeConfig;
21
+use Eccube\Entity\Csv;
22
+use Eccube\Entity\Master\CsvType;
20 23
 use Eccube\Form\Type\Admin\SearchProductType;
21 24
 use Eccube\Form\Type\Admin\SearchShippingType;
22 25
 use Eccube\Repository\CsvRepository;
@@ -29,9 +32,6 @@  discard block
 block discarded – undo
29 32
 use Eccube\Util\FormUtil;
30 33
 use Symfony\Component\Form\FormFactoryInterface;
31 34
 use Symfony\Component\HttpFoundation\Request;
32
-use Doctrine\ORM\QueryBuilder;
33
-use Eccube\Entity\Master\CsvType;
34
-use Eccube\Entity\Csv;
35 35
 
36 36
 class CsvExportService
37 37
 {
Please login to merge, or discard this patch.
src/Eccube/Service/MailService.php 1 patch
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
      * Send customer confirm mail.
99 99
      *
100 100
      * @param $Customer 会員情報
101
-     * @param $activateUrl アクティベート用url
101
+     * @param string $activateUrl アクティベート用url
102 102
      */
103 103
     public function sendCustomerConfirmMail(\Eccube\Entity\Customer $Customer, $activateUrl)
104 104
     {
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
      *
296 296
      * @param \Eccube\Entity\Order $Order 受注情報
297 297
      *
298
-     * @return string
298
+     * @return \Swift_Message
299 299
      */
300 300
     public function sendOrderMail(\Eccube\Entity\Order $Order)
301 301
     {
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
      * Send admin customer confirm mail.
341 341
      *
342 342
      * @param $Customer 会員情報
343
-     * @param $activateUrl アクティベート用url
343
+     * @param string $activateUrl アクティベート用url
344 344
      */
345 345
     public function sendAdminCustomerConfirmMail(\Eccube\Entity\Customer $Customer, $activateUrl)
346 346
     {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      * @param $formData 入力内容
392 392
      * @param string $twig テンプレートファイル名
393 393
      *
394
-     * @return $this
394
+     * @return \Swift_Message
395 395
      *
396 396
      * @throws \Twig_Error_Loader
397 397
      * @throws \Twig_Error_Runtime
@@ -438,6 +438,7 @@  discard block
 block discarded – undo
438 438
      * Send password reset notification mail.
439 439
      *
440 440
      * @param $Customer 会員情報
441
+     * @param string $reset_url
441 442
      */
442 443
     public function sendPasswordResetNotificationMail(\Eccube\Entity\Customer $Customer, $reset_url)
443 444
     {
@@ -484,6 +485,7 @@  discard block
 block discarded – undo
484 485
      * Send password reset notification mail.
485 486
      *
486 487
      * @param $Customer 会員情報
488
+     * @param string $password
487 489
      */
488 490
     public function sendPasswordResetCompleteMail(\Eccube\Entity\Customer $Customer, $password)
489 491
     {
Please login to merge, or discard this patch.
src/Eccube/Service/OrderService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
      *
33 33
      * @param Order $Order
34 34
      *
35
-     * @return array
35
+     * @return \Eccube\Entity\Master\SaleType[]
36 36
      *
37 37
      * @deprecated since 3.0.0, to be removed in 3.1
38 38
      */
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
      * @param integer $price 単価
76 76
      * @param integer $quantity 数量
77 77
      *
78
-     * @return integer additional point
78
+     * @return double additional point
79 79
      */
80 80
     protected function priceToAddPoint($pointRate, $price, $quantity)
81 81
     {
Please login to merge, or discard this patch.