Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + ' refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, '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" + ' refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, '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('^' + ".*" + ' refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0
, '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); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor: add `declare(strict_types=1)` by kenjis · Pull Request #8072 · codeigniter4/CodeIgniter4 · GitHub
Skip to content

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

refactor: add declare(strict_types=1) - #8072

Merged
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types
Dec 4, 2023
Merged

refactor: add declare(strict_types=1)#8072
kenjis merged 11 commits into
codeigniter4:4.5from
kenjis:declare_strict_types

Conversation

@kenjis

@kenjiskenjis commented Oct 22, 2023

Copy link
Copy Markdown
Member

Needs #8078, #8080, #8090, #8091, #8124, #8138, #8175, #8242, #8270

Description

  • add declare(strict_types=1)

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 refactor Pull requests that refactor code 4.5 labels Oct 22, 2023
@kenjis
kenjis marked this pull request as draft October 22, 2023 06:26
@kenjis

Copy link
Copy Markdown
MemberAuthor

@samsonasik
The following config does not work.
DeclareStrictTypesRector does not skip files in app/ or other folders.
Is there something wrong?

--- a/rector.php+++ b/rector.php@@ -44,6 +44,7 @@ use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -107,6 +108,15 @@ return static function (RectorConfig $rectorConfig): void {
__DIR__ . '/system/Session/Handlers',
],
+ DeclareStrictTypesRector::class => [+ __DIR__ . '/app',+ __DIR__ . '/system/Commands/Generators/Views',+ __DIR__ . '/system/Pager/Views',+ __DIR__ . '/system/Validation/Views',+ __DIR__ . '/system/View/Parser.php',+ __DIR__ . '/tests/system/View/Views',+ ],+
// use mt_rand instead of random_int on purpose on non-cryptographically random
RandomFunctionRector::class,
@@ -117,6 +127,7 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->importNames();
$rectorConfig->removeUnusedImports();
+ $rectorConfig->rule(DeclareStrictTypesRector::class);
$rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);

@samsonasik

Copy link
Copy Markdown
Member

I am on mobile, but that seems a bug due to DeclareStrictTypesRector run on beforeTraverse() while skipping check happen on enterNode() so that overlapped.

@samsonasik

Copy link
Copy Markdown
Member

Reproduced at Rector side:

@MGatner

Copy link
Copy Markdown
Member

What a long-standing conversation! I think this is the right time to do this. @lonnieezell What was our strict_types friend? John something... Should mention him here.

@MGatner

Copy link
Copy Markdown
Member

@John-Betong

@neznaika0

Copy link
Copy Markdown
Contributor

I like type control.

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 24, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 94c109a to e7323f3CompareOctober 25, 2023 00:21
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 25, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch from 7c9cf1e to 55d04f7CompareOctober 27, 2023 21:37
@kenjiskenjis removed the stale Pull requests with conflicts label Oct 27, 2023
@kenjis
kenjisforce-pushed the declare_strict_types branch 4 times, most recently from 60d3980 to 3b31066CompareOctober 30, 2023 04:02
@github-actionsgithub-actionsBot added the stale Pull requests with conflicts label Nov 3, 2023
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from 3b31066 to d0b3895CompareNovember 3, 2023 00:47
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 3, 2023
@kenjiskenjis mentioned this pull request Nov 3, 2023
5 tasks
@github-actions

Copy link
Copy Markdown

👋 Hi, @kenjis!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@kenjis
kenjisforce-pushed the declare_strict_types branch from e1fb8f4 to 25e70ccCompareNovember 8, 2023 03:01
@kenjiskenjis removed the stale Pull requests with conflicts label Nov 8, 2023
@kenjiskenjis mentioned this pull request Nov 8, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 25e70cc to dd84a82CompareNovember 8, 2023 06:50
@kenjis
kenjisforce-pushed the declare_strict_types branch from dd84a82 to 3dfb298CompareNovember 22, 2023 01:09
@kenjiskenjis mentioned this pull request Nov 22, 2023
5 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch 3 times, most recently from 9a4da43 to 71e8443CompareNovember 29, 2023 03:06
@kenjiskenjis mentioned this pull request Nov 29, 2023
2 tasks
@kenjis
kenjisforce-pushed the declare_strict_types branch from 71e8443 to 4b87253CompareNovember 29, 2023 04:09
@kenjis
kenjisforce-pushed the declare_strict_types branch from 4b87253 to 528512dCompareNovember 30, 2023 07:15
@kenjis

Copy link
Copy Markdown
MemberAuthor

All checks have passed! 🎉

@kenjis
kenjis marked this pull request as ready for review November 30, 2023 08:04
@kenjis
kenjis merged commit d61e33e into codeigniter4:4.5Dec 4, 2023
@kenjis
kenjis deleted the declare_strict_types branch December 4, 2023 21:36
@kenjis

Copy link
Copy Markdown
MemberAuthor

Now in 4.5 branch, most files have declare(strict_types=1)! 🎉

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

Labels

refactorPull requests that refactor code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kenjis@samsonasik@MGatner@neznaika0