Failed Conditions
Pull Request — experimental/sf (#3369)
by Kentaro
253:05 queued 246:06
created
codeception/_support/Page/Admin/ShippingManagePage.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -58,6 +58,9 @@  discard block
 block discarded – undo
58 58
         return $this;
59 59
     }
60 60
 
61
+    /**
62
+     * @param integer $rowNum
63
+     */
61 64
     public function 一覧_編集($rowNum)
62 65
     {
63 66
         $this->tester->click(['xpath' => "//*[@id='form_bulk']/div[2]/div/table/tbody/tr[${rowNum}]/td[2]/a"]);
@@ -117,6 +120,9 @@  discard block
 block discarded – undo
117 120
         $this->tester->click('#form_bulk #btn_bulk_mail');
118 121
     }
119 122
 
123
+    /**
124
+     * @param integer $rowNum
125
+     */
120 126
     public function 一覧_チェックボックス($rowNum)
121 127
     {
122 128
         $this->tester->click(['xpath' => "//*[@id='form_bulk']/div[2]/div/table/tbody/tr[${rowNum}]/td[1]/input"]);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/OrderController.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.