Skip to content

[4.5] test: update highlightFile test #8417

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jan 16, 2024
Merged

[4.5] test: update highlightFile test #8417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e019cb
test: update expectations
kenjis Jan 16, 2024
798ac68
test: remove test for PHP 7.4
kenjis Jan 16, 2024
993a70a
refactor: add `declare(strict_types=1);`
kenjis Jan 16, 2024
a340f18
test: add `declare(strict_types=1);`
kenjis Jan 16, 2024
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
2 changes: 2 additions & 0 deletions system/Test/IniTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down
28 changes: 14 additions & 14 deletions tests/_support/Debug/highlightFile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<pre><code><span class="line"><span class="number"> 9</span> * the LICENSE file that was distributed with this source code.
<span class="line"><span class="number">10</span> */
<span class="line"><span class="number">11</span>
<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace </span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
<pre><code><span class="line"><span class="number"> 9</span> *
<span class="line"><span class="number">10</span> * For the full copyright and license information, please view
<span class="line"><span class="number">11</span> * the LICENSE file that was distributed with this source code.
<span class="line"><span class="number">12</span> */
<span class="line"><span class="number">13</span>
<span class="line"><span class="number">14</span> use </span><span style="color: #c7c7c7">CodeIgniter\Controller</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">14</span> </span><span style="color: #f1ce61;">namespace </span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">15</span>
<span class='line highlight'><span class='number'>16</span> class Hello extends Controller
</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
<span class="line"><span class="number">18</span> public function </span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
<span class="line"><span class="number">19</span> {
<span class="line"><span class="number">20</span> return </span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">21</span> }
<span class="line"><span class="number">22</span> }
<span class="line"><span class="number">23</span> </span>
</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
<span class='line highlight'><span class='number'>16</span> use CodeIgniter\Controller;
</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"><span class="line"><span class="number">17</span>
<span class="line"><span class="number">18</span> class </span><span style="color: #c7c7c7">Hello </span><span style="color: #f1ce61;">extends </span><span style="color: #c7c7c7">Controller
<span class="line"><span class="number">19</span> </span><span style="color: #f1ce61;">{
<span class="line"><span class="number">20</span> public function </span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
<span class="line"><span class="number">21</span> {
<span class="line"><span class="number">22</span> return </span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">23</span> }
</span></span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
16 changes: 0 additions & 16 deletions tests/_support/Debug/highlightFile_pre_80000.html
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions tests/_support/Debug/highlightFile_pre_80300.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<pre><code><span class="line"><span class="number"> 9</span> &nbsp;*&nbsp;the&nbsp;LICENSE&nbsp;file&nbsp;that&nbsp;was&nbsp;distributed&nbsp;with&nbsp;this&nbsp;source&nbsp;code.
<span class="line"><span class="number">10</span> &nbsp;*/
<span class="line"><span class="number">11</span>
<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
<pre><code><span class="line"><span class="number"> 9</span> &nbsp;*
<span class="line"><span class="number">10</span> &nbsp;*&nbsp;For&nbsp;the&nbsp;full&nbsp;copyright&nbsp;and&nbsp;license&nbsp;information,&nbsp;please&nbsp;view
<span class="line"><span class="number">11</span> &nbsp;*&nbsp;the&nbsp;LICENSE&nbsp;file&nbsp;that&nbsp;was&nbsp;distributed&nbsp;with&nbsp;this&nbsp;source&nbsp;code.
<span class="line"><span class="number">12</span> &nbsp;*/
<span class="line"><span class="number">13</span>
<span class="line"><span class="number">14</span> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter\Controller</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">14</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">15</span>
<span class='line highlight'><span class='number'>16</span> class&nbsp;Hello&nbsp;extends&nbsp;Controller
</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
<span class="line"><span class="number">18</span> &nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
<span class="line"><span class="number">19</span> &nbsp;&nbsp;&nbsp;&nbsp;{
<span class="line"><span class="number">20</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;</span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;}
<span class="line"><span class="number">22</span> }
<span class="line"><span class="number">23</span> </span>
</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
<span class='line highlight'><span class='number'>16</span> use&nbsp;CodeIgniter\Controller;
</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"><span class="line"><span class="number">17</span>
<span class="line"><span class="number">18</span> class&nbsp;</span><span style="color: #c7c7c7">Hello&nbsp;</span><span style="color: #f1ce61;">extends&nbsp;</span><span style="color: #c7c7c7">Controller
<span class="line"><span class="number">19</span> </span><span style="color: #f1ce61;">{
<span class="line"><span class="number">20</span> &nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
<span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;{
<span class="line"><span class="number">22</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;</span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
<span class="line"><span class="number">23</span> &nbsp;&nbsp;&nbsp;&nbsp;}
</span></span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
4 changes: 0 additions & 4 deletions tests/system/Debug/ExceptionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,6 @@ public function testHighlightFile(): void
$result = $highlightFile(SUPPORTPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Hello.php', 16);

switch (true) {
case PHP_VERSION_ID < 80000:
$resultFile = 'highlightFile_pre_80000.html';
break;

case PHP_VERSION_ID < 80300:
$resultFile = 'highlightFile_pre_80300.html';
break;
Expand Down
2 changes: 2 additions & 0 deletions tests/system/Test/IniTestTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
Expand Down