rework: URI creation and URL helper - #7282

Merged
kenjis merged 34 commits into
codeigniter4:4.4from
kenjis:refactor-URI-creation
Aug 16, 2023
Merged

rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from
kenjis:refactor-URI-creation

Conversation

@kenjis

@kenjiskenjis commented Feb 20, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Needs #7252, #7256, #7297

Description
Fixes#7123, #7296, #7643

  • Fixes
    • $this->request->getUri() returns a normalized current URI (SiteURI)
      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper
    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())

Before:
before
After:
after

Checklist:

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

@kenjis
kenjis marked this pull request as draft February 20, 2023 09:01
@kenjiskenjis added 4.4 refactor Pull requests that refactor code labels Feb 20, 2023
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from f93e1dd to 1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis added bug Verified issues on the current code behavior or pull requests that will fix them breaking change Pull requests that may break existing functionalities labels Feb 21, 2023
@kenjis
kenjisforce-pushed the refactor-URI-creation branch 2 times, most recently from 4463439 to 43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis mentioned this pull request Feb 23, 2023
Merged
5 tasks
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from 69675b1 to 1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis changed the title refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis changed the title refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed the refactor-URI-creation branch 2 times, most recently from bb7229b to 257357aCompareFebruary 26, 2023 06:52
@kenjis

kenjis commented Feb 26, 2023

Copy link
Copy Markdown
MemberAuthor

All checks passed!

However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
Merged
Closed
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from c0838c4 to c1f5b60CompareMarch 27, 2023 01:18
@kenjis

kenjis commented Mar 27, 2023

Copy link
Copy Markdown
MemberAuthor

Rebased.

@kenjis
kenjisforce-pushed the refactor-URI-creation branch from c1f5b60 to ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from ad50637 to 1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis mentioned this pull request Jul 4, 2023
Merged
5 tasks
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from 1300aea to cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis added the docs needed Pull requests needing documentation write-ups and/or revisions. label Jul 25, 2023
@kenjis
kenjisforce-pushed the refactor-URI-creation branch 6 times, most recently from b47fa76 to fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others added 19 commits August 16, 2023 14:07
@kenjis
kenjisforce-pushed the refactor-URI-creation branch from 1ba6f36 to c6f3d57CompareAugust 16, 2023 05:08
@kenjis

kenjis commented Aug 16, 2023

Copy link
Copy Markdown
MemberAuthor

I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.

I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.

I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.

@kenjis

kenjis commented Aug 16, 2023

Copy link
Copy Markdown
MemberAuthor

Thank you for reviews!

@kenjis
kenjis merged commit d73b455 into codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis deleted the refactor-URI-creation branch August 16, 2023 21:04
This was referenced Aug 17, 2023
Closed
Closed
Closed
@MGatner

MGatner commented Aug 20, 2023

Copy link
Copy Markdown
Member

🥳

@kenjiskenjis mentioned this pull request Sep 6, 2023
Merged
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees

No one assigned

Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik
, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik

, '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
rework: URI creation and URL helper - #7282
Merged
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Aug 16, 2023
Merged
rework: URI creation and URL helper#7282
kenjis merged 34 commits into
codeigniter4:4.4from 
kenjis:refactor-URI-creation
Conversation
@kenjis
@kenjiskenjis
commented
Feb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Needs #7252, #7256, #7297
Description
Fixes#7123, #7296, #7643
  • Fixes

    • $this->request->getUri() returns a normalized current URI (SiteURI)

      • if $indexPage is index.php, the URI contains index.php
    • [BC] $this->request->getUri()->getPath() returns full URI path
    • current_url(true) returns the same instance with $this->request->getUri()
    • base_url() and site_url() now support protocol-relative links
    • ControllerTestTrait::withUri() updates the Request instance, too. Because the Request instance has the URI instance. See https://forum.codeigniter.com/showthread.php?tid=88213
  • use SiteURIFactory, SiteURI
  • add Services::siteurifactory()
  • add Services::superglobals()
  • URL helper

    • add SiteURI::baseUrl() and SiteURI::siteUrl()
    • remove _get_uri()
    • site_url(), base_url(), current_url() use SiteURI (Services::request()->getUri())
