Merge pull request #526 from nanasess/remove-ex

_Ex ファイルが存在しない場合は元ファイルのエイリアスを作成する
EC-CUBE · Apr 20, 2022 · cdc8490 · cdc8490
2 parents a47b46e + 8474132
commit cdc8490
Show file tree

Hide file tree

Showing 586 changed files with 144 additions and 11,396 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -164,6 +164,10 @@ jobs:
     - run: echo "extension=gd" >> C:/tools/php/php.ini
       shell: bash
 
+    # see https://github.com/composer/composer/issues/10340
+    - run: composer selfupdate 2.2.11
+      if: matrix.php < 7.2
+
     - name: composer install
       run: composer install --no-interaction -o
 

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "ec-cube2/cli": "dev-master@dev",
         "fzaninotto/faker": "^1.8",
         "guzzlehttp/guzzle": "^5.3",
+        "nanasess/ec-cube2-class-extends-stubs": "^1.0",
         "nanasess/eccube2-fixture-generator": "dev-main@dev",
         "php5friends/phpunit48": ">=4.8.41"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/data/__default.php b/data/__default.php
@@ -1,6 +1,5 @@
 <?php
 exit; // Don't rewrite. This line is rewritten by EC-CUBE.
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * ユーザーカスタマイズ用のページクラス

diff --git a/data/class/SC_ClassAutoloader.php b/data/class/SC_ClassAutoloader.php
@@ -33,7 +33,6 @@ class SC_ClassAutoloader
     /**
      * クラスのオートローディング本体
      *
-     * LC_* には対応していない。
      * @return void
      */
     public static function autoload($class, $plugin_upload_realdir = PLUGIN_UPLOAD_REALDIR)
@@ -45,7 +44,7 @@ public static function autoload($class, $plugin_upload_realdir = PLUGIN_UPLOAD_R
 
         if (($arrClassNamePart[0] === 'GC' || $arrClassNamePart[0] === 'SC') && $arrClassNamePart[1] === 'Utils') {
             $classpath .= $is_ex ? 'util_extends/' : 'util/';
-        } elseif ($arrClassNamePart[0] === 'SC' && $is_ex === true && $count >= 4) {
+        } elseif (($arrClassNamePart[0] === 'SC' || $arrClassNamePart[0] === 'LC') && $is_ex === true && $count >= 4) {
             $arrClassNamePartTemp = $arrClassNamePart;
             // FIXME クラスファイルのディレクトリ命名が変。変な現状に合わせて強引な処理をしてる。
             $arrClassNamePartTemp[1] = $arrClassNamePartTemp[1] . '_extends';
@@ -93,9 +92,14 @@ public static function autoload($class, $plugin_upload_realdir = PLUGIN_UPLOAD_R
                             $exp = "/(class[ ]+{$plugin_class}[ ]+extends +)[a-zA-Z_\-]+( *{?)/";
                             $replace = '$1' . $parent_classname . '$2';
 
-                            $base_class_str = file_get_contents($plugin_classpath);
-                            $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str);
-                            $base_class_str = preg_replace($exp, $replace, $base_class_str, 1);
+                            if (file_exists($plugin_classpath)) {
+                                $base_class_str = file_get_contents($plugin_classpath);
+                                $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str);
+                                $base_class_str = preg_replace($exp, $replace, $base_class_str, 1);
+                            } else {
+                                $base_class_str = 'class '.$class.' extends '.$parent_classname.' {}';
+                            }
+
                             eval($base_class_str);
                         } else {
                             include $plugin_classpath;
@@ -110,15 +114,29 @@ public static function autoload($class, $plugin_upload_realdir = PLUGIN_UPLOAD_R
                 if ($is_ex) {
                     $exp = "/(class[ ]+{$class}[ ]+extends +)[a-zA-Z_\-]+( *{?)/";
                     $replace = '$1' . $parent_classname . '$2';
-                    $base_class_str = file_get_contents($classpath);
-                    $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str);
-                    $base_class_str = preg_replace($exp, $replace, $base_class_str, 1);
+
+                    if (file_exists($classpath)) {
+                        $base_class_str = file_get_contents($classpath);
+                        $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str);
+                        $base_class_str = preg_replace($exp, $replace, $base_class_str, 1);
+                    } else {
+                        $base_class_str = 'class '.$class.' extends '.$parent_classname.' {}';
+                    }
+
                     eval($base_class_str);
 
                     return;
                 }
             }
         }
