From 099fda54c030c7a90f223a5dd0d28a7993114106 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 11 Jun 2021 01:45:18 +0800
Subject: [PATCH] Convert Heredoc to Nowdoc syntax where possible

---
 tests/system/API/ResponseTraitTest.php   | 10 +++---
 tests/system/Format/XMLFormatterTest.php | 12 +++----
 tests/system/Helpers/FormHelperTest.php  | 44 ++++++++++++------------
 tests/system/Helpers/HTMLHelperTest.php  | 44 ++++++++++++------------
 tests/system/View/ParserFilterTest.php   |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php        |  1 +
 6 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 79d8235ea8a3..8701922e734c 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -102,7 +102,7 @@ public function testNoFormatterJSON()
         $this->assertEquals('A Custom Reason', $this->response->getReason());
         $this->assertEquals(201, $this->response->getStatusCode());
 
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             {
                 "id": 3
             }
@@ -124,7 +124,7 @@ public function testAssociativeArrayPayload()
         $this->formatter = null;
         $controller      = $this->makeController();
         $payload         = ['answer' => 42];
-        $expected        = <<<EOH
+        $expected        = <<<'EOH'
             {
                 "answer": 42
             }
@@ -142,7 +142,7 @@ public function testArrayPayload()
             2,
             3,
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             [
                 1,
                 2,
@@ -160,7 +160,7 @@ public function testPHPtoArrayPayload()
         $payload         = new stdClass();
         $payload->name   = 'Tom';
         $payload->id     = 1;
-        $expected        = <<<EOH
+        $expected        = <<<'EOH'
             {
                 "name": "Tom",
                 "id": 1
@@ -479,7 +479,7 @@ public function testXMLFormatter()
         $this->assertEquals('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
 
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><id>3</id></response>
 
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index fe30d56b7fc7..7cedeb9acdf0 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -21,7 +21,7 @@ public function testBasicXML()
             'foo' => 'bar',
         ];
 
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><foo>bar</foo></response>
 
@@ -36,7 +36,7 @@ public function testFormatXMLWithMultilevelArray()
             'foo' => ['bar'],
         ];
 
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><foo><item0>bar</item0></foo></response>
 
@@ -51,7 +51,7 @@ public function testFormatXMLWithMultilevelArrayAndNumericKey()
             ['foo'],
         ];
 
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><item0><item0>foo</item0></item0></response>
 
@@ -63,7 +63,7 @@ public function testFormatXMLWithMultilevelArrayAndNumericKey()
     public function testStringFormatting()
     {
         $data     = ['Something'];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><item0>Something</item0></response>
 
@@ -78,7 +78,7 @@ public function testValidatingXmlTags()
             'BBB096630BD' => 'foo',
             '096630FR'    => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><BBB096630BD>foo</BBB096630BD><item096630FR>bar</item096630FR></response>
 
@@ -171,7 +171,7 @@ public function testDeepNestedArrayToXml()
         ];
 
         // do not change to tabs!!
