Merge pull request #4938 from EC-CUBE/4.0

[4.1-feature] 4.0ブランチの不具合修正を取り込み

.github/workflows/phpstan.yml

@@ -31,6 +31,4 @@ jobs:
         sudo composer selfupdate --1
         composer install --dev --no-interaction -o --apcu-autoloader
     - name: PHPStan
-      run: |
-        composer require phpstan/phpstan --dev
-        vendor/bin/phpstan analyze src/ --error-format=github
+      run: vendor/bin/phpstan analyze src/ --error-format=github

codeception/_support/Page/Admin/OrderManagePage.php

@@ -18,7 +18,7 @@ class OrderManagePage extends AbstractAdminPageStyleGuide
     public static $検索条件_受注ステータス = ['id' => 'admin_search_order_status'];
     public static $検索結果_メッセージ = '#search_form #search_total_count';
     public static $検索結果_エラーメッセージ = '//*[@id="page_admin_order"]/div[1]/div[3]/div[3]/div/div/div[1]/div/div[1]';
-    public static $詳細検索ボタン = '//*[@id="search_form"]/div[1]/div/div/div[3]/a/i/span';
+    public static $詳細検索ボタン = '//*[@id="search_form"]/div[1]/div/div/div[3]';
     public static $タイトル要素 = '.c-container .c-contentsArea .c-pageTitle .c-pageTitle__titles';
 
     /**

composer.json

@@ -115,6 +115,7 @@
         "fzaninotto/faker": "^1.7",
         "mikey179/vfsstream": "^1.6",
         "php-coveralls/php-coveralls": "^2.1",
+        "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^6.5",
         "symfony/browser-kit": "^3.4",
         "symfony/phpunit-bridge": "^3.4"