Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into dependabot/npm_an…
Browse files Browse the repository at this point in the history
…d_yarn/css-loader-6.10.0
  • Loading branch information
nanasess committed Feb 21, 2024
2 parents 6f4586f + 1346d10 commit 6ad7f9f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/class/pages/forgot/LC_Page_Forgot.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion data/class/pages/rss/LC_Page_Rss.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function init()
*/
public function process()
{
$objView = new SC_SiteView_Ex(false);
$objView = new SC_SiteView_Ex();

//新着情報を取得
$arrNews = $this->lfGetNews();
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
24 changes: 11 additions & 13 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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\\(\\)\\.$#"
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -2039,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"
Expand Down

0 comments on commit 6ad7f9f

Please sign in to comment.