Merge remote-tracking branch 'ofc/master' into seasoft-846

seasoftjapan · Feb 22, 2024 · a28c280 · a28c280
2 parents bdf547d + 1346d10
commit a28c280
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 59 deletions.
diff --git a/data/class/pages/forgot/LC_Page_Forgot.php b/data/class/pages/forgot/LC_Page_Forgot.php
@@ -277,7 +277,7 @@ public function lfInitSecretCheckParam(&$objFormParam, $device_type)
     public function lfSendMail(&$CONF, $email, $customer_name, $new_password)
     {
         // パスワード変更お知らせメール送信
-        $objMailText = new SC_SiteView_Ex(false);
+        $objMailText = new SC_SiteView_Ex();
         $objMailText->setPage($this);
         $objMailText->assign('customer_name', $customer_name);
         $objMailText->assign('new_password', $new_password);

diff --git a/data/class/pages/rss/LC_Page_Rss.php b/data/class/pages/rss/LC_Page_Rss.php
@@ -60,7 +60,7 @@ public function init()
      */
     public function process()
     {
-        $objView = new SC_SiteView_Ex(false);
+        $objView = new SC_SiteView_Ex();
 
         //新着情報を取得
         $arrNews = $this->lfGetNews();

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.20.2",
-    "@faker-js/faker": "^7.6.0",
+    "@faker-js/faker": "^8.4.1",
     "@playwright/test": "^1.41.2",
     "@types/date-fns": "^2.6.0",
     "@types/faker": "^6.6.9",
@@ -32,7 +32,7 @@
     "babel-loader": "^8.2.5",
     "browser-sync-webpack-plugin": "^2.3.0",
     "eslint": "^8.56.0",
-    "eslint-config-jquery": "^3.0.0",
+    "eslint-config-jquery": "^3.0.2",
     "eslint-plugin-import": "^2.27.5",
     "tar": "^6.2.0",
     "typescript": "^5.3.3",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,17 +2,18 @@ parameters:
   level: 1
   bootstrapFiles:
     - tests/require.php
-    - data/vendor/smarty/smarty/libs/plugins/function.html_radios.php
   excludePaths:
-    - data/Smarty/templates_c/*
-    - data/module/SOAP/*
-    - data/vendor/*
-    - data/downloads/*
-    - data/module/Calendar/Engine/PearDate.php
-    - data/class/helper/SC_Helper_Mobile.php
-    - data/class/SC_MobileEmoji.php
-    - data/class/SC_MobileImage.php
-    - data/**/flycheck_*.php
+    analyse:
+      - data/module/SOAP/*
+      - data/vendor/*
+      - data/downloads/*
+      - data/module/Calendar/Engine/PearDate.php
+      - data/class/helper/SC_Helper_Mobile.php
+      - data/class/SC_MobileEmoji.php
+      - data/class/SC_MobileImage.php
+      - data/**/flycheck_*.php
+    analyseAndScan:
+      - *.tpl.php
   ignoreErrors:
     -
       message: "#^Call to an undefined static method PEAR\\:\\:raiseError\\(\\)\\.$#"
@@ -34,9 +35,6 @@ parameters:
     # -
     #   message: "#^Constant SMARTY_PLUGINS_DIR not found\\.$#"
     #   path: data/smarty_extends/*
-    -
-      message: "#^Function smarty_function_escape_special_chars not found\\.$#"
-      path: data/smarty_extends/*
     -
       message: "#^Variable \\$SJIS_widths might not be defined\\.$#"
       path: data/class/helper/SC_Helper_FPDI.php

diff --git a/yarn.lock b/yarn.lock
@@ -1006,10 +1006,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
   integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
-"@faker-js/faker@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
-  integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
+"@faker-js/faker@^8.4.1":
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.4.1.tgz#5d5e8aee8fce48f5e189bf730ebd1f758f491451"
+  integrity sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==
 
 "@humanwhocodes/config-array@^0.11.13":
   version "0.11.14"
@@ -1203,14 +1203,6 @@
     "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
-"@typescript-eslint/[email protected]":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210"
-  integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
 "@typescript-eslint/[email protected]":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -1229,11 +1221,6 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/[email protected]":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd"
-  integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==
-
 "@typescript-eslint/[email protected]":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
@@ -1252,19 +1239,6 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/[email protected]":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/[email protected]":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
@@ -1279,14 +1253,6 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/[email protected]":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2"
-  integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/[email protected]":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -2073,10 +2039,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-jquery@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-jquery/-/eslint-config-jquery-3.0.0.tgz#3f6bd0a8cbc1636790a55513d7dbb39783d2be10"
-  integrity sha512-VDdRAIlNq1EM5P7J4JGQSCnZEIvIlNGGTUTCPT2wQNZ2GT69rsAwSIqZVcoiyZbwY7TaaMwLOxwSjqm+DEUjbA==
+eslint-config-jquery@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-jquery/-/eslint-config-jquery-3.0.2.tgz#112f5edf8941feef12b3d22e2107a182d2b35686"
+  integrity sha512-1CdP7AY5ZuhDGUXz+/b7FwhRnDoK0A1swz+2nZ+zpEYJ3EyV085AOAfpFJL2s+ioHDspNQEsGSsl9uUEm9/f/g==
 
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"