-        $expectedXML = <<<EOF
+        $expectedXML = <<<'EOF'
             <?xml version="1.0"?>
             <response>
               <data>
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 1990d1bfc2f6..4bf1224b0b7e 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -38,7 +38,7 @@ public function testFormOpenBasic()
 
                 EOH;
         } else {
-            $expected = <<<EOH
+            $expected = <<<'EOH'
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
 
                 EOH;
@@ -62,7 +62,7 @@ public function testFormOpenHasLocale()
         $request->uri      = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <form action="http://example.com/index.php/en/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
 
             EOH;
@@ -96,7 +96,7 @@ public function testFormOpenWithoutAction()
 
                 EOH;
         } else {
-            $expected = <<<EOH
+            $expected = <<<'EOH'
                 <form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
 
                 EOH;
@@ -130,7 +130,7 @@ public function testFormOpenWithoutMethod()
 
                 EOH;
         } else {
-            $expected = <<<EOH
+            $expected = <<<'EOH'
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
 
                 EOH;
@@ -165,7 +165,7 @@ public function testFormOpenWithHidden()
 
                 EOH;
         } else {
-            $expected = <<<EOH
+            $expected = <<<'EOH'
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
 
                 <input type="hidden" name="foo" value="bar" />
@@ -205,7 +205,7 @@ public function testFormOpenMultipart()
 
                 EOH;
         } else {
-            $expected = <<<EOH
+            $expected = <<<'EOH'
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
 
                 EOH;
@@ -238,7 +238,7 @@ public function testFormHiddenArrayInput()
         $data = [
             'foo' => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
 
             <input type="hidden" name="foo" value="bar" />
 
@@ -252,7 +252,7 @@ public function testFormHiddenArrayValues()
         $data = [
             'foo' => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
 
             <input type="hidden" name="name[foo]" value="bar" />
 
@@ -327,7 +327,7 @@ public function testFormTextareaWithValueAttribute()
             'name'  => 'foo',
             'value' => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <textarea name="foo" cols="40" rows="10">bar</textarea>
 
             EOH;
@@ -472,7 +472,7 @@ public function testFormDropdownInferred()
     // ------------------------------------------------------------------------
     public function testFormDropdownWithSelectedAttribute()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <select name="foo">
             <option value="bar" selected="selected">Bar</option>
             </select>
@@ -491,7 +491,7 @@ public function testFormDropdownWithSelectedAttribute()
     // ------------------------------------------------------------------------
     public function testFormDropdownWithOptionsAttribute()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <select name="foo">
             <option value="bar">Bar</option>
             </select>
@@ -509,7 +509,7 @@ public function testFormDropdownWithOptionsAttribute()
     // ------------------------------------------------------------------------
     public function testFormDropdownWithEmptyArrayOptionValue()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <select name="foo">
             </select>
 
@@ -583,7 +583,7 @@ public function testFormFieldset()
     // ------------------------------------------------------------------------
     public function testFormFieldsetWithNoLegent()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <fieldset>
 
             EOH;
@@ -596,7 +596,7 @@ public function testFormFieldsetWithAttributes()
         $attributes = [
             'name' => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <fieldset name="bar">
             <legend>Foo</legend>
 
@@ -607,7 +607,7 @@ public function testFormFieldsetWithAttributes()
     // ------------------------------------------------------------------------
     public function testFormFieldsetClose()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             </fieldset></div></div>
             EOH;
         $this->assertEquals($expected, form_fieldset_close('</div></div>'));
@@ -630,7 +630,7 @@ public function testFormCheckboxArrayData()
             'value'   => 'bar',
             'checked' => true,
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <input type="checkbox" name="foo" value="bar" checked="checked" />
 
             EOH;
@@ -645,7 +645,7 @@ public function testFormCheckboxArrayDataWithCheckedFalse()
             'value'   => 'bar',
             'checked' => false,
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <input type="checkbox" name="foo" value="bar" />
 
             EOH;
@@ -673,7 +673,7 @@ public function testFormSubmit()
     // ------------------------------------------------------------------------
     public function testFormLabel()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <label for="username">What is your Name</label>
             EOH;
         $this->assertEquals($expected, form_label('What is your Name', 'username'));
@@ -685,7 +685,7 @@ public function testFormLabelWithAttributes()
         $attributes = [
             'id' => 'label1',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <label for="foo" id="label1">bar</label>
             EOH;
         $this->assertEquals($expected, form_label('bar', 'foo', $attributes));
@@ -716,7 +716,7 @@ public function testFormButtonWithDataArray()
             'name'    => 'foo',
             'content' => 'bar',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <button name="foo" type="button">bar</button>
 
             EOH;
@@ -726,7 +726,7 @@ public function testFormButtonWithDataArray()
     // ------------------------------------------------------------------------
     public function testFormClose()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             </form></div></div>
             EOH;
         $this->assertEquals($expected, form_close('</div></div>'));
@@ -739,7 +739,7 @@ public function testFormDatalist()
             'foo1',
             'bar1',
         ];
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <input type="text" name="foo" value="bar" list="foo_list" />
 
             <datalist id='foo_list'><option value='foo1'>
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index ac50e28a5ca7..a62bf5725a68 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
 
     public function testBasicUL()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ul>
               <li>foo</li>
               <li>bar</li>
@@ -56,7 +56,7 @@ public function testBasicUL()
 
     public function testULWithClass()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ul class="test">
               <li>foo</li>
               <li>bar</li>
@@ -75,7 +75,7 @@ public function testULWithClass()
 
     public function testMultiLevelUL()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ul>
               <li>foo</li>
               <li>bar</li>
@@ -106,7 +106,7 @@ public function testMultiLevelUL()
 
     public function testBasicOL()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ol>
               <li>foo</li>
               <li>bar</li>
@@ -125,7 +125,7 @@ public function testBasicOL()
 
     public function testOLWithClass()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ol class="test">
               <li>foo</li>
               <li>bar</li>
@@ -144,7 +144,7 @@ public function testOLWithClass()
 
     public function testMultiLevelOL()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <ol>
               <li>foo</li>
               <li>bar</li>
@@ -299,7 +299,7 @@ public function testDocTypeInvalid()
 
     public function testVideo()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <video src="http://www.codeigniter.com/test.mp4" controls>
               Your browser does not support the video tag.
             </video>
@@ -314,7 +314,7 @@ public function testVideo()
 
     public function testVideoWithTracks()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <video src="http://example.com/test.mp4" controls>
               <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
               <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
@@ -331,7 +331,7 @@ public function testVideoWithTracks()
 
     public function testVideoWithTracksAndIndex()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <video src="http://example.com/index.php/test.mp4" controls>
               <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
               <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
@@ -348,7 +348,7 @@ public function testVideoWithTracksAndIndex()
 
     public function testVideoMultipleSources()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <video class="test" controls>
               <source src="http://example.com/movie.mp4" type="video/mp4" class="test" />
               <source src="http://example.com/movie.ogg" type="video/ogg" />
@@ -377,7 +377,7 @@ public function testVideoMultipleSources()
 
     public function testAudio()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <audio id="test" controls>
               <source src="http://example.com/sound.ogg" type="audio/ogg" />
               <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
@@ -400,7 +400,7 @@ public function testAudio()
 
     public function testAudioSimple()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
               Your browser does not support the audio tag.
             </audio>
@@ -416,7 +416,7 @@ public function testAudioSimple()
 
     public function testAudioWithSource()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <audio src="http://codeigniter.com/sound.mpeg" type="audio/mpeg" id="test" controls>
               Your browser does not support the audio tag.
             </audio>
@@ -432,7 +432,7 @@ public function testAudioWithSource()
 
     public function testAudioWithIndex()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <audio src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" id="test" controls>
               Your browser does not support the audio tag.
             </audio>
@@ -448,7 +448,7 @@ public function testAudioWithIndex()
 
     public function testAudioWithTracks()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
               <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
               <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
@@ -468,7 +468,7 @@ public function testAudioWithTracks()
 
     public function testMediaNameOnly()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <av>
             </av>
 
@@ -478,7 +478,7 @@ public function testMediaNameOnly()
 
     public function testMediaWithSources()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <av>
               <source src="http://example.com/sound.ogg" type="audio/ogg" />
               <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
@@ -502,7 +502,7 @@ public function testSource()
 
     public function testEmbed()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
 
             EOH;
@@ -514,7 +514,7 @@ public function testEmbed()
 
     public function testEmbedIndexed()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <embed src="http://example.com/index.php/movie.mov" type="video/quicktime" class="test" />
 
             EOH;
@@ -526,7 +526,7 @@ public function testEmbedIndexed()
 
     public function testObject()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <object data="http://example.com/movie.swf" class="test"></object>
 
             EOH;
@@ -539,7 +539,7 @@ public function testObject()
 
     public function testObjectWithParams()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <object data="http://example.com/movie.swf" class="test">
               <param name="foo" type="ref" value="bar" class="test" />
               <param name="hello" type="ref" value="world" class="test" />
@@ -558,7 +558,7 @@ public function testObjectWithParams()
 
     public function testObjectIndexed()
     {
-        $expected = <<<EOH
+        $expected = <<<'EOH'
             <object data="http://example.com/index.php/movie.swf" class="test"></object>
 
             EOH;
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 382a3ca27ee7..9e3e4001e6a1 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -180,7 +180,7 @@ public function testHighlightCode()
         $parser->setData($data);
 
         $template = '{ value1|highlight_code }';
-        $expected = <<<EOF
+        $expected = <<<'EOF'
             <code><span style="color: #000000">
             <span style="color: #0000BB">Sincerely&nbsp;</span>
             </span>
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 138aa1197f9c..458ee42e2869 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -76,6 +76,7 @@ public function __construct()
             ],
             'function_to_constant'                  => true,
             'heredoc_indentation'                   => ['indentation' => 'start_plus_one'],
+            'heredoc_to_nowdoc'                     => true,
             'indentation_type'                      => true,
             'line_ending'                           => true,
             'list_syntax'                           => ['syntax' => 'short'],