Before:
before

After:
after
Checklist:
  •  Securely signed commits
  •  Component(s) with PHPDoc blocks, only if necessary or adds value
  •  Unit testing, with >80% coverage
  •  User guide updated
  •  Conforms to style guide
@kenjis
kenjis
marked this pull request as draft
February 20, 2023 09:01
@kenjiskenjis
added

4.4

refactor
Pull requests that refactor code
labels
Feb 20, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
f93e1dd to
1cd23f7CompareFebruary 21, 2023 06:20
@kenjiskenjis
added

bug
Verified issues on the current code behavior or pull requests that will fix them
breaking change
Pull requests that may break existing functionalities
labels
Feb 21, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
4463439 to
43e8df1CompareFebruary 23, 2023 07:18
@kenjiskenjis
mentioned this pull request
Feb 23, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
69675b1 to
1e1b087CompareFebruary 24, 2023 00:15
@kenjiskenjis
changed the title
refactor: URI creation and URL helpersrefactor: URI creation and URL helperFeb 24, 2023
@kenjiskenjis
changed the title
refactor: URI creation and URL helperrework: URI creation and URL helperFeb 24, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
2 times, most recently
from
bb7229b to
257357aCompareFebruary 26, 2023 06:52
@kenjis
kenjis
commented
Feb 26, 2023

Copy link


Copy Markdown

MemberAuthor
All checks passed!
However, to be honest I am a little concerned about whether the existing Controller/HTTP tests will be broken.

This was referenced Feb 27, 2023
 Merged


Closed

@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c0838c4 to
c1f5b60CompareMarch 27, 2023 01:18
@kenjis
kenjis
commented
Mar 27, 2023

Copy link


Copy Markdown

MemberAuthor
Rebased.
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
c1f5b60 to
ad50637CompareJune 8, 2023 02:17
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
ad50637 to
1300aeaCompareJune 29, 2023 01:48
@kenjiskenjis
mentioned this pull request
Jul 4, 2023
 Merged

5 tasks
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1300aea to
cdd4614CompareJuly 9, 2023 08:55
@kenjiskenjis
added
the 
docs needed
Pull requests needing documentation write-ups and/or revisions.
label
Jul 25, 2023
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
6 times, most recently
from
b47fa76 to
fc6c3a6CompareJuly 28, 2023 04:03
kenjisand others
added 19 commits
August 16, 2023 14:07
@kenjis
kenjisforce-pushed
the
refactor-URI-creation
branch
from
1ba6f36 to
c6f3d57CompareAugust 16, 2023 05:08
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
I'm a little nervous how many test changes there are. It looks like the only real assertion changes are leading / which hopefully are just internal and won't affect projects.
I expect few tests to fail unless you test the URI by setting the state of dependent objects and/or global variables, as CI4 does.
I don't think this is such an unrealistic expectation, since in a normal web app, site URIs are rarely tested.
@kenjis
kenjis
commented
Aug 16, 2023

Copy link


Copy Markdown

MemberAuthor
Thank you for reviews!
@kenjis
kenjis
merged commit d73b455
into
codeigniter4:4.4Aug 16, 2023
@kenjis
kenjis
deleted the

refactor-URI-creation

branch
August 16, 2023 21:04

This was referenced Aug 17, 2023

Closed


Closed


Closed

@MGatner
MGatner
commented
Aug 20, 2023

Copy link


Copy Markdown

Member
🥳
@kenjiskenjis
mentioned this pull request
Sep 6, 2023
 Merged

5 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@samsonasiksamsonasiksamsonasik approved these changes
@MGatnerMGatnerMGatner approved these changes

Assignees


No one assigned


Labels

breaking changePull requests that may break existing functionalitiesbugVerified issues on the current code behavior or pull requests that will fix themrefactorPull requests that refactor code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kenjis@MGatner@samsonasik