Skip to content

Commit bc0891e

Browse files
prwaterprwater
committed
Migrate to plaisio/kernel 2.0.
1 parent 862b2d6 commit bc0891e

8 files changed

+37
-44
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"plaisio/console": "^1.0",
1515
"plaisio/exception": "^1.1",
1616
"plaisio/exception-handler": "^1.1",
17-
"plaisio/kernel": "^1.1",
17+
"plaisio/kernel": "^2.0",
1818
"plaisio/obfuscator": "^1.2",
1919
"plaisio/response-core": "^1.1",
2020
"setbased/helper-code-store-php": "^2.4.1",

‎src/BadRequestExceptionAgent.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,20 @@ public function handleResponseException(BadRequestException $exception): void
6262
*/
6363
private function handleException(BadRequestException $exception): void
6464
{
65-
Nub::$DL->rollback();
65+
Nub::$nub->DL->rollback();
6666

6767
// Set the HTTP status to 400 (Bad Request).
6868
$response = new BadRequestResponse();
6969
$response->send();
7070

7171
// Log the bad request.
72-
Nub::$requestLogger->logRequest($response->getStatus());
73-
Nub::$DL->commit();
72+
Nub::$nub->requestLogger->logRequest($response->getStatus());
73+
Nub::$nub->DL->commit();
7474

7575
// Only on development environment log the error.
76-
if (Nub::$request->isEnvDev())
76+
if (Nub::$nub->request->isEnvDev())
7777
{
78-
$logger = Nub::$nub->getErrorLogger();
79-
$logger->logError($exception);
78+
Nub::$nub->errorLogger->logError($exception);
8079
}
8180
}
8281

‎src/DecodeExceptionAgent.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,20 @@ public function handleResponseException(DecodeException $exception): void
6262
*/
6363
private function handleException(DecodeException $exception): void
6464
{
65-
Nub::$DL->rollback();
65+
Nub::$nub->DL->rollback();
6666

6767
// Set the HTTP status to 400 (Bad Request).
6868
$response = new BadRequestResponse();
6969
$response->send();
7070

7171
// Log the bad request.
72-
Nub::$requestLogger->logRequest($response->getStatus());
73-
Nub::$DL->commit();
72+
Nub::$nub->requestLogger->logRequest($response->getStatus());
73+
Nub::$nub->DL->commit();
7474

7575
// Only on development environment log the error.
76-
if (Nub::$request->isEnvDev())
76+
if (Nub::$nub->request->isEnvDev())
7777
{
78-
$logger = Nub::$nub->getErrorLogger();
79-
$logger->logError($exception);
78+
Nub::$nub->errorLogger->logError($exception);
8079
}
8180
}
8281

‎src/InvalidUrlExceptionAgent.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,20 @@ public function handleResponseException(InvalidUrlException $exception): void
6262
*/
6363
private function handleException(InvalidUrlException $exception): void
6464
{
65-
Nub::$DL->rollback();
65+
Nub::$nub->DL->rollback();
6666

6767
// Set the HTTP status to 404 (Not Found).
6868
$response = new NotFoundResponse();
6969
$response->send();
7070

7171
// Log the invalid request request.
72-
Nub::$requestLogger->logRequest($response->getStatus());
73-
Nub::$DL->commit();
72+
Nub::$nub->requestLogger->logRequest($response->getStatus());
73+
Nub::$nub->DL->commit();
7474

7575
// Only on development environment log the error.
76-
if (Nub::$request->isEnvDev())
76+
if (Nub::$nub->request->isEnvDev())
7777
{
78-
$logger = Nub::$nub->getErrorLogger();
79-
$logger->logError($exception);
78+
Nub::$nub->errorLogger->logError($exception);
8079
}
8180
}
8281

‎src/NotAuthorizedExceptionAgent.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public function handleResponseException(NotAuthorizedException $exception): void
6363
*/
6464
private function handleException(NotAuthorizedException $exception): void
6565
{
66-
Nub::$DL->rollback();
66+
Nub::$nub->DL->rollback();
6767

68-
if (Nub::$session->isAnonymous())
68+
if (Nub::$nub->session->isAnonymous())
6969
{
7070
// The user is not logged on and most likely the user has requested a page for which the user must be logged on.
7171

7272
// Redirect the user agent to the login page. After the user has successfully logged on the user agent will be
7373
// redirected to currently requested URL.
74-
$response = new SeeOtherResponse(Nub::$nub->getLoginUrl(Nub::$request->getRequestUri()));
74+
$response = new SeeOtherResponse(Nub::$nub->getLoginUrl(Nub::$nub->request->getRequestUri()));
7575
$response->send();
7676
}
7777
else
@@ -83,16 +83,15 @@ private function handleException(NotAuthorizedException $exception): void
8383
$response->send();
8484

8585
// Only on development environment log the error.
86-
if (Nub::$request->isEnvDev())
86+
if (Nub::$nub->request->isEnvDev())
8787
{
88-
$logger = Nub::$nub->getErrorLogger();
89-
$logger->logError($exception);
88+
Nub::$nub->errorLogger->logError($exception);
9089
}
9190
}
9291

9392
// Log the not authorized request.
94-
Nub::$requestLogger->logRequest($response->getStatus());
95-
Nub::$DL->commit();
93+
Nub::$nub->requestLogger->logRequest($response->getStatus());
94+
Nub::$nub->DL->commit();
9695
}
9796

9897
//--------------------------------------------------------------------------------------------------------------------

‎src/NotPreferredUrlExceptionAgent.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class NotPreferredUrlExceptionAgent
2323
*/
2424
public function handleResponseException(NotPreferredUrlException $exception): void
2525
{
26-
Nub::$DL->rollback();
26+
Nub::$nub->DL->rollback();
2727

2828
// Redirect the user agent to the preferred URL.
2929
$response = new MovedPermanentlyResponse($exception->preferredUri);
3030
$response->send();
3131

3232
// Log the not preferred request.
33-
Nub::$requestLogger->logRequest($response->getStatus());
34-
Nub::$DL->commit();
33+
Nub::$nub->requestLogger->logRequest($response->getStatus());
34+
Nub::$nub->DL->commit();
3535
}
3636

3737
//--------------------------------------------------------------------------------------------------------------------

‎src/ResultExceptionAgent.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@ class ResultExceptionAgent
2323
*/
2424
public function handleConstructException(ResultException $exception): void
2525
{
26-
Nub::$DL->rollback();
26+
Nub::$nub->DL->rollback();
2727

2828
// Set the HTTP status to 404 (Not Found).
2929
$response = new NotFoundResponse();
3030
$response->send();
3131

3232
// Log the invalid URL request.
33-
Nub::$requestLogger->logRequest($response->getStatus());
34-
Nub::$DL->commit();
33+
Nub::$nub->requestLogger->logRequest($response->getStatus());
34+
Nub::$nub->DL->commit();
3535

3636
// On a development environment log the exception.
37-
if (Nub::$request->isEnvDev())
37+
if (Nub::$nub->request->isEnvDev())
3838
{
39-
$logger = Nub::$nub->getErrorLogger();
40-
$logger->logError($exception);
39+
Nub::$nub->errorLogger->logError($exception);
4140
}
4241
}
4342

‎src/ThrowableAgent.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ public function handleConstructException(\Throwable $throwable): void
3636
*/
3737
public function handleFinalizeException(\Throwable $throwable): void
3838
{
39-
Nub::$DL->rollback();
39+
Nub::$nub->DL->rollback();
4040

41-
$logger = Nub::$nub->getErrorLogger();
42-
$logger->logError($throwable);
41+
Nub::$nub->errorLogger->logError($throwable);
4342
}
4443

4544
//--------------------------------------------------------------------------------------------------------------------
@@ -78,18 +77,17 @@ public function handleResponseException(\Throwable $throwable): void
7877
*/
7978
private function handleException(\Throwable $throwable): void
8079
{
81-
Nub::$DL->rollback();
80+
Nub::$nub->DL->rollback();
8281

8382
// Set the HTTP status to 500 (Internal Server Error).
8483
$response = new InternalServerErrorResponse();
8584
$response->send();
8685

8786
// Log the Internal Server Error
88-
Nub::$requestLogger->logRequest($response->getStatus());
89-
Nub::$DL->commit();
87+
Nub::$nub->requestLogger->logRequest($response->getStatus());
88+
Nub::$nub->DL->commit();
9089

91-
$logger = Nub::$nub->getErrorLogger();
92-
$logger->logError($throwable);
90+
Nub::$nub->errorLogger->logError($throwable);
9391
}
9492

9593
//--------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)