Completed
Pull Request — experimental/3.1 (#2674)
by
unknown
29:06 queued 02:39
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/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/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 1 patch
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.
src/Eccube/Command/GeneratorCommand/AbstractPluginGenerator.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
      * @param array $metadatas
349 349
      * @param array $fsList
350 350
      * @param $pluginCode
351
-     * @param $codePath
351
+     * @param string $codePath
352 352
      */
353 353
     protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath)
354 354
     {
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
      *
374 374
      * @param $pluginCode
375 375
      * @param array $metadatas
376
-     * @return mixed|string
376
+     * @return string
377 377
      */
378 378
     protected function makeMigration($pluginCode, array $metadatas)
379 379
     {
Please login to merge, or discard this patch.
app/Acme/Controller/RoutingTestController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
      * @Security("has_role('ROLE_ADMIN')")
17 17
      *
18 18
      * @param Application $app
19
-     * @return \Symfony\Component\HttpFoundation\Response
19
+     * @return string
20 20
      */
21 21
     public function testAdmin(Application $app)
22 22
     {
Please login to merge, or discard this patch.