Skip to content

Commit f9bd4da

Browse files
committed
add separate results for PHP 7.4
1 parent e98dcfd commit f9bd4da

2 files changed

Lines changed: 29 additions & 3 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<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.
2+
<span class="line"><span class="number">10</span> &nbsp;*/
3+
<span class="line"><span class="number">11</span>
4+
<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Support</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controllers</span><span style="color: #f1ce61;">;
5+
<span class="line"><span class="number">13</span>
6+
<span class="line"><span class="number">14</span> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</span><span style="color: #f1ce61;">;
7+
<span class="line"><span class="number">15</span>
8+
<span class='line highlight'><span class='number'>16</span> class&nbsp;Hello&nbsp;extends&nbsp;Controller
9+
</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;">{
10+
<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;">()
11+
<span class="line"><span class="number">19</span> &nbsp;&nbsp;&nbsp;&nbsp;{
12+
<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;">;
13+
<span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;}
14+
<span class="line"><span class="number">22</span> }
15+
<span class="line"><span class="number">23</span> </span>
16+
</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>

tests/system/Debug/ExceptionHandlerTest.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,19 @@ public function testHighlightFile(): void
248248

249249
$highlightFile = $this->getPrivateMethodInvoker($this->handler, 'highlightFile');
250250
$result = $highlightFile(SUPPORTPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Hello.php', 16);
251-
$resultFile = PHP_VERSION_ID < 80300 ?
252-
'highlightFile_pre_80300.html' :
253-
'highlightFile.html';
251+
252+
switch (true) {
253+
case PHP_VERSION_ID < 80000:
254+
$resultFile = 'highlightFile_pre_80000.html';
255+
break;
256+
257+
case PHP_VERSION_ID < 80300:
258+
$resultFile = 'highlightFile_pre_80300.html';
259+
break;
260+
261+
default:
262+
$resultFile = 'highlightFile.html';
263+
}
254264

255265
$expected = file_get_contents(SUPPORTPATH . 'Debug' . DIRECTORY_SEPARATOR . $resultFile);
256266

0 commit comments

Comments
 (0)