fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401

Merged
kenjis merged 6 commits into
codeigniter4:developfrom
michalsn:fix/highlightFile
Jan 7, 2024
Merged

fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom
michalsn:fix/highlightFile

Conversation

@michalsn

@michalsnmichalsn commented Jan 5, 2024•
edited by kenjis
Loading

Copy link
Copy Markdown
Member

Description
Supersedes #8399
Fixes#8398

This PR fixes issues with highlightFile() method.

The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.

A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes

Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.

I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@michalsnmichalsn added the bug Verified issues on the current code behavior or pull requests that will fix them label Jan 5, 2024
@kenjis

kenjis commented Jan 6, 2024

Copy link
Copy Markdown
Member

@michalsnFixes: #8398 should be Fixes #8398.
See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

@kenjis

kenjis commented Jan 6, 2024

Copy link
Copy Markdown
Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401

@michalsn

michalsn commented Jan 6, 2024

Copy link
Copy Markdown
MemberAuthor

Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐

@michalsn

michalsn commented Jan 6, 2024

Copy link
Copy Markdown
MemberAuthor

Silly me... the result for PHP 7.4 is slightly different again. Fixed.

kenjis
kenjis approved these changes Jan 7, 2024
View reviewed changes

@kenjiskenjis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.

@kenjis
kenjis merged commit fc62f96 into codeigniter4:developJan 7, 2024
@kenjiskenjis mentioned this pull request Jan 7, 2024
Closed
5 tasks
@kenjiskenjis mentioned this pull request Jan 16, 2024
Merged
5 tasks
@kenjiskenjis mentioned this pull request Mar 11, 2024
Closed
5 tasks
@michalsn
michalsn deleted the fix/highlightFile branch February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees

No one assigned

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3

3 participants

@michalsn@kenjis@lonnieezell
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: highlightFile() in BaseExceptionHandler for PHP 8.3 - #8401
Merged
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Jan 7, 2024
Merged
fix: highlightFile() in BaseExceptionHandler for PHP 8.3#8401
kenjis merged 6 commits into
codeigniter4:developfrom 
michalsn:fix/highlightFile
Conversation
@michalsn
@michalsnmichalsn
commented
Jan 5, 2024•

edited by kenjis

Loading

Copy link


Copy Markdown

Member
Description

Supersedes #8399
Fixes#8398
This PR fixes issues with highlightFile() method.
The source of the problem is the fact that the highlight_file() function has slightly changed its behavior in PHP 8.3.
A nice summary can be found here:
https://php.watch/versions/8.3/highlight_file-highlight_string-html-changes
Except for the changes in the highlight_file() function, this PR also fixes some issues found in closing opened span tags.
I added some changes to the way $source variable is handled after noticing @kenjis PR: #8399.
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@michalsnmichalsn
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Jan 5, 2024
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
@michalsnFixes: #8398 should be Fixes #8398.

See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
@kenjis
kenjis
commented
Jan 6, 2024

Copy link


Copy Markdown

Member
There were 4 failures:
1) CodeIgniter\Debug\ExceptionHandlerTest::testHighlightFile
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
'<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;">;
+<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;">;
<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> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</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;">{
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionHandlerTest.php:257
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Helpers\TextHelperTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);&nbsp;</span><span style="color: #0000BB">?&gt;&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">&lt;?php&nbsp;var_dump</span><span style="color: #f1ce61;">(</span><span style="color: #c7c7c7">$this</span><span style="color: #f1ce61;">);&nbsp;</span><span style="color: #c7c7c7">?&gt;&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Helpers/TextHelperTest.php:273
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
3) CodeIgniter\Test\IniTestTraitTest::testBackupAndRestoreIniValues
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'#0000BB'
+'#c7c7c7'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/IniTestTraitTest.php:32
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
4) CodeIgniter\View\ParserFilterTest::testHighlightCode
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
+'<code><span style="color: #06B">
+<span style="color: #c7c7c7">Sincerely&nbsp;</span>
</span>
</code>'
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/View/ParserFilterTest.php:204
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
--
There were 2 skipped tests:
1) CodeIgniter\Debug\ExceptionsTest::testDeprecationsOnPhp81DoNotThrow
PHP >= 8.1 is required.
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Debug/ExceptionsTest.php:58
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
2) CodeIgniter\Test\TestCaseTest::testPHPUnitHeadersEmitted
CodeIgniter\Test\CIUnitTestCase::assertHeaderEmitted() requires xdebug.
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:512
/home/runner/work/CodeIgniter4/CodeIgniter4/system/Test/CIUnitTestCase.php:417
/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Test/TestCaseTest.php:98
phpvfscomposer:///home/runner/work/CodeIgniter4/CodeIgniter4/vendor/phpunit/phpunit/phpunit:106
FAILURES!
Tests: 5012, Assertions: 8463, Failures: 4, Skipped: 2.

https://github.com/codeigniter4/CodeIgniter4/actions/runs/7422018813/job/20196514237?pr=8401
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Yes, I'm not sure why it fails on PHP 7.4... and I don't have it locally to test 😐
@michalsn
michalsn
commented
Jan 6, 2024

Copy link


Copy Markdown

MemberAuthor
Silly me... the result for PHP 7.4 is slightly different again. Fixed.
kenjis
kenjis
approved these changes
Jan 7, 2024
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you.
@kenjis
kenjis
merged commit fc62f96
into
codeigniter4:developJan 7, 2024
@kenjiskenjis
mentioned this pull request
Jan 7, 2024
 Closed

5 tasks
@kenjiskenjis
mentioned this pull request
Jan 16, 2024
 Merged

5 tasks
@kenjiskenjis
mentioned this pull request
Mar 11, 2024
 Closed

5 tasks
@michalsn
michalsn
deleted the

fix/highlightFile

branch
February 21, 2026 20:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@lonnieezelllonnieezelllonnieezell approved these changes
@kenjiskenjiskenjis approved these changes

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Displaying Error Page with 4.4 with PHP 8.3


3 participants

@michalsn@kenjis@lonnieezell