認証smtpメールが送れない問題

.github/dependabot.yml

@@ -6,3 +6,15 @@ updates:
       interval: "weekly"
     allow:
       - dependency-type: "all"
+
+  # GitHub アクションの依存関係を維持する
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # npm の依存関係を維持する
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/e2e-tests.yml

@@ -19,6 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        pattern:
+          - 'test:e2e'
+          - 'test:e2e-extends'
         group:
           - 'test/front_login'
           - 'test/front_guest'
@@ -35,6 +38,9 @@ jobs:
     - name: Setup environment
       run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV
 
+    - if: matrix.pattern == 'test:e2e-extends'
+      run: cp -rp tests/class/fixtures/page_extends/* data/class_extends/page_extends
+
     - name: Setup to EC-CUBE
       env:
         HTTP_URL: https://127.0.0.1:8085/
@@ -58,11 +64,12 @@ jobs:
     - name: Run to E2E testing
       env:
         GROUP: ${{ matrix.group }}
+        PATTERN: ${{ matrix.pattern }}
         HTTPS_PROXY: 'localhost:8090'
         HTTP_PROXY: 'localhost:8090'
         CI: 1
         FORCE_COLOR: 1
-      run: yarn test:e2e e2e-tests/${GROUP}
+      run: yarn ${PATTERN} e2e-tests/${GROUP}
 
     - name: Upload evidence
       if: failure()

composer.json

@@ -23,7 +23,6 @@
     },
     "require-dev": {
         "fzaninotto/faker": "^1.8",
-        "guzzlehttp/guzzle": "^5.3",
         "nanasess/eccube2-fixture-generator": "^1.1",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
         "php5friends/phpunit48": ">=4.8.41"

data/class/SC_ClassAutoloader.php

@@ -48,7 +48,11 @@ public static function autoload($class, $plugin_upload_realdir = PLUGIN_UPLOAD_R
             $arrClassNamePartTemp = $arrClassNamePart;
             // FIXME クラスファイルのディレクトリ命名が変。変な現状に合わせて強引な処理をしてる。
             $arrClassNamePartTemp[1] = $arrClassNamePartTemp[1] . '_extends';
-            $classpath .= strtolower(implode('/', array_slice($arrClassNamePartTemp, 1, -2))) . '/';
+            if ($count <= 5 && $arrClassNamePart[2] === 'Admin' && !in_array($arrClassNamePart[3], ['Home', 'Index', 'Logout'])) {
+                $classpath .= strtolower(implode('/', array_slice($arrClassNamePartTemp, 1, -1))) . '/';
+            } else {
+                $classpath .= strtolower(implode('/', array_slice($arrClassNamePartTemp, 1, -2))) . '/';
+            }
         } elseif ($arrClassNamePart[0] === 'SC' && $is_ex === false && $count >= 3) {
             $classpath .= strtolower(implode('/', array_slice($arrClassNamePart, 1, -1))) . '/';
         } elseif ($arrClassNamePart[0] === 'SC') {

data/class/SC_SendMail.php

@@ -340,6 +340,7 @@ public function sendMail($isHtml = false)
             $msg = mb_convert_encoding($result->getMessage(), CHAR_CODE, 'auto');
             $msg = 'メール送信に失敗しました。[' . $msg . ']';
             trigger_error($msg, E_USER_WARNING);
+            GC_Utils_Ex::gfPrintLog($result->getMessage());
             GC_Utils_Ex::gfDebugLog($header);
 
             return false;

data/module/Net/Socket.php

@@ -644,6 +644,7 @@ function enableCrypto($enabled, $type)
             if (!is_resource($this->fp)) {
                 return $this->raiseError('not connected');
             }
+            stream_context_set_option($this->fp, 'ssl', 'verify_peer_name', false);
             return @stream_socket_enable_crypto($this->fp, $enabled, $type);
         } else {
             $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0';

data/module/Net/URL.php

@@ -106,16 +106,6 @@ class Net_URL
     */
     var $useBrackets;
 
-    /**
-    * PHP4 Constructor
-    *
-    * @see __construct()
-    */
-    function Net_URL($url = null, $useBrackets = true)
-    {
-        $this->__construct($url, $useBrackets);
-    }
-
     /**
     * PHP5 Constructor
     *
@@ -127,7 +117,7 @@ function Net_URL($url = null, $useBrackets = true)
     *                            multiple querystrings with the same name
     *                            exist
     */
-    function __construct($url = null, $useBrackets = true)
+    public function __construct($url = null, $useBrackets = true)
     {
         $this->url = $url;
         $this->useBrackets = $useBrackets;