Completed
Push — experimental/3.1 ( f562b4...ec61eb )
by
unknown
131:21 queued 124:20
created
src/Eccube/Controller/Admin/Order/MailController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -259,6 +259,9 @@
 block discarded – undo
259 259
     }
260 260
 
261 261
 
262
+    /**
263
+     * @param Application $app
264
+     */
262 265
     private function createBody($app, $header, $footer, $Order)
263 266
     {
264 267
         return $app->renderView('Mail/order.twig', array(
Please login to merge, or discard this patch.
src/Eccube/Repository/TaxRuleRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
66 66
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
67 67
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
68
-     * @return \Eccube\Entity\TaxRule                 税設定情報
68
+     * @return integer                 税設定情報
69 69
      *
70 70
      * @throws NoResultException
71 71
      */
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
275 275
             $qb
276 276
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
277
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
277
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
278 278
                 ->setParameter('multi', $multi)
279 279
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
280 280
         }
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -325,7 +325,6 @@  discard block
 block discarded – undo
325 325
 
326 326
     /**
327 327
      * @param $row
328
-     * @param null $callback
329 328
      */
330 329
     public function fputcsv($row)
331 330
     {
@@ -424,7 +423,6 @@  discard block
 block discarded – undo
424 423
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
425 424
      *
426 425
      * @param array $searchData セッションから取得した検索条件の配列
427
-     * @param EntityManager $em
428 426
      */
429 427
     protected function findDeserializeObjects(array &$searchData)
430 428
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
                                 'allow_add' => true,
139 139
                                 'allow_delete' => true,
140 140
                                 'data' => $ProductClasses,
141
-                             ));
141
+                                ));
142 142
 
143 143
                         $event = new EventArgs(
144 144
                             array(
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -600,6 +600,9 @@  discard block
 block discarded – undo
600 600
     /**
601 601
      * 登録、更新時のエラー画面表示
602 602
      *
603
+     * @param Application $app
604
+     * @param boolean $not_product_class
605
+     * @param \Symfony\Component\Form\FormInterface $classForm
603 606
      */
604 607
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
605 608
     {
@@ -651,6 +654,7 @@  discard block
 block discarded – undo
651 654
 
652 655
     /**
653 656
      * 規格1と規格2を組み合わせた商品規格を作成
657
+     * @param Application $app
654 658
      */
655 659
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
656 660
     {
@@ -738,6 +742,7 @@  discard block
 block discarded – undo
738 742
      *
739 743
      * @param $productClassDest ProductClass コピー先となる商品規格
740 744
      * @param $productClassOrig ProductClass コピー元となる商品規格
745
+     * @param Application $app
741 746
      */
742 747
     private function setDefaultProductClass($app, $productClassDest, $productClassOrig) {
743 748
         $productClassDest->setDeliveryDuration($productClassOrig->getDeliveryDuration());
Please login to merge, or discard this patch.
src/Eccube/Twig/Extension/EccubeExtension.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     /**
41 41
      * Returns a list of functions to add to the existing list.
42 42
      *
43
-     * @return array An array of functions
43
+     * @return \Twig_SimpleFunction[] An array of functions
44 44
      */
45 45
     public function getFunctions()
46 46
     {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     /**
62 62
      * Returns a list of filters.
63 63
      *
64
-     * @return array
64
+     * @return \Twig_SimpleFilter[]
65 65
      */
66 66
     public function getFilters()
67 67
     {
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
     /**
58 58
      * Constructor.
59 59
      *
60
-     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
60
+     * @param Query $query               A Doctrine ORM query or query builder.
61 61
      * @param boolean            $fetchJoinCollection Whether the query joins a collection (true by default).
62 62
      */
63 63
     public function __construct($query, $fetchJoinCollection = true)
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -792,6 +792,7 @@
 block discarded – undo
792 792
      * ProductCategory作成
793 793
      * @param \Eccube\Entity\Product $Product
794 794
      * @param \Eccube\Entity\Category $Category
795
+     * @param integer $count
795 796
      * @return \Eccube\Entity\ProductCategory
796 797
      */
797 798
     private function createProductCategory($Product, $Category, $count)
Please login to merge, or discard this patch.
src/Eccube/Application.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -964,7 +964,7 @@
 block discarded – undo
964 964
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
965 965
      * 備考 : app['debug']がtrueの際は処理を行わない
966 966
      *
967
-     * @return boolean true
967
+     * @return null|boolean true
968 968
      *
969 969
      */
970 970
     protected function checkDatabaseConnection()
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -660,13 +660,13 @@
 block discarded – undo
660 660
         $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']);
661 661
         $ormMappings = array();
662 662
         $ormMappings[] = array(
663
-             'type' => 'annotation',
664
-             'namespace' => 'Eccube\Entity',
665
-             'path' => array(
666
-                 __DIR__.'/Entity'
667
-             ),
668
-             'use_simple_annotation_reader' => false,
669
-         );
663
+                'type' => 'annotation',
664
+                'namespace' => 'Eccube\Entity',
665
+                'path' => array(
666
+                    __DIR__.'/Entity'
667
+                ),
668
+                'use_simple_annotation_reader' => false,
669
+            );
670 670
 
671 671
         if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) {
672 672
 
Please login to merge, or discard this patch.