fix: replace config(DocTypes::class) with new DocTypes()#7872

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
kenjis merged 2 commits into from
Aug 31, 2023
Merged

fix: replace config(DocTypes::class) with new DocTypes()#7872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4570941
fix: replace `config(DocTypes::class)` with `new DocTypes()`
kenjis Aug 29, 2023
3474bc5
refactor: add way to chnage DocTypes for testing
kenjis Aug 29, 2023
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
14 changes: 12 additions & 2 deletions system/Common.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
/**
* Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
*
* @param DocTypes|null $docTypesConfig New config. For testing purpose only.
*
* @internal
*/
function _solidus(): string
function _solidus(?DocTypes $docTypesConfig = null): string
{
if (config(DocTypes::class)->html5 ?? false) {
static $docTypes = null;

if ($docTypesConfig !== null) {
$docTypes = $docTypesConfig;
}

$docTypes ??= new DocTypes();

if ($docTypes->html5 ?? false) {
return '';
}

Expand Down
5 changes: 3 additions & 2 deletions system/Typography/Typography.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
*/
public function nl2brExceptPre(string $str): string
{
$newstr = '';
$newstr = '';
$docTypes = new DocTypes();

for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
$xhtml = ! (config(DocTypes::class)->html5 ?? false);
$xhtml = ! ($docTypes->html5 ?? false);
$newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

if ($ct - 1 !== $i) {
Expand Down
21 changes: 16 additions & 5 deletions tests/system/CommonFunctionsTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

public function testSolidusElementXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$this->assertSame(' /', _solidus());

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

private function disableHtml5()
{
$doctypes = new DocTypes();
$doctypes->html5 = false;
_solidus($doctypes);
}

private function enableHtml5()
{
$doctypes = new DocTypes();
_solidus($doctypes);
}

public function testView(): void
Expand Down
35 changes: 20 additions & 15 deletions tests/system/Helpers/FormHelperTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

public function testFormInputXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<EOH
<input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
];
$this->assertSame($expected, form_input($data));

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

private function disableHtml5()
{
$doctypes = new DocTypes();
$doctypes->html5 = false;
_solidus($doctypes);
}

private function enableHtml5()
{
$doctypes = new DocTypes();
_solidus($doctypes);
}

public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

public function testFormUploadXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<EOH
<input type="file" name="attachment" />\n
EOH;
$this->assertSame($expected, form_upload('attachment'));

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

public function testFormCheckboxXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<EOH
<input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
EOH;
$this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testFormCheckboxArrayData(): void
Expand Down
81 changes: 34 additions & 47 deletions tests/system/Helpers/HTMLHelperTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
* @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

public function testIMGXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$target = 'http://site.com/images/picture.jpg';
$expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
$this->assertSame($expected, img($target));

$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes = new DocTypes();
$doctypes->html5 = false;
_solidus($doctypes);
}

private function enableHtml5()
{
$doctypes = new DocTypes();
_solidus($doctypes);
}

public function testIMGXHTMLWithoutProtocol(): void
{
$this->disableHtml5();

$target = 'assets/mugshot.jpg';
$expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
$this->assertSame($expected, img($target));

$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testIMGXHTMLWithIndexpage(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$target = 'assets/mugshot.jpg';
$expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
$this->assertSame($expected, img($target, true));

$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

public function testLinkTagXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$target = 'css/mystyles.css';
$expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
$this->assertSame($expected, link_tag($target));

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

public function testVideoWithTracksXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<'EOH'
<video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
$video = video($target, $message, 'controls', $tracks);
$this->assertSame($expected, $video);

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

public function testVideoMultipleSourcesXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<'EOH'
<video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

$this->assertSame($expected, $video);

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

public function testAudioXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<'EOH'
<audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

$this->assertSame($expected, $audio);

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

public function testSourceXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
$this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

public function testEmbedXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<'EOH'
<embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
$embed = embed('movie.mov', $type, 'class="test"');
$this->assertSame($expected, $embed);

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

public function testObjectWithParamsXHTML(): void
{
$doctypes = config('DocTypes');
$default = $doctypes->html5;
$doctypes->html5 = false;
$this->disableHtml5();

$expected = <<<'EOH'
<object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
$object = object('movie.swf', $type, 'class="test"', $parms);
$this->assertSame($expected, $object);

// Reset
$doctypes->html5 = $default;
$this->enableHtml5();
}

public function testObjectIndexed(): void
Expand Down
, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down

, '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: replace config(DocTypes::class) with new DocTypes()#7872

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

kenjis
merged 2 commits into

from

Aug 31, 2023
 Merged


fix: replace config(DocTypes::class) with new DocTypes()#7872
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4570941

fix: replace `config(DocTypes::class)` with `new DocTypes()`


kenjis Aug 29, 2023
3474bc5

refactor: add way to chnage DocTypes for testing


kenjis Aug 29, 2023

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


14 changes: 12 additions & 2 deletions
system/Common.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,11 +886,21 @@ function redirect(?string $route = null): RedirectResponse
 /**
 * Generates the solidus character (`/`) depending on the HTML5 compatibility flag in `Config\DocTypes`
 *
 * @param DocTypes|null $docTypesConfig New config. For testing purpose only.
 *
 * @internal
 */
 function _solidus(): string
 function _solidus(?DocTypes $docTypesConfig = null): string
 {
 if (config(DocTypes::class)->html5 ?? false) {
 static $docTypes = null;

 if ($docTypesConfig !== null) {
 $docTypes = $docTypesConfig;
 }

 $docTypes ??= new DocTypes();

 if ($docTypes->html5 ?? false) {
 return '';
 }

Expand Down

5 changes: 3 additions & 2 deletions
system/Typography/Typography.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,10 +323,11 @@ protected function protectCharacters(array $match): string
 */
 public function nl2brExceptPre(string $str): string
 {
 $newstr = '';
 $newstr = '';
 $docTypes = new DocTypes();

 for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
 $xhtml = ! (config(DocTypes::class)->html5 ?? false);
 $xhtml = ! ($docTypes->html5 ?? false);
 $newstr .= (($i % 2) === 0) ? nl2br($ex[$i], $xhtml) : $ex[$i];

 if ($ct - 1 !== $i) {
Expand Down

21 changes: 16 additions & 5 deletions
tests/system/CommonFunctionsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
use CodeIgniter\Test\TestLogger;
use Config\App;
use Config\Cookie;
use Config\DocTypes;
use Config\Logger;
use Config\Modules;
use Config\Routing;
Expand DownExpand Up@@ -180,14 +181,24 @@ public function testSolidusElement(): void

 public function testSolidusElementXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $this->assertSame(' /', _solidus());

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testView(): void
Expand Down

35 changes: 20 additions & 15 deletions
tests/system/Helpers/FormHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;
use Config\Filters;
use Config\Services;

Expand DownExpand Up@@ -262,9 +263,7 @@ public function testFormInput(): void

 public function testFormInputXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
Expand All@@ -279,8 +278,20 @@ public function testFormInputXHTML(): void
 ];
 $this->assertSame($expected, form_input($data));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 private function disableHtml5()
 {
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testFormInputWithExtra(): void
Expand DownExpand Up@@ -317,17 +328,14 @@ public function testFormUpload(): void

 public function testFormUploadXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="file" name="attachment" />\n
 EOH;
 $this->assertSame($expected, form_upload('attachment'));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormTextarea(): void
Expand DownExpand Up@@ -656,17 +664,14 @@ public function testFormCheckbox(): void

 public function testFormCheckboxXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<EOH
 <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
 EOH;
 $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testFormCheckboxArrayData(): void
Expand Down

81 changes: 34 additions & 47 deletions
tests/system/Helpers/HTMLHelperTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\DocTypes;

/**
 * @internal
Expand DownExpand Up@@ -206,41 +207,48 @@ public function testIMGWithIndexpage(): void

 public function testIMGXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'http://site.com/images/picture.jpg';
 $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

public function testIMGXHTMLWithoutProtocol(): void
private function disableHtml5()
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes = new DocTypes();
 $doctypes->html5 = false;
 _solidus($doctypes);
 }

 private function enableHtml5()
 {
 $doctypes = new DocTypes();
 _solidus($doctypes);
 }

 public function testIMGXHTMLWithoutProtocol(): void
 {
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testIMGXHTMLWithIndexpage(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'assets/mugshot.jpg';
 $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
 $this->assertSame($expected, img($target, true));

 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testImgData(): void
Expand DownExpand Up@@ -355,16 +363,13 @@ public function testLinkTag(): void

 public function testLinkTagXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $target = 'css/mystyles.css';
 $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
 $this->assertSame($expected, link_tag($target));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testLinkTagMedia(): void
Expand DownExpand Up@@ -509,9 +514,7 @@ public function testVideoWithTracks(): void

 public function testVideoWithTracksXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video src="http://example.com/test.mp4" controls>
Expand All@@ -531,8 +534,7 @@ public function testVideoWithTracksXHTML(): void
 $video = video($target, $message, 'controls', $tracks);
 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testVideoWithTracksAndIndex(): void
Expand DownExpand Up@@ -581,9 +583,7 @@ public function testVideoMultipleSources(): void

 public function testVideoMultipleSourcesXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <video class="test" controls>
Expand DownExpand Up@@ -613,8 +613,7 @@ public function testVideoMultipleSourcesXHTML(): void

 $this->assertSame($expected, $video);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudio(): void
Expand DownExpand Up@@ -642,9 +641,7 @@ public function testAudio(): void

 public function testAudioXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <audio id="test" controls>
Expand All@@ -670,8 +667,7 @@ public function testAudioXHTML(): void

 $this->assertSame($expected, $audio);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testAudioSimple(): void
Expand DownExpand Up@@ -774,15 +770,12 @@ public function testSource(): void

 public function testSourceXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
 $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbed(): void
Expand All@@ -799,9 +792,7 @@ public function testEmbed(): void

 public function testEmbedXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
Expand All@@ -812,8 +803,7 @@ public function testEmbedXHTML(): void
 $embed = embed('movie.mov', $type, 'class="test"');
 $this->assertSame($expected, $embed);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testEmbedIndexed(): void
Expand DownExpand Up@@ -862,9 +852,7 @@ public function testObjectWithParams(): void

 public function testObjectWithParamsXHTML(): void
 {
 $doctypes = config('DocTypes');
 $default = $doctypes->html5;
 $doctypes->html5 = false;
 $this->disableHtml5();

 $expected = <<<'EOH'
 <object data="http://example.com/movie.swf" class="test">
Expand All@@ -882,8 +870,7 @@ public function testObjectWithParamsXHTML(): void
 $object = object('movie.swf', $type, 'class="test"', $parms);
 $this->assertSame($expected, $object);

 // Reset
 $doctypes->html5 = $default;
 $this->enableHtml5();
 }

 public function testObjectIndexed(): void
Expand Down