diff --git a/codeception/_support/Page/Admin/AbstractAdminPage.php b/codeception/_support/Page/Admin/AbstractAdminPage.php index b6e63fbf9d4..c6cddbfe8c0 100644 --- a/codeception/_support/Page/Admin/AbstractAdminPage.php +++ b/codeception/_support/Page/Admin/AbstractAdminPage.php @@ -36,7 +36,7 @@ protected function goPage($url, $pageTitle = '') return $this->atPage($pageTitle); } else { $this->tester->wait(5); - $this->tester->waitForJS("return location.pathname + location.search == '${adminUrl}'"); + $this->tester->waitForJS("return location.pathname + location.search == '{$adminUrl}'"); } return $this; diff --git a/codeception/_support/Page/Admin/ApiWebHookPage.php b/codeception/_support/Page/Admin/ApiWebHookPage.php index 362c1d8d0b3..7d0137b5cef 100644 --- a/codeception/_support/Page/Admin/ApiWebHookPage.php +++ b/codeception/_support/Page/Admin/ApiWebHookPage.php @@ -37,7 +37,7 @@ public function 削除($i) { $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'action-delete')]"]); $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]); - $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]); return $this; } } diff --git a/codeception/_support/Page/Admin/AuthorityManagePage.php b/codeception/_support/Page/Admin/AuthorityManagePage.php index d3b78da32cf..a19c66e4083 100644 --- a/codeception/_support/Page/Admin/AuthorityManagePage.php +++ b/codeception/_support/Page/Admin/AuthorityManagePage.php @@ -45,8 +45,8 @@ public function 行削除($rowNum) public function 入力($rowNum, $role, $url) { - $this->tester->selectOption(['css' => "form #table-authority tbody tr:nth-child(${rowNum}) td:nth-child(1) select"], $role); - $this->tester->fillField(['css' => "form #table-authority tbody tr:nth-child(${rowNum}) td:nth-child(2) input"], $url); + $this->tester->selectOption(['css' => "form #table-authority tbody tr:nth-child({$rowNum}) td:nth-child(1) select"], $role); + $this->tester->fillField(['css' => "form #table-authority tbody tr:nth-child({$rowNum}) td:nth-child(2) input"], $url); return $this; } diff --git a/codeception/_support/Page/Admin/BlockManagePage.php b/codeception/_support/Page/Admin/BlockManagePage.php index c8d409adcf5..ce1e6348a5d 100644 --- a/codeception/_support/Page/Admin/BlockManagePage.php +++ b/codeception/_support/Page/Admin/BlockManagePage.php @@ -38,13 +38,13 @@ public function 新規入力() public function 編集($rowNum) { $rowNum++; - $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[data-bs-original-title=編集]"); + $this->tester->click(".c-contentsArea .list-group > li:nth-child({$rowNum}) a[data-bs-original-title=編集]"); } public function 削除($rowNum) { $rowNum++; - $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-bs-original-title=削除] a"); + $this->tester->click(".c-contentsArea .list-group > li:nth-child({$rowNum}) [data-bs-original-title=削除] a"); return $this; } diff --git a/codeception/_support/Page/Admin/CategoryManagePage.php b/codeception/_support/Page/Admin/CategoryManagePage.php index a2aa766fb0d..9127cd73057 100644 --- a/codeception/_support/Page/Admin/CategoryManagePage.php +++ b/codeception/_support/Page/Admin/CategoryManagePage.php @@ -52,14 +52,14 @@ public function カテゴリ作成() public function 一覧_選択($rowNum) { - $this->tester->click("body > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a"); + $this->tester->click("body > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a"); return $this; } public function 一覧_編集($rowNum) { - $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col-auto.text-end > a:nth-child(3)"); + $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col-auto.text-end > a:nth-child(3)"); return $this; } @@ -80,7 +80,7 @@ public function 一覧_インライン編集_決定($rowNum) public function 一覧_削除($rowNum) { - $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a"); + $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a"); return $this; } diff --git a/codeception/_support/Page/Admin/ClassCategoryManagePage.php b/codeception/_support/Page/Admin/ClassCategoryManagePage.php index 829d9631d96..e29100aca30 100644 --- a/codeception/_support/Page/Admin/ClassCategoryManagePage.php +++ b/codeception/_support/Page/Admin/ClassCategoryManagePage.php @@ -50,28 +50,28 @@ public function 分類作成() public function 一覧_編集($rowNum) { - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) a:nth-child(3)"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) a:nth-child(3)"); return $this; } public function 一覧_入力_分類名($row, $value) { - $this->tester->fillField(['css' => "ul.list-group > li:nth-child(${row}) form input[type=text]"], $value); + $this->tester->fillField(['css' => "ul.list-group > li:nth-child({$row}) form input[type=text]"], $value); return $this; } public function 一覧_分類作成($row) { - $this->tester->click("ul.list-group > li:nth-child(${row}) form button[type=submit]"); + $this->tester->click("ul.list-group > li:nth-child({$row}) form button[type=submit]"); return $this; } public function 一覧_削除($rowNum) { - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a"); return $this; } @@ -99,21 +99,21 @@ public function CSV出力項目設定() public function 一覧_上に($rowNum) { - $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, -60); + $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, -60); return $this; } public function 一覧_下に($rowNum) { - $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, 60); + $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, 60); return $this; } public function 一覧_名称($rowNum) { - return "ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center"; + return "ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center"; } public static function XPathでタグを取得する($textEl) diff --git a/codeception/_support/Page/Admin/ClassNameManagePage.php b/codeception/_support/Page/Admin/ClassNameManagePage.php index 99d60c5807b..b2b1c0c90c1 100644 --- a/codeception/_support/Page/Admin/ClassNameManagePage.php +++ b/codeception/_support/Page/Admin/ClassNameManagePage.php @@ -62,19 +62,19 @@ public function 規格作成() public function 規格編集($rowNum) { - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > form > div:nth-child(6) > button"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > form > div:nth-child(6) > button"); return $this; } public function 一覧_名称($rowNum) { - return "ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a"; + return "ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a"; } public function 一覧_分類登録($rowNum) { - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a"); return $this; } @@ -88,7 +88,7 @@ public function 一覧_分類登録2() public function 一覧_編集($rowNum) { - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > a.action-edit"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > a.action-edit"); return $this; } @@ -96,7 +96,7 @@ public function 一覧_編集($rowNum) public function 一覧_削除($rowNum) { ++$rowNum; - $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a"); + $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a"); return $this; } @@ -124,14 +124,14 @@ public function CSV出力項目設定() public function 一覧_上に($rowNum) { - $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, -60); + $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, -60); return $this; } public function 一覧_下に($rowNum) { - $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, 60); + $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, 60); return $this; } diff --git a/codeception/_support/Page/Admin/CustomerManagePage.php b/codeception/_support/Page/Admin/CustomerManagePage.php index f9e730e18e1..6d4dd15cd62 100644 --- a/codeception/_support/Page/Admin/CustomerManagePage.php +++ b/codeception/_support/Page/Admin/CustomerManagePage.php @@ -95,7 +95,7 @@ public function 詳細検索_電話番号($value = '') */ public function 一覧_編集($rowNum) { - $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td:nth-child(2) > a"); + $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td:nth-child(2) > a"); return $this; } @@ -105,12 +105,12 @@ public function 一覧_編集($rowNum) */ public function 一覧_削除($rowNum, $execute = true) { - $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div > a"); - $this->tester->waitForElementVisible("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div.modal"); + $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div > a"); + $this->tester->waitForElementVisible("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div.modal"); if ($execute) { - $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div.modal a.btn-ec-delete"); + $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div.modal a.btn-ec-delete"); } else { - $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div.modal button.btn-ec-sub"); + $this->tester->click("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div.modal button.btn-ec-sub"); } return $this; @@ -121,7 +121,7 @@ public function 一覧_削除($rowNum, $execute = true) */ public function 一覧_仮会員メール再送($rowNum, $execute = true) { - $this->tester->click(['xpath' => "//*[@id='search_form']//div/table/tbody/tr[${rowNum}]/td[6]/div/div[1]/a"]); + $this->tester->click(['xpath' => "//*[@id='search_form']//div/table/tbody/tr[{$rowNum}]/td[6]/div/div[1]/a"]); $this->tester->wait(5); if ($execute) { $this->tester->click('送信'); @@ -134,7 +134,7 @@ public function 一覧_仮会員メール再送($rowNum, $execute = true) private function 一覧_メニュー($rowNum) { - $this->tester->click("#search_form > div.row > div > div > div.box-body > div.table_list > div > table > tbody > tr:nth-child(${rowNum}) > td.icon_edit > div > a"); + $this->tester->click("#search_form > div.row > div > div > div.box-body > div.table_list > div > table > tbody > tr:nth-child({$rowNum}) > td.icon_edit > div > a"); return $this; } @@ -156,7 +156,7 @@ public function CSV出力項目設定() */ public function 一覧_会員ID($rowNum) { - return $this->tester->grabTextFrom("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.ps-3"); + return $this->tester->grabTextFrom("#search_form > div.c-contentsArea__cols > div > div > div.card.rounded.border-0.mb-4 > div > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.ps-3"); } public function assertSortedIdList($order) diff --git a/codeception/_support/Page/Admin/DeliveryEditPage.php b/codeception/_support/Page/Admin/DeliveryEditPage.php index 9f9f849974e..a6388e46015 100644 --- a/codeception/_support/Page/Admin/DeliveryEditPage.php +++ b/codeception/_support/Page/Admin/DeliveryEditPage.php @@ -46,7 +46,7 @@ public function 入力_名称($value) public function 入力_支払方法選択($array) { foreach ($array as $id) { - $this->tester->checkOption(['id' => "delivery_payments_${id}"]); + $this->tester->checkOption(['id' => "delivery_payments_{$id}"]); } return $this; diff --git a/codeception/_support/Page/Admin/FileManagePage.php b/codeception/_support/Page/Admin/FileManagePage.php index 20ee13bf6df..0c6b4134b86 100644 --- a/codeception/_support/Page/Admin/FileManagePage.php +++ b/codeception/_support/Page/Admin/FileManagePage.php @@ -86,22 +86,22 @@ public function 一覧_パスをコピー($rowNum) public function 一覧_ファイル名_クリック($rowNum) { - $this->tester->click("#fileList table > tbody > tr:nth-child(${rowNum}) > td:nth-child(2) a"); + $this->tester->click("#fileList table > tbody > tr:nth-child({$rowNum}) > td:nth-child(2) a"); return $this; } public function 一覧_削除($rowNum) { - $this->tester->click("#fileList table > tbody > tr:nth-child(${rowNum}) > td:nth-child(5) a.action-delete"); + $this->tester->click("#fileList table > tbody > tr:nth-child({$rowNum}) > td:nth-child(5) a.action-delete"); return $this; } public function 一覧_削除_accept($rowNum) { - $this->tester->waitForElementVisible("#confirmModal-${rowNum} div.modal-footer a.btn-ec-delete"); - $this->tester->click("#confirmModal-${rowNum} div.modal-footer a.btn-ec-delete"); + $this->tester->waitForElementVisible("#confirmModal-{$rowNum} div.modal-footer a.btn-ec-delete"); + $this->tester->click("#confirmModal-{$rowNum} div.modal-footer a.btn-ec-delete"); return $this; } @@ -115,6 +115,6 @@ public function 一覧_削除_accept($rowNum) */ public function パンくず($index) { - return "//*[@id=\"bread\"]/li[${index}]"; + return "//*[@id=\"bread\"]/li[{$index}]"; } } diff --git a/codeception/_support/Page/Admin/LayoutEditPage.php b/codeception/_support/Page/Admin/LayoutEditPage.php index 9469b5b83a9..88f6a99b3c1 100644 --- a/codeception/_support/Page/Admin/LayoutEditPage.php +++ b/codeception/_support/Page/Admin/LayoutEditPage.php @@ -44,14 +44,14 @@ public function 登録() public function ブロックを移動($blockName, $dest, $timeout = 10) { $this->tester->waitForElementVisible(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][span[text()='{$blockName}']]]]"], $timeout); - $this->tester->dragAndDrop(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][span[text()='${blockName}']]]]"], $dest); + $this->tester->dragAndDrop(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][span[text()='{$blockName}']]]]"], $dest); return $this; } public function コンテキストメニューを開く($blockName) { - $this->tester->click(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][span[text()='${blockName}']]]]/div/div[2]"]); + $this->tester->click(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][span[text()='{$blockName}']]]]/div/div[2]"]); return $this; } diff --git a/codeception/_support/Page/Admin/LayoutManagePage.php b/codeception/_support/Page/Admin/LayoutManagePage.php index c0837cb297b..aca21766939 100644 --- a/codeception/_support/Page/Admin/LayoutManagePage.php +++ b/codeception/_support/Page/Admin/LayoutManagePage.php @@ -31,7 +31,7 @@ public static function go($I) public function レイアウト編集($layoutName) { - $this->tester->click(['xpath' => "//*[@id=\"page_admin_content_layout\"]/div[1]/div[3]/div[2]/div/div//div/a[translate(text(), ' \r\n', '')='${layoutName}']"]); + $this->tester->click(['xpath' => "//*[@id=\"page_admin_content_layout\"]/div[1]/div[3]/div[2]/div/div//div/a[translate(text(), ' \r\n', '')='{$layoutName}']"]); } public function 削除($layoutName) diff --git a/codeception/_support/Page/Admin/MailMagazineHistoryPage.php b/codeception/_support/Page/Admin/MailMagazineHistoryPage.php index 30022c12171..1e57119bb0d 100644 --- a/codeception/_support/Page/Admin/MailMagazineHistoryPage.php +++ b/codeception/_support/Page/Admin/MailMagazineHistoryPage.php @@ -23,26 +23,26 @@ public static function go(\AcceptanceTester $I) public function プレビュー($i) { - $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[1]/a"]); + $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[1]/a"]); return $this; } public function 配信条件($i) { - $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[2]/a"]); + $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[2]/a"]); return $this; } public function 配信結果($i) { - $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[3]/a"]); + $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[3]/a"]); } public function 削除($i) { - $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[4]/a"]); - $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[4]//button[contains(@class, 'btn-ec-delete')]"]); - $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[8]/div/div[4]//button[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[4]/a"]); + $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[4]//button[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"form1\"]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[8]/div/div[4]//button[contains(@class, 'btn-ec-delete')]"]); return $this; } } diff --git a/codeception/_support/Page/Admin/MailMagazineTemplatePage.php b/codeception/_support/Page/Admin/MailMagazineTemplatePage.php index 8e622dc3416..f8aca4a90ec 100644 --- a/codeception/_support/Page/Admin/MailMagazineTemplatePage.php +++ b/codeception/_support/Page/Admin/MailMagazineTemplatePage.php @@ -36,21 +36,21 @@ public function 新規作成() public function 編集($i) { - $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[${i}]/td[3]/a"]); + $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[{$i}]/td[3]/a"]); return $this; } public function 削除($i) { - $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[${i}]/td[4]/a"]); - $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[${i}]/td[4]//button[contains(@class, 'btn-ec-delete')]"]); - $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[${i}]/td[4]//button[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[{$i}]/td[4]/a"]); + $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[{$i}]/td[4]//button[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[{$i}]/td[4]//button[contains(@class, 'btn-ec-delete')]"]); return $this; } public function プレビュー($i) { - $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[${i}]/td[5]/a"]); + $this->tester->click(['xpath' => "//*[@id=\"page_plugin_mail_magazine_template\"]/div//table/tbody/tr[{$i}]/td[5]/a"]); return $this; } } diff --git a/codeception/_support/Page/Admin/MasterDataManagePage.php b/codeception/_support/Page/Admin/MasterDataManagePage.php index 1efd3e69cad..c97e8ad7028 100644 --- a/codeception/_support/Page/Admin/MasterDataManagePage.php +++ b/codeception/_support/Page/Admin/MasterDataManagePage.php @@ -39,7 +39,7 @@ public function 選択($option) { $this->tester->selectOption(['id' => 'admin_system_masterdata_masterdata'], $option); $this->tester->click('#form1 button'); - $this->tester->waitForElement(['xpath' => "//select[@id='admin_system_masterdata_masterdata']/option[@selected][contains(text(), '${option}')]"]); + $this->tester->waitForElement(['xpath' => "//select[@id='admin_system_masterdata_masterdata']/option[@selected][contains(text(), '{$option}')]"]); return $this; } diff --git a/codeception/_support/Page/Admin/NewsManagePage.php b/codeception/_support/Page/Admin/NewsManagePage.php index b9526ea7972..d83ecbbbd1c 100644 --- a/codeception/_support/Page/Admin/NewsManagePage.php +++ b/codeception/_support/Page/Admin/NewsManagePage.php @@ -53,12 +53,12 @@ public function 一覧_編集($rowNum) public function 一覧_タイトル($rowNum) { - return $this->tester->grabTextFrom(['css' => ".c-contentsArea .list-group li:nth-child(${rowNum}) a:nth-of-type(1)"]); + return $this->tester->grabTextFrom(['css' => ".c-contentsArea .list-group li:nth-child({$rowNum}) a:nth-of-type(1)"]); } public function 一覧_下へ($rowNum) { - $this->tester->click(" ul .list-group li:nth-child(${rowNum}) + $this->tester->click(" ul .list-group li:nth-child({$rowNum}) div > div :nth-child(4) > a"); return $this; @@ -66,7 +66,7 @@ public function 一覧_下へ($rowNum) public function 一覧_削除($rowNum) { - $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-bs-original-title=削除] a"); + $this->tester->click(".c-contentsArea .list-group > li:nth-child({$rowNum}) [data-bs-original-title=削除] a"); return $this; } diff --git a/codeception/_support/Page/Admin/OrderManagePage.php b/codeception/_support/Page/Admin/OrderManagePage.php index fb646d87cf3..7090ebd5eb7 100644 --- a/codeception/_support/Page/Admin/OrderManagePage.php +++ b/codeception/_support/Page/Admin/OrderManagePage.php @@ -145,7 +145,7 @@ public function PDFフォームを入力($elId, $value) public function 一覧_編集($rowNum) { - $this->tester->click("#search_result > tbody > tr:nth-child(${rowNum}) a.action-edit"); + $this->tester->click("#search_result > tbody > tr:nth-child({$rowNum}) a.action-edit"); return $this; } @@ -175,7 +175,7 @@ public function Cancel_削除() public function 一覧_メール通知($rowNum) { - $this->tester->click(['css' => "#search_result > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div:nth-child(1) > a"]); + $this->tester->click(['css' => "#search_result > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div:nth-child(1) > a"]); $this->tester->waitForElementVisible(['id' => 'sentUpdateModal']); $this->tester->scrollTo(['id' => 'bulkChange']); $this->tester->click(['id' => 'bulkChange']); @@ -186,7 +186,7 @@ public function 一覧_メール通知($rowNum) public function 一覧_選択($rowNum) { - $this->tester->checkOption(['css' => "#search_result > tbody > tr:nth-child(${rowNum}) > td > input[type=checkbox]"]); + $this->tester->checkOption(['css' => "#search_result > tbody > tr:nth-child({$rowNum}) > td > input[type=checkbox]"]); return $this; } @@ -200,7 +200,7 @@ public function 一覧_全選択() public function 個別メール送信($rowNum) { - $this->tester->click(['css' => "#search_result > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3.text-center > div > div:nth-child(1) > a"]); + $this->tester->click(['css' => "#search_result > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3.text-center > div > div:nth-child(1) > a"]); $this->tester->waitForElementVisible(['id' => 'sentUpdateModal']); $this->tester->scrollTo(['id' => 'bulkChange']); $this->tester->click(['id' => 'bulkChange']); @@ -268,17 +268,17 @@ public function 出荷済にする($rowNum) public function 取得_出荷伝票番号($rowNum) { - return $this->tester->grabValueFrom("#search_result > tbody > tr:nth-child(${rowNum}) > td:nth-child(8) > div > input"); + return $this->tester->grabValueFrom("#search_result > tbody > tr:nth-child({$rowNum}) > td:nth-child(8) > div > input"); } public function 取得_出荷日($rowNum) { - return $this->tester->grabTextFrom("#search_result > tbody > tr:nth-child(${rowNum}) > td:nth-child(7)"); + return $this->tester->grabTextFrom("#search_result > tbody > tr:nth-child({$rowNum}) > td:nth-child(7)"); } public function 取得_ステータス($rowNum) { - return $this->tester->grabTextFrom("#search_result > tbody > tr:nth-child(${rowNum}) > td:nth-child(4) > span"); + return $this->tester->grabTextFrom("#search_result > tbody > tr:nth-child({$rowNum}) > td:nth-child(4) > span"); } public function 件数変更($num) diff --git a/codeception/_support/Page/Admin/PageManagePage.php b/codeception/_support/Page/Admin/PageManagePage.php index da9dea74673..8f58df2ee69 100644 --- a/codeception/_support/Page/Admin/PageManagePage.php +++ b/codeception/_support/Page/Admin/PageManagePage.php @@ -42,13 +42,13 @@ public function ページ編集($pageName) public function 削除($pageName) { - $this->tester->click(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '${pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/a"]); + $this->tester->click(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '{$pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/a"]); $this->accept_削除($pageName); } public function accept_削除($pageName) { - $this->tester->waitForElementVisible(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '${pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/div[contains(@class, 'modal')]"]); - $this->tester->click(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '${pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/div[contains(@class, 'modal')]/div/div/a[contains(@class, 'btn-ec-delete')]"]); + $this->tester->waitForElementVisible(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '{$pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/div[contains(@class, 'modal')]"]); + $this->tester->click(['xpath' => "//*[@class='table table-sm']/tbody/tr/td/a[contains(text(), '{$pageName}')]/parent::node()/parent::node()/td[@class='align-middle pe-3']/div/div/div[contains(@class, 'modal')]/div/div/a[contains(@class, 'btn-ec-delete')]"]); } } diff --git a/codeception/_support/Page/Admin/PaymentManagePage.php b/codeception/_support/Page/Admin/PaymentManagePage.php index 1e72c40951b..a76a951ce17 100644 --- a/codeception/_support/Page/Admin/PaymentManagePage.php +++ b/codeception/_support/Page/Admin/PaymentManagePage.php @@ -40,13 +40,13 @@ public function 一覧_支払方法($rowNum) { $rowNum = $rowNum + 1; - return ".c-contentsArea__primaryCol .c-primaryCol .card-body ul li:nth-child(${rowNum})"; + return ".c-contentsArea__primaryCol .c-primaryCol .card-body ul li:nth-child({$rowNum})"; } public function 一覧_下に($rowNum) { $rowNum = $rowNum + 1; - $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child(${rowNum}) .justify-content-around a.action-down "); + $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child({$rowNum}) .justify-content-around a.action-down "); return $this; } @@ -54,13 +54,13 @@ public function 一覧_下に($rowNum) public function 一覧_編集($rowNum) { $rowNum = $rowNum + 1; - $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child(${rowNum}) a:first-child"); + $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child({$rowNum}) a:first-child"); } public function 一覧_削除($rowNum) { $rowNum = $rowNum + 1; - $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child(${rowNum}) > div > div.col-3.text-end > div > a"); + $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child({$rowNum}) > div > div.col-3.text-end > div > a"); $this->tester->wait(1); // accept modal @@ -82,7 +82,7 @@ public function 新規入力() public function 一覧_上に($rowNum) { $rowNum = $rowNum + 1; - $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child(${rowNum}) .justify-content-around a.action-up "); + $this->tester->click(".c-contentsArea__primaryCol .list-group-flush .list-group-item:nth-child({$rowNum}) .justify-content-around a.action-up "); return $this; } diff --git a/codeception/_support/Page/Admin/ProductClassEditPage.php b/codeception/_support/Page/Admin/ProductClassEditPage.php index 4f603370243..d53068c1b1b 100644 --- a/codeception/_support/Page/Admin/ProductClassEditPage.php +++ b/codeception/_support/Page/Admin/ProductClassEditPage.php @@ -54,7 +54,7 @@ public function 入力_規格1($value) public function 無効_規格($rowNum) { --$rowNum; - $this->tester->uncheckOption(['id' => "product_class_matrix_product_classes_${rowNum}_checked"]); + $this->tester->uncheckOption(['id' => "product_class_matrix_product_classes_{$rowNum}_checked"]); return $this; } @@ -62,7 +62,7 @@ public function 無効_規格($rowNum) public function 有効_規格($rowNum) { --$rowNum; - $this->tester->checkOption(['id' => "product_class_matrix_product_classes_${rowNum}_checked"]); + $this->tester->checkOption(['id' => "product_class_matrix_product_classes_{$rowNum}_checked"]); return $this; } @@ -70,7 +70,7 @@ public function 有効_規格($rowNum) public function 入力_在庫数無制限($rowNum) { --$rowNum; - $this->tester->checkOption(['id' => "product_class_matrix_product_classes_${rowNum}_stock_unlimited"]); + $this->tester->checkOption(['id' => "product_class_matrix_product_classes_{$rowNum}_stock_unlimited"]); return $this; } @@ -78,7 +78,7 @@ public function 入力_在庫数無制限($rowNum) public function 無効_在庫数無制限($rowNum) { --$rowNum; - $this->tester->uncheckOption(['id' => "product_class_matrix_product_classes_${rowNum}_stock_unlimited"]); + $this->tester->uncheckOption(['id' => "product_class_matrix_product_classes_{$rowNum}_stock_unlimited"]); return $this; } @@ -86,7 +86,7 @@ public function 無効_在庫数無制限($rowNum) public function 入力_販売価格($rowNum, $value) { --$rowNum; - $this->tester->fillField(['id' => "product_class_matrix_product_classes_${rowNum}_price02"], $value); + $this->tester->fillField(['id' => "product_class_matrix_product_classes_{$rowNum}_price02"], $value); return $this; } @@ -94,7 +94,7 @@ public function 入力_販売価格($rowNum, $value) public function 入力_個数($rowNum, $value) { --$rowNum; - $this->tester->fillField(['id' => "product_class_matrix_product_classes_${rowNum}_stock"], $value); + $this->tester->fillField(['id' => "product_class_matrix_product_classes_{$rowNum}_stock"], $value); return $this; } @@ -102,7 +102,7 @@ public function 入力_個数($rowNum, $value) public function 選択($rowNum) { --$rowNum; - $this->tester->checkOption(['id' => "product_class_matrix_product_classes_${rowNum}_checked"]); + $this->tester->checkOption(['id' => "product_class_matrix_product_classes_{$rowNum}_checked"]); return $this; } diff --git a/codeception/_support/Page/Admin/ProductEditPage.php b/codeception/_support/Page/Admin/ProductEditPage.php index 8775797df37..0c1045df077 100644 --- a/codeception/_support/Page/Admin/ProductEditPage.php +++ b/codeception/_support/Page/Admin/ProductEditPage.php @@ -106,7 +106,7 @@ public function クリックして開くタグリスト() public function クリックして選択タグ($num) { - $this->tester->click(['css' => "#allTags > div:nth-child(${num}) button"]); + $this->tester->click(['css' => "#allTags > div:nth-child({$num}) button"]); return $this; } diff --git a/codeception/_support/Page/Admin/ProductManagePage.php b/codeception/_support/Page/Admin/ProductManagePage.php index d6b984ca84f..c9715055785 100644 --- a/codeception/_support/Page/Admin/ProductManagePage.php +++ b/codeception/_support/Page/Admin/ProductManagePage.php @@ -131,7 +131,7 @@ public function 検索を実行() */ public function 検索結果_規格設定($rowNum) { - $this->tester->click("#main #result_list__list > div > div:nth-child(${rowNum}) > div:nth-child(4) > div > ul > li:nth-child(1) > a"); + $this->tester->click("#main #result_list__list > div > div:nth-child({$rowNum}) > div:nth-child(4) > div > ul > li:nth-child(1) > a"); } /** @@ -143,7 +143,7 @@ public function 検索結果_規格設定($rowNum) */ public function 検索結果_複製($rowNum) { - $this->tester->click("#page_admin_product > div > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div:nth-child(2) > a"); + $this->tester->click("#page_admin_product > div > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div:nth-child(2) > a"); return $this; } @@ -157,7 +157,7 @@ public function 検索結果_複製($rowNum) */ public function 検索結果_確認($rowNum) { - $this->tester->click("#page_admin_product > div > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div:nth-child(1) > a"); + $this->tester->click("#page_admin_product > div > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div:nth-child(1) > a"); return $this; } @@ -171,7 +171,7 @@ public function 検索結果_確認($rowNum) */ public function 検索結果_選択($rowNum) { - $this->tester->click("#form_bulk > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td:nth-child(4) > a"); + $this->tester->click("#form_bulk > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child({$rowNum}) > td:nth-child(4) > a"); return $this; } @@ -185,7 +185,7 @@ public function 検索結果_選択($rowNum) */ public function 規格確認ボタンをクリック($rowNum) { - $this->tester->click(['css' => "#ex-product-${rowNum} > td:nth-child(7) > button"]); + $this->tester->click(['css' => "#ex-product-{$rowNum} > td:nth-child(7) > button"]); $this->tester->waitForElementVisible(['id' => 'productClassesModal']); $this->tester->wait(1); @@ -240,7 +240,7 @@ public function 検索結果_廃止() public function Accept_複製する($rowNum) { - $modalCssSelector = "#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3 > div > div:nth-child(2) div.modal"; + $modalCssSelector = "#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3 > div > div:nth-child(2) div.modal"; $this->tester->waitForElementVisible(['css' => $modalCssSelector]); $this->tester->click($modalCssSelector.' div.modal-footer a.btn-ec-conversion'); diff --git a/codeception/_support/Page/Admin/ProductReviewManagePage.php b/codeception/_support/Page/Admin/ProductReviewManagePage.php index 502159b100e..52c5bf4daad 100644 --- a/codeception/_support/Page/Admin/ProductReviewManagePage.php +++ b/codeception/_support/Page/Admin/ProductReviewManagePage.php @@ -29,15 +29,15 @@ public function 検索() public function 編集($i) { - $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[${i}]/td[8]/div[1]/a[1]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[{$i}]/td[8]/div[1]/a[1]"]); return $this; } public function 削除($i) { - $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[${i}]/td[8]/div[1]/a[2]"]); - $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[${i}]//div[contains(@class, 'modal')]//a[contains(@class, 'btn-ec-delete')]"]); - $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[${i}]//div[contains(@class, 'modal')]//a[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[{$i}]/td[8]/div[1]/a[2]"]); + $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[{$i}]//div[contains(@class, 'modal')]//a[contains(@class, 'btn-ec-delete')]"]); + $this->tester->click(['xpath' => "//*[@id=\"page_product_review_admin_product_review\"]/div[1]/div[3]/div[3]/div/div/div[2]/div[1]/table/tbody/tr[{$i}]//div[contains(@class, 'modal')]//a[contains(@class, 'btn-ec-delete')]"]); return $this; } diff --git a/codeception/_support/Page/Admin/RecommendManagePage.php b/codeception/_support/Page/Admin/RecommendManagePage.php index 0c15a2de332..482f2ade97e 100644 --- a/codeception/_support/Page/Admin/RecommendManagePage.php +++ b/codeception/_support/Page/Admin/RecommendManagePage.php @@ -36,15 +36,15 @@ public function 新規登録() public function 編集($i) { - $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][${i}]//a[1]"]); + $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][{$i}]//a[1]"]); return $this; } public function 削除($i) { - $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][${i}]//a[2]"]); - $this->tester->waitForElementVisible(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][${i}]//div[contains(@class, 'modal')]//a"]); - $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][${i}]//div[contains(@class, 'modal')]//a"]); + $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][{$i}]//a[2]"]); + $this->tester->waitForElementVisible(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][{$i}]//div[contains(@class, 'modal')]//a"]); + $this->tester->click(['xpath' => "//*[@id='page_plugin_recommend_list']//li[contains(@class, 'sortable-item')][{$i}]//div[contains(@class, 'modal')]//a"]); return $this; } } diff --git a/codeception/_support/Page/Admin/RelatedProductEditPage.php b/codeception/_support/Page/Admin/RelatedProductEditPage.php index eb3fe682bd5..f859ed83bad 100644 --- a/codeception/_support/Page/Admin/RelatedProductEditPage.php +++ b/codeception/_support/Page/Admin/RelatedProductEditPage.php @@ -17,7 +17,7 @@ class RelatedProductEditPage extends ProductEditPage public static function goEdit($I, $id) { $page = new self($I); - return $page->goPage("/product/product/${id}/edit", '商品登録商品管理'); + return $page->goPage("/product/product/{$id}/edit", '商品登録商品管理'); } public function 選択_関連商品1() diff --git a/codeception/_support/Page/Admin/SalesReportPage.php b/codeception/_support/Page/Admin/SalesReportPage.php index 6879f7a26ff..7af0bcfb613 100644 --- a/codeception/_support/Page/Admin/SalesReportPage.php +++ b/codeception/_support/Page/Admin/SalesReportPage.php @@ -69,9 +69,9 @@ public function 月度で集計($yyyyMm) public function 期間で集計($start, $end) { - $this->tester->executeJS("$('#sales_report_term_start').val('${start}')"); + $this->tester->executeJS("$('#sales_report_term_start').val('{$start}')"); $this->tester->wait(1); - $this->tester->executeJS("$('#sales_report_term_end').val('${end}')"); + $this->tester->executeJS("$('#sales_report_term_end').val('{$end}')"); $this->tester->wait(1); $this->tester->click(['id' => 'btn-term']); return $this; diff --git a/codeception/_support/Page/Admin/ShippingEditPage.php b/codeception/_support/Page/Admin/ShippingEditPage.php index 04b5693af9a..9d27727396c 100644 --- a/codeception/_support/Page/Admin/ShippingEditPage.php +++ b/codeception/_support/Page/Admin/ShippingEditPage.php @@ -184,7 +184,7 @@ public function 商品検索($value = '') public function 商品検索結果_選択($rowNum) { $rowNum = $rowNum * 2; - $this->tester->click("#searchProductModalList > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pe-3.text-end > button"); + $this->tester->click("#searchProductModalList > table > tbody > tr:nth-child({$rowNum}) > td.align-middle.pe-3.text-end > button"); $this->tester->waitForElementNotVisible('#searchProductModalList'); $this->tester->wait(5); diff --git a/codeception/_support/Page/Admin/TaxManagePage.php b/codeception/_support/Page/Admin/TaxManagePage.php index 1ed1faf2741..ae740eb0263 100644 --- a/codeception/_support/Page/Admin/TaxManagePage.php +++ b/codeception/_support/Page/Admin/TaxManagePage.php @@ -69,15 +69,15 @@ public function 一覧_削除($rowNum) $this->tester->click("table tbody tr:nth-child({$rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.d-inline-block.me-3 > a"); // accept modal - $this->tester->waitForElementVisible("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal"); - $this->tester->click("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal.fade.show > div > div > div.modal-footer > a"); + $this->tester->waitForElementVisible("table tbody tr:nth-child({$rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal"); + $this->tester->click("table tbody tr:nth-child({$rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal.fade.show > div > div > div.modal-footer > a"); return $this; } public function 一覧_税率($rowNum) { - return "table > tbody > tr:nth-child(${rowNum}) > td.align-middle.text-end .list"; + return "table > tbody > tr:nth-child({$rowNum}) > td.align-middle.text-end .list"; } public function 共通税率設定_登録() diff --git a/codeception/_support/Page/Front/CartPage.php b/codeception/_support/Page/Front/CartPage.php index 64d14967767..8bde7c55a6e 100644 --- a/codeception/_support/Page/Front/CartPage.php +++ b/codeception/_support/Page/Front/CartPage.php @@ -40,12 +40,12 @@ public static function at($I) public function 商品名($index) { - return $this->tester->grabTextFrom(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__name']"]); + return $this->tester->grabTextFrom(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()={$index}]//div[@class='ec-cartRow__name']"]); } public function 商品数量($index) { - $selector = ['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amount']"]; + $selector = ['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()={$index}]//div[@class='ec-cartRow__amount']"]; $this->tester->waitForElement($selector); return $this->tester->grabTextFrom($selector); } @@ -57,21 +57,21 @@ public function 明細数() public function 商品数量増やす($index) { - $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountUpButton')]"]); + $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()={$index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountUpButton')]"]); return $this; } public function 商品数量減らす($index) { - $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountDownButton')]"]); + $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()={$index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountDownButton')]"]); return $this; } public function 商品削除($index) { - $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//li[@class='ec-cartRow__delColumn']/a"]); + $this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()={$index}]//li[@class='ec-cartRow__delColumn']/a"]); $this->tester->acceptPopup(); return $this; diff --git a/codeception/_support/Page/Front/CustomerAddressListPage.php b/codeception/_support/Page/Front/CustomerAddressListPage.php index 6239ffce9c2..c73fbdb1c21 100644 --- a/codeception/_support/Page/Front/CustomerAddressListPage.php +++ b/codeception/_support/Page/Front/CustomerAddressListPage.php @@ -37,14 +37,14 @@ public function 追加() public function 変更($num) { - $this->tester->click("div.ec-addressList div:nth-child(${num}) div.ec-addressList__action a"); + $this->tester->click("div.ec-addressList div:nth-child({$num}) div.ec-addressList__action a"); return new CustomerAddressEditPage($this->tester); } public function 削除($num) { - $this->tester->click("div.ec-addressList div:nth-child(${num}) a.ec-addressList__remove"); + $this->tester->click("div.ec-addressList div:nth-child({$num}) a.ec-addressList__remove"); $this->tester->acceptPopup(); return $this; diff --git a/codeception/_support/Page/Front/MyPage.php b/codeception/_support/Page/Front/MyPage.php index c2dc8fd974d..5bd466096a7 100644 --- a/codeception/_support/Page/Front/MyPage.php +++ b/codeception/_support/Page/Front/MyPage.php @@ -56,7 +56,7 @@ public function 注文履歴() public function 注文履歴詳細($num) { $num += 2; - $this->tester->click(".ec-layoutRole__main div:nth-child(${num}) p.ec-historyListHeader__action a"); + $this->tester->click(".ec-layoutRole__main div:nth-child({$num}) p.ec-historyListHeader__action a"); } public function お気に入り一覧() diff --git a/codeception/_support/Page/Front/ProductDetailPage.php b/codeception/_support/Page/Front/ProductDetailPage.php index 68ea9a76ad7..bdd051dd311 100644 --- a/codeception/_support/Page/Front/ProductDetailPage.php +++ b/codeception/_support/Page/Front/ProductDetailPage.php @@ -48,14 +48,14 @@ public function カテゴリ選択($categories) public function サムネイル切替($num) { - $this->tester->click("div:nth-child(1) > div > div.item_nav > div:nth-child(${num})"); + $this->tester->click("div:nth-child(1) > div > div.item_nav > div:nth-child({$num})"); return $this; } public function サムネイル画像URL($num) { - return $this->tester->grabAttributeFrom("div:nth-child(1) > div > div.item_nav > div:nth-child(${num}) > img", 'src'); + return $this->tester->grabAttributeFrom("div:nth-child(1) > div > div.item_nav > div:nth-child({$num}) > img", 'src'); } public function 規格選択($array) @@ -81,7 +81,7 @@ public function カートに入れる($num, $category1 = null, $category2 = null $this->tester->selectOption(['id' => 'classcategory_id1'], $category1); if (!is_null($category2)) { $category2_id = current(array_keys($category2)); - $this->tester->waitForElement(['xpath' => "//*[@id='classcategory_id2']/option[@value='${category2_id}']"]); + $this->tester->waitForElement(['xpath' => "//*[@id='classcategory_id2']/option[@value='{$category2_id}']"]); $this->tester->selectOption(['id' => 'classcategory_id2'], $category2); } } diff --git a/codeception/_support/Page/Front/ProductListPage.php b/codeception/_support/Page/Front/ProductListPage.php index f9a5820e766..5bff185c3a3 100644 --- a/codeception/_support/Page/Front/ProductListPage.php +++ b/codeception/_support/Page/Front/ProductListPage.php @@ -30,8 +30,8 @@ public function __construct(\AcceptanceTester $I) public function 表示件数設定($num) { - $this->tester->selectOption(['css' => "select[name = 'disp_number']"], "${num}件"); - $this->tester->waitForElement(['css' => "select[name='disp_number'] > option[value='${num}'][selected]"]); + $this->tester->selectOption(['css' => "select[name = 'disp_number']"], "{$num}件"); + $this->tester->waitForElement(['css' => "select[name='disp_number'] > option[value='{$num}'][selected]"]); return $this; } @@ -39,7 +39,7 @@ public function 表示件数設定($num) public function 表示順設定($sort) { $this->tester->selectOption(['css' => "select[name = 'orderby']"], $sort); - $this->tester->waitForElement(['xpath' => "//select[@name='orderby']/option[text()='${sort}']"]); + $this->tester->waitForElement(['xpath' => "//select[@name='orderby']/option[text()='{$sort}']"]); return $this; } @@ -53,13 +53,13 @@ public function 一覧件数取得() public function カートに入れる($index, $num = 1, $category1 = null, $category2 = null) { - $this->tester->fillField(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child(${index}) form input[name='quantity']"], $num); + $this->tester->fillField(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child({$index}) form input[name='quantity']"], $num); if (!is_null($category1)) { - $this->tester->selectOption(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child(${index}) form select[name='classcategory_id1']"], $category1); + $this->tester->selectOption(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child({$index}) form select[name='classcategory_id1']"], $category1); if (!is_null($category2)) { $category2_id = current(array_keys($category2)); - $this->tester->waitForElement(['xpath' => "//ul[@class='ec-shelfGrid']/li[@class='ec-shelfGrid__item'][${index}]//select[@name='classcategory_id2']/option[@value='${category2_id}']"]); - $this->tester->selectOption(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child(${index}) form select[name='classcategory_id2']"], $category2); + $this->tester->waitForElement(['xpath' => "//ul[@class='ec-shelfGrid']/li[@class='ec-shelfGrid__item'][{$index}]//select[@name='classcategory_id2']/option[@value='{$category2_id}']"]); + $this->tester->selectOption(['css' => "ul.ec-shelfGrid li.ec-shelfGrid__item:nth-child({$index}) form select[name='classcategory_id2']"], $category2); } } $this->tester->click(['class' => 'add-cart']); diff --git a/src/Eccube/Controller/Admin/Store/PluginController.php b/src/Eccube/Controller/Admin/Store/PluginController.php index 7ef6718bcfe..a3e12ece6b1 100644 --- a/src/Eccube/Controller/Admin/Store/PluginController.php +++ b/src/Eccube/Controller/Admin/Store/PluginController.php @@ -302,7 +302,7 @@ public function enable(Plugin $Plugin, CacheUtil $cacheUtil, Request $request) }); if (!empty($requires)) { $names = array_map(function ($req) { - return "「${req['description']}」"; + return "「{$req['description']}」"; }, $requires); $message = trans('%depend_name%を先に有効化してください。', ['%name%' => $Plugin->getName(), '%depend_name%' => implode(', ', $names)]); diff --git a/src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php b/src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php index 820e0b11cd5..d0fcb1b4748 100644 --- a/src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php +++ b/src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php @@ -139,10 +139,10 @@ private function getClassNamesFromTokens($sourceFile) if (in_array($sourceFile, $this->newProxyFiles)) { $newClassName = $className.StringUtil::random(12); $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]); - $newFilePath = $this->outputDir."${newClassName}.php"; + $newFilePath = $this->outputDir."{$newClassName}.php"; file_put_contents($newFilePath, $tokens->generateCode()); require_once $newFilePath; - $results[] = $namespace."\\${newClassName}"; + $results[] = $namespace."\\{$newClassName}"; } else { $results[] = $fqcn; } diff --git a/src/Eccube/Doctrine/ORM/Query/Extract.php b/src/Eccube/Doctrine/ORM/Query/Extract.php index f82c50d7969..ac182b29e83 100644 --- a/src/Eccube/Doctrine/ORM/Query/Extract.php +++ b/src/Eccube/Doctrine/ORM/Query/Extract.php @@ -101,7 +101,7 @@ public function getSql(SqlWalker $sqlWalker) switch ($driver) { case 'sqlite': $sql = sprintf( - "CAST(STRFTIME('%s', DATETIME(%s, '${op}{$second} SECONDS')) AS INTEGER)", + "CAST(STRFTIME('%s', DATETIME(%s, '{$op}{$second} SECONDS')) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker)); break; diff --git a/tests/Eccube/Tests/Service/PurchaseFlow/Processor/DeliveryFeeFreeByShippingProcessorTest.php b/tests/Eccube/Tests/Service/PurchaseFlow/Processor/DeliveryFeeFreeByShippingProcessorTest.php index 0e8792b5fdb..291d6984693 100644 --- a/tests/Eccube/Tests/Service/PurchaseFlow/Processor/DeliveryFeeFreeByShippingProcessorTest.php +++ b/tests/Eccube/Tests/Service/PurchaseFlow/Processor/DeliveryFeeFreeByShippingProcessorTest.php @@ -212,7 +212,7 @@ private function newShipping($id) $prop = $rc->getProperty('id'); $prop->setAccessible(true); $prop->setValue($Shipping, $id); - $Shipping->setName01("name_${id}"); + $Shipping->setName01("name_{$id}"); return $Shipping; }