Skip to content

Commit

Permalink
Merge branch 'master' into fix/phpdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
nanasess authored Aug 17, 2024
2 parents d92b99c + 13d37b8 commit 9a399e6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function doRegister($template_code, $device_type_id)
$this->doUpdateMasterData($template_code, $device_type_id);
// コンパイルファイルのクリア処理
$objView = new SC_AdminView_Ex();
$objView->_smarty->clear_compiled_tpl();
$objView->_smarty->clearCompiledTemplate();

return true;
}
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
"eslint": "^8.57.0",
"eslint-config-jquery": "^3.0.2",
"eslint-plugin-import": "^2.29.1",
"tar": "^7.1.0",
"typescript": "^5.4.5",
"tar": "^7.4.0",
"typescript": "^5.4.5",
"typescript": "^5.5.4",
"webpack-cli": "^4.10.0",
"zaproxy": "^1.0.1"
},
Expand All @@ -48,5 +46,6 @@
"test:e2e": "playwright test --grep-invert '(@attack|@extends)'",
"test:e2e-extends": "playwright test --grep @extends",
"test:attack": "playwright test --grep-invert @extends"
}
},
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4417,9 +4417,9 @@ typed-array-length@^1.0.4:
is-typed-array "^1.1.9"

typescript@^5.4.5:
version "5.4.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
version "5.5.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==

unbox-primitive@^1.0.2:
version "1.0.2"
Expand Down

0 comments on commit 9a399e6

Please sign in to comment.