') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); refactor: remove hard coded `'Y-m-d H:i:s'` by kenjis · Pull Request #1027 · codeigniter4/shield · GitHub
Skip to content

refactor: remove hard coded 'Y-m-d H:i:s' - #1027

Merged
datamweb merged 1 commit into
codeigniter4:developfrom
kenjis:remove-hard-coded-datetime-format
Feb 24, 2024
Merged

refactor: remove hard coded 'Y-m-d H:i:s'#1027
datamweb merged 1 commit into
codeigniter4:developfrom
kenjis:remove-hard-coded-datetime-format

Conversation

@kenjis

@kenjiskenjis commented Feb 14, 2024

Copy link
Copy Markdown
Member

Description
See #608 and codeigniter4/CodeIgniter4#8538

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

@kenjiskenjis added the refactor Pull requests that refactor code label Feb 14, 2024
kenjis
kenjis commented Feb 14, 2024
View reviewed changes
Comment threadsrc/Models/LoginModel.php
@kenjis

kenjis commented Feb 14, 2024

Copy link
Copy Markdown
MemberAuthor

I sent PR to fix: codeigniter4/CodeIgniter4#8543

 ------ --------------------------------------------------------------------- Line src/Controllers/MagicLinkController.php ------ --------------------------------------------------------------------- 108 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. ------ --------------------------------------------------------------------- ------ --------------------------------------------------------------------- Line src/Models/LoginModel.php ------ --------------------------------------------------------------------- 77 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. ------ --------------------------------------------------------------------- ------ --------------------------------------------------------------------- Line src/Models/RememberModel.php ------ --------------------------------------------------------------------- 58 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. ------ --------------------------------------------------------------------- ------ --------------------------------------------------------------------- Line tests/Authentication/MagicLinkTest.php ------ --------------------------------------------------------------------- 113 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. 135 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. ------ --------------------------------------------------------------------- ------ --------------------------------------------------------------------- Line tests/Controllers/MagicLinkTest.php ------ --------------------------------------------------------------------- 102 Parameter #1 $row of method CodeIgniter\Model::insert() expects array<int|string, float|int|string|null>|object|null, array<string, CodeIgniter\I18n\Time|int|string|null> given. ------ --------------------------------------------------------------------- Error: [ERROR] Found 6 errors

https://github.com/codeigniter4/shield/actions/runs/7895251231/job/21547330117?pr=1027

@kenjiskenjis mentioned this pull request Feb 14, 2024
Merged
3 tasks
datamweb
datamweb reviewed Feb 14, 2024
View reviewed changes

@datamwebdatamweb left a comment •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

dateFormat has been added to CI version 4.5 In contrast, Shield supports version 4.3.5. What effect will these changes have on older versions?

Comment threadsrc/Authentication/Authenticators/Session.php
Comment threadsrc/Models/LoginModel.php
@kenjis

kenjis commented Feb 14, 2024

Copy link
Copy Markdown
MemberAuthor

dateFormat has been added to CI version 4.5 In contrast, Shield supports version 4.3.5. What effect will these changes have on older versions?

In my understanding, there is no changes.
The Time instance that is passed to a Model will be converted to a string with hard coded Y-m-d H:i:s in the Model.
See https://github.com/codeigniter4/CodeIgniter4/blob/3595944eac90df7e499403bad8767935c41488d9/system/BaseModel.php#L1316-L1320

datamweb
datamweb reviewed Feb 14, 2024
View reviewed changes
Comment threadsrc/Authentication/Authenticators/Session.php
@datamwebdatamweb reopened this Feb 24, 2024
@datamweb

datamweb commented Feb 24, 2024

Copy link
Copy Markdown
Collaborator

@kenjis thank you!

@datamweb
datamweb merged commit 0802f39 into codeigniter4:developFeb 24, 2024
@kenjis
kenjis deleted the remove-hard-coded-datetime-format branch February 24, 2024 09:58
@kenjiskenjis mentioned this pull request Apr 8, 2024
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@datamwebdatamwebdatamweb approved these changes

Assignees

No one assigned

Labels

refactorPull requests that refactor code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kenjis@datamweb