Merge branch '4.3' into dependabot/npm_and_yarn/webpack-cli-5.1.4

Author: nanasess

codeception/_data/plugins/Bundle-1.0.0/Resource/config/bundles.php

@@ -11,7 +11,20 @@
  * file that was distributed with this source code.
  */
 
+use League\Bundle\OAuth2ServerBundle\LeagueOAuth2ServerBundle;
+use Plugin\Bundle\Bundle\BundleBundle;
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 return [
-    Plugin\Bundle\Bundle\BundleBundle::class => ['all' => true],
-    League\Bundle\OAuth2ServerBundle\LeagueOAuth2ServerBundle::class => ['all' => true]
+    BundleBundle::class => ['all' => true],
+    LeagueOAuth2ServerBundle::class => ['all' => true],
 ];

codeception/_data/plugins/Bundle-1.0.1/Resource/config/bundles.php

@@ -11,7 +11,20 @@
  * file that was distributed with this source code.
  */
 
+use League\Bundle\OAuth2ServerBundle\LeagueOAuth2ServerBundle;
+use Plugin\Bundle\Bundle\BundleBundle;
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 return [
-    Plugin\Bundle\Bundle\BundleBundle::class => ['all' => true],
-    League\Bundle\OAuth2ServerBundle\LeagueOAuth2ServerBundle::class => ['all' => true]
+    BundleBundle::class => ['all' => true],
+    LeagueOAuth2ServerBundle::class => ['all' => true],
 ];

codeception/_support/AcceptanceTester.php

@@ -11,9 +11,16 @@
  * file that was distributed with this source code.
  */
 
+use _generated\AcceptanceTesterActions;
+use Codeception\Actor;
+use Codeception\Lib\Friend;
 use Codeception\Scenario;
+use Codeception\Step\Action;
+use Codeception\Step\Assertion;
+use Codeception\Step\Condition;
 use Codeception\Util\Fixtures;
 use Eccube\Common\Constant;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Interactions\DragAndDropBy;
 use Symfony\Component\Filesystem\Exception\FileNotFoundException;
@@ -30,13 +37,13 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = null)
+ * @method Friend haveFriend($name, $actorClass = null)
  *
  * @SuppressWarnings(PHPMD)
  */
-class AcceptanceTester extends Codeception\Actor
+class AcceptanceTester extends Actor
 {
-    use _generated\AcceptanceTesterActions;
+    use AcceptanceTesterActions;
 
     public function getScenario(): Scenario
     {
@@ -225,7 +232,7 @@ public function dontSeeElements($arrayOfSelector)
 
     public function dragAndDropBy($selector, $x_offset, $y_offset)
     {
-        $this->executeInSelenium(function (Facebook\WebDriver\Remote\RemoteWebDriver $webDriver) use ($selector, $x_offset, $y_offset) {
+        $this->executeInSelenium(function (RemoteWebDriver $webDriver) use ($selector, $x_offset, $y_offset) {
             $node = $webDriver->findElement(WebDriverBy::cssSelector($selector));
             $action = new DragAndDropBy($webDriver, $node, $x_offset, $y_offset);
             $action->perform();
@@ -257,7 +264,7 @@ public function compressPlugin($pluginDirName, $destDir)
     public function see($text, $selector = null): void
     {
         $this->wait(0.1); // XXX 画面遷移直後は selector の参照に失敗するため wait を入れる
-        $this->getScenario()->runStep(new Codeception\Step\Assertion('see', func_get_args()));
+        $this->getScenario()->runStep(new Assertion('see', func_get_args()));
     }
 
     /**
@@ -268,7 +275,7 @@ public function see($text, $selector = null): void
     public function seeInField($field, $value): void
     {
         $this->wait(0.1); // XXX 画面遷移直後は selector の参照に失敗するため wait を入れる
-        $this->getScenario()->runStep(new Codeception\Step\Assertion('seeInField', func_get_args()));
+        $this->getScenario()->runStep(new Assertion('seeInField', func_get_args()));
     }
 
     /**
@@ -279,7 +286,7 @@ public function seeInField($field, $value): void
     public function waitForText(string $text, int $timeout = 10, $selector = null): void
     {
         $this->wait(0.1); // XXX 画面遷移直後は selector の参照に失敗するため wait を入れる
-        $this->getScenario()->runStep(new Codeception\Step\Action('waitForText', func_get_args()));
+        $this->getScenario()->runStep(new Action('waitForText', func_get_args()));
     }
 
     /**
@@ -290,7 +297,20 @@ public function waitForText(string $text, int $timeout = 10, $selector = null):
     public function amOnPage($page): void
     {
         $this->wait(1); // XXX WebDriver::amOnPage() の前に wait を入れないと画面遷移しない場合がある
-        $this->getScenario()->runStep(new Codeception\Step\Condition('amOnPage', func_get_args()));
+        $this->getScenario()->runStep(new Condition('amOnPage', func_get_args()));
         $this->wait(1); // XXX 画面遷移直後は selector の参照に失敗する場合があるため wait を入れる
     }
+
+    /**
+     * AcceptanceTesterActions から移植
+     *
+     * @param string|array $link
+     *
+     * @see \Codeception\Module\WebDriver::click()
+     */
+    public function click($link, $context = null): void
+    {
+        $this->getScenario()->runStep(new Action('click', func_get_args()));
+        $this->wait(1); // XXX click 直後は selector の参照に失敗するため wait を入れる
+    }
 }

codeception/_support/FunctionalTester.php

@@ -11,9 +11,22 @@
  * file that was distributed with this source code.
  */
 
-class FunctionalTester extends \Codeception\Actor
+use _generated\FunctionalTesterActions;
+use Codeception\Actor;
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class FunctionalTester extends Actor
 {
-    use _generated\FunctionalTesterActions;
+    use FunctionalTesterActions;
 
     /*
      * Define custom actions here

codeception/_support/Helper/Acceptance.php

@@ -13,10 +13,11 @@
 
 namespace Helper;
 
+use Codeception\Module;
+
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
-
-class Acceptance extends \Codeception\Module
+class Acceptance extends Module
 {
     public function _initialize()
     {

codeception/_support/Helper/Functional.php

@@ -13,9 +13,10 @@
 
 namespace Helper;
 
+use Codeception\Module;
+
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
-
-class Functional extends \Codeception\Module
+class Functional extends Module
 {
 }

codeception/_support/Helper/Unit.php

@@ -13,9 +13,10 @@
 
 namespace Helper;
 
+use Codeception\Module;
+
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
-
-class Unit extends \Codeception\Module
+class Unit extends Module
 {
 }

codeception/_support/Interactions/DragAndDropBy.php

@@ -17,12 +17,13 @@
 use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
 use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\Remote\RemoteWebElement;
 use Facebook\WebDriver\WebDriver;
 
 class DragAndDropBy extends WebDriverActions
 {
     /**
-     * @param \Facebook\WebDriver\Remote\RemoteWebElement $source
+     * @param RemoteWebElement $source
      */
     public function __construct(WebDriver $driver, $source, $x_offset, $y_offset)
     {

codeception/_support/Page/Admin/CustomerManagePage.php

@@ -132,13 +132,6 @@ public function 一覧_仮会員メール再送($rowNum, $execute = true)
         return $this;
     }
 
-    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");
-
-        return $this;
-    }
-
     public function CSVダウンロード()
     {
         $this->tester->click('#search_form > div.c-contentsArea__cols > div > div > div.row.justify-content-between.mb-2 > div.col-5.text-end > div:nth-child(2) > div > a:nth-child(1)');

codeception/_support/Page/Admin/ShopSettingPage.php

@@ -111,10 +111,11 @@ public function 設定_在庫切れ商品の非表示($value)
             $this->登録();
             $this->tester->see('保存しました', ShopSettingPage::$登録完了メッセージ);
         }
-        $checked = $this->tester->grabAttributeFrom('#shop_master_option_nostock_hidden', 'checked');
+        $this->tester->grabAttributeFrom('#shop_master_option_nostock_hidden', 'checked');
 
         return $this;
     }
+
     public function 入力_GAタグ($value)
     {
         $this->tester->fillField(['id' => 'shop_master_ga_id'], $value);