Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Controller周辺のリファクタリング、型の厳格化、コードのデカップリング等 #108 #256 #321

Merged
merged 34 commits into from
Jun 5, 2021
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
64d32df
remove Controller::getDeviceType(), move to Request.
uzulla Jun 4, 2021
31d6d15
remove Controller::setToken().
uzulla Jun 4, 2021
093a2b1
Improve pseudo array model. add dynamic pattern(disabled normally).
uzulla Jun 4, 2021
28ceb2c
remove Controller::getBlog().
uzulla Jun 4, 2021
5831661
move Controller::tokenValidate() to EntriesController::captchaTokenVa…
uzulla Jun 4, 2021
0416157
Refactoring around captcha.
uzulla Jun 4, 2021
dcaf2b3
Decouple preprocessingDataForFc2Template from Controller.
uzulla Jun 4, 2021
d0e3902
remove unnecessary define variable.
uzulla Jun 4, 2021
7fb03cc
move renderByFc2Template() to UserController from (base)Controller.
uzulla Jun 4, 2021
122452f
refactoring, move getHostUrl() to Request.
uzulla Jun 4, 2021
56a3930
Avoid implicit 404 Notfound call.
uzulla Jun 4, 2021
dbc4b08
fix typo.
uzulla Jun 4, 2021
d880ced
Chore, reorder some methods in the class.
uzulla Jun 4, 2021
c9fac01
Decouple Fc2Template compile,syntax check,other methods from Model.
uzulla Jun 4, 2021
7345d07
remove unnecessary method.
uzulla Jun 4, 2021
04cf415
avoid unnecessary public access modifier.
uzulla Jun 4, 2021
f01b39a
remove unnecessary TODO.
uzulla Jun 4, 2021
12e323a
Avoid implicit 404 Notfound call.
uzulla Jun 4, 2021
74ef1cd
Explicit getter naming that get current blog id.
uzulla Jun 5, 2021
710aade
add type definition.
uzulla Jun 5, 2021
4282618
fix omission of corrections
uzulla Jun 5, 2021
6e916ea
chore
uzulla Jun 5, 2021
b4de194
use isValidSig() instead of raw Session::get... code.
uzulla Jun 5, 2021
b310ced
add type definition.
uzulla Jun 5, 2021
8228417
fix correct type definition.
uzulla Jun 5, 2021
8b874e6
add declare(strict_types=1); to all controllers. avoid auto type cast.
uzulla Jun 5, 2021
d624d2f
fix broken test.
uzulla Jun 5, 2021
0749041
comment out unused arg.
uzulla Jun 5, 2021
a479e95
Add return type.
uzulla Jun 5, 2021
815e05d
Improve 500 error page. #256
uzulla Jun 5, 2021
8efce71
change UserController::getBlogId to $request->getBlogId() and remove …
uzulla Jun 5, 2021
185f5dc
errorXXX method change access modifier to protected from public.
uzulla Jun 5, 2021
6cf0e8e
Refactoring Router. remove unnecessary validation. tidy up.
uzulla Jun 5, 2021
0899189
Refactoring Router.
uzulla Jun 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add type definition.
uzulla committed Jun 5, 2021
commit 710aadee3799ae5f19f646767d9aab5682c07059
19 changes: 10 additions & 9 deletions app/src/Web/Controller/Admin/AdminController.php
Original file line number Diff line number Diff line change
@@ -169,37 +169,37 @@ protected function setBlog($blog = null): void

/**
* 情報用メッセージを設定する
* @param $message
* @param string $message
*/
protected function setInfoMessage($message): void
protected function setInfoMessage(string $message): void
{
$this->setMessage($message, 'flash-message-info');
}

/**
* 警告用メッセージを設定する
* @param $message
* @param string $message
*/
protected function setWarnMessage($message): void
protected function setWarnMessage(string $message): void
{
$this->setMessage($message, 'flash-message-warn');
}

/**
* エラー用メッセージを設定する
* @param $message
* @param string $message
*/
protected function setErrorMessage($message): void
protected function setErrorMessage(string $message): void
{
$this->setMessage($message, 'flash-message-error');
}

/**
* メッセージを設定する
* @param $message
* @param $type
* @param string $message
* @param string $type
*/
protected function setMessage($message, $type): void
protected function setMessage(string $message, string $type): void
{
$messages = Session::get($type, array());
$messages[] = $message;
@@ -208,6 +208,7 @@ protected function setMessage($message, $type): void

/**
* メッセージ情報を削除し取得する
* @return array<string, string>
*/
protected function removeMessage(): array
{