Skip to content

Commit 65c4db9

Browse files
author
rotimi
committed
Tweaked all calls to nl2br to now spit out <br> instead of <br />
1 parent e26cf1f commit 65c4db9

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/HtmlErrorRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ private function renderExceptionFragment(\Throwable $exception): string {
6464
$html .= sprintf('<div><strong>Line:</strong> %s</div>', $exception->getLine());
6565
$html .= '<h2>Trace</h2>';
6666

67-
return $html . sprintf('<pre>%s</pre>', nl2br(htmlentities($exception->getTraceAsString())) );
67+
return $html . sprintf('<pre>%s</pre>', nl2br(htmlentities($exception->getTraceAsString()), false) );
6868
}
6969
}

src/controllers/BaseController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ public function actionLogin(): ResponseInterface|string {
739739
*/
740740
if( sMVC_GetCurrentAppEnvironment() !== \SlimMvcTools\AppEnvironments::PRODUCTION ) {
741741

742-
$msg .= '<br>'.nl2br(sMVC_DumpAuthinfo($auth));
742+
$msg .= '<br>'.nl2br(sMVC_DumpAuthinfo($auth), false);
743743
}
744744

745745
if( $auth->isValid() ) {
@@ -1031,7 +1031,7 @@ public function actionLoginStatus(): string {
10311031
*/
10321032
if( sMVC_GetCurrentAppEnvironment() !== \SlimMvcTools\AppEnvironments::PRODUCTION ) {
10331033
/** @psalm-suppress MixedOperand */
1034-
$msg .= '<br>'.nl2br(sMVC_DumpAuthinfo($auth));
1034+
$msg .= '<br>'.nl2br(sMVC_DumpAuthinfo($auth), false);
10351035
}
10361036

10371037
//get the contents of the view first

tests/BaseControllerTest.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -695,27 +695,27 @@ public function testThat_actionLogin_WithRequestPostMethod_WorksAsExpected() {
695695
$actionLoginResult
696696
);
697697
self::assertStringContainsString(
698-
"The 'username' field is empty.<br>The 'password' field is empty.<br>Login Status: ANON<br />",
698+
"The 'username' field is empty.<br>The 'password' field is empty.<br>Login Status: ANON<br>",
699699
$actionLoginResult
700700
);
701701
self::assertStringContainsString(
702-
"Logged in Person's Username: <br />",
702+
"Logged in Person's Username: <br>",
703703
$actionLoginResult
704704
);
705705
self::assertStringContainsString(
706-
"Logged in User's Data: <br />",
706+
"Logged in User's Data: <br>",
707707
$actionLoginResult
708708
);
709709
self::assertStringContainsString(
710-
"Array<br />",
710+
"Array<br>",
711711
$actionLoginResult
712712
);
713713
self::assertStringContainsString(
714-
"(<br />",
714+
"(<br>",
715715
$actionLoginResult
716716
);
717717
self::assertStringContainsString(
718-
")<br />",
718+
")<br>",
719719
$actionLoginResult
720720
);
721721
self::assertStringContainsString(
@@ -778,27 +778,27 @@ public function testThat_actionLogin_WithRequestPostMethod_WorksAsExpected2() {
778778
$actionLoginResult
779779
);
780780
self::assertStringContainsString(
781-
"The 'password' field is empty.<br>Login Status: ANON<br />",
781+
"The 'password' field is empty.<br>Login Status: ANON<br>",
782782
$actionLoginResult
783783
);
784784
self::assertStringContainsString(
785-
"Logged in Person's Username: <br />",
785+
"Logged in Person's Username: <br>",
786786
$actionLoginResult
787787
);
788788
self::assertStringContainsString(
789-
"Logged in User's Data: <br />",
789+
"Logged in User's Data: <br>",
790790
$actionLoginResult
791791
);
792792
self::assertStringContainsString(
793-
"Array<br />",
793+
"Array<br>",
794794
$actionLoginResult
795795
);
796796
self::assertStringContainsString(
797-
"(<br />",
797+
"(<br>",
798798
$actionLoginResult
799799
);
800800
self::assertStringContainsString(
801-
")<br />",
801+
")<br>",
802802
$actionLoginResult
803803
);
804804
self::assertStringContainsString(
@@ -861,27 +861,27 @@ public function testThat_actionLogin_WithRequestPostMethod_WorksAsExpected3() {
861861
$actionLoginResult
862862
);
863863
self::assertStringContainsString(
864-
"The 'username' field is empty.<br>Login Status: ANON<br />",
864+
"The 'username' field is empty.<br>Login Status: ANON<br>",
865865
$actionLoginResult
866866
);
867867
self::assertStringContainsString(
868-
"Logged in Person's Username: <br />",
868+
"Logged in Person's Username: <br>",
869869
$actionLoginResult
870870
);
871871
self::assertStringContainsString(
872-
"Logged in User's Data: <br />",
872+
"Logged in User's Data: <br>",
873873
$actionLoginResult
874874
);
875875
self::assertStringContainsString(
876-
"Array<br />",
876+
"Array<br>",
877877
$actionLoginResult
878878
);
879879
self::assertStringContainsString(
880-
"(<br />",
880+
"(<br>",
881881
$actionLoginResult
882882
);
883883
self::assertStringContainsString(
884-
")<br />",
884+
")<br>",
885885
$actionLoginResult
886886
);
887887
self::assertStringContainsString(
@@ -1575,7 +1575,7 @@ public function testThat_actionLoginStatus_WorksAsExpected() {
15751575
$auth->getSession()->setStatus($auth_status);
15761576
$action_result = $controller->actionLoginStatus();
15771577
self::assertStringContainsString($status_message_in_rendered_view, $action_result);
1578-
self::assertStringContainsString('<br>'.nl2br(sMVC_DumpAuthinfo($auth)), $action_result);
1578+
self::assertStringContainsString('<br>'.nl2br(sMVC_DumpAuthinfo($auth), false), $action_result);
15791579
}
15801580

15811581
////////////////////////////////////////////////////////////////////////

tests/HtmlErrorRendererTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testThat___invoke_And_setDefaultErrorTitle_And_setDefaultErrorDe
7070
$result
7171
);
7272
self::assertStringContainsString(
73-
sprintf('<pre>%s</pre>', nl2br(htmlentities($http_exception->getTraceAsString())) ),
73+
sprintf('<pre>%s</pre>', nl2br(htmlentities($http_exception->getTraceAsString()), false) ),
7474
$result
7575
);
7676
//self::assertStringContainsString($needle, $result);

0 commit comments

Comments
 (0)