+
+        if ($is_ex) {
+            // *_Ex ファイルが存在しない場合は、元クラスのエイリアスとする
+            if (!file_exists($classpath) && strpos($class, '_Ex') !== false) {
+                class_alias(preg_replace('/_Ex$/', '', $class), $class);
+            }
+        }
+
         if (file_exists($classpath)) {
             include $classpath;
         } else {

diff --git a/data/class/api/operations/AddrFromZip.php b/data/class/api/operations/AddrFromZip.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_AddrFromZip extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/BrowseNodeLookup.php b/data/class/api/operations/BrowseNodeLookup.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_BrowseNodeLookup extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/CartAdd.php b/data/class/api/operations/CartAdd.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_CartAdd extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/CartClear.php b/data/class/api/operations/CartClear.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_CartClear extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/CartCreate.php b/data/class/api/operations/CartCreate.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_CartCreate extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/CartGet.php b/data/class/api/operations/CartGet.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_CartGet extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/CartModify.php b/data/class/api/operations/CartModify.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_CartModify extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/Default.php b/data/class/api/operations/Default.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_Default extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/GetVersion.php b/data/class/api/operations/GetVersion.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_GetVersion extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/ItemLookup.php b/data/class/api/operations/ItemLookup.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_ItemLookup extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/api/operations/ItemSearch.php b/data/class/api/operations/ItemSearch.php
@@ -28,7 +28,6 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
-require_once CLASS_EX_REALDIR . 'api_extends/SC_Api_Abstract_Ex.php';
 
 class API_ItemSearch extends SC_Api_Abstract_Ex
 {

diff --git a/data/class/helper/SC_Helper_HandleError.php b/data/class/helper/SC_Helper_HandleError.php
@@ -200,7 +200,6 @@ public static function displaySystemError($errstr = null)
 
         ob_clean();
 
-        require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php';
         $objPage = new LC_Page_Error_SystemError_Ex();
         $objPage->init();
         if (isset($errstr)) {

diff --git a/data/class/pages/LC_Page_Index.php b/data/class/pages/LC_Page_Index.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * Index のページクラス.

diff --git a/data/class/pages/LC_Page_InputZip.php b/data/class/pages/LC_Page_InputZip.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * 郵便番号入力 のページクラス.

diff --git a/data/class/pages/LC_Page_ResizeImage.php b/data/class/pages/LC_Page_ResizeImage.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * リサイズイメージ のページクラス.

diff --git a/data/class/pages/LC_Page_Sitemap.php b/data/class/pages/LC_Page_Sitemap.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * Sitemapプロトコル ファイル生成モジュール.

diff --git a/data/class/pages/abouts/LC_Page_Abouts.php b/data/class/pages/abouts/LC_Page_Abouts.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * サイト概要のページクラス.

diff --git a/data/class/pages/admin/LC_Page_Admin.php b/data/class/pages/admin/LC_Page_Admin.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
 
 /**
  * 管理者ログイン のページクラス.

diff --git a/data/class/pages/admin/LC_Page_Admin_Home.php b/data/class/pages/admin/LC_Page_Admin_Home.php
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 管理画面ホーム のページクラス.

diff --git a/data/class/pages/admin/LC_Page_Admin_Index.php b/data/class/pages/admin/LC_Page_Admin_Index.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 管理者ログイン のページクラス.

diff --git a/data/class/pages/admin/LC_Page_Admin_Logout.php b/data/class/pages/admin/LC_Page_Admin_Logout.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * ログアウト のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 店舗基本情報 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 配送方法設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 配送方法設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 定休日管理のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 会員規約設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * メール設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 支払方法設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 支払方法設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * ポイント設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 税率設定 のページクラス.

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
 
 /**
  * 特定商取引法 のページクラス.