[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951

Merged
kenjis merged 20 commits into
codeigniter4:developfrom
samsonasik:boolean-in-if
Oct 16, 2023
Merged

[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom
samsonasik:boolean-in-if

Conversation

@samsonasik

@samsonasiksamsonasik commented Sep 18, 2023

Copy link
Copy Markdown
Member

Description

@kenjis@paulbalandan here based on #7943 (review)

I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.

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

samsonasik
samsonasik commented Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php Outdated
@samsonasiksamsonasik mentioned this pull request Sep 18, 2023
Merged
1 task
kenjis
kenjis reviewed Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php Outdated
kenjis
kenjis reviewed Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php Outdated
@kenjiskenjis added the refactor Pull requests that refactor code label Sep 18, 2023
@samsonasik

samsonasik commented Sep 18, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis updated 👍

@samsonasik

samsonasik commented Sep 18, 2023

Copy link
Copy Markdown
MemberAuthor

phpstan baseline regenerated 👍

kenjis
kenjis reviewed Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php Outdated
@samsonasik

samsonasik commented Sep 18, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis updated 👍

@samsonasik

samsonasik commented Sep 18, 2023

Copy link
Copy Markdown
MemberAuthor

should be ready for merge 👍

kenjis
kenjis previously approved these changes Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan reviewed Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php Outdated
Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php Outdated
Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php Outdated
Comment threadsystem/Test/FeatureTestTrait.php Outdated
Comment threadsystem/View/View.php Outdated
Comment threadsystem/View/View.php Outdated
@kenjis
kenjis dismissed their stale reviewSeptember 19, 2023 02:19

It would be better to remove conditions that are not necessary.

@ddevsrddevsr added stale Pull requests with conflicts and removed stale Pull requests with conflicts labels Sep 20, 2023
@github-actions

github-actionsBot commented Sep 22, 2023

Copy link
Copy Markdown

👋 Hi, @samsonasik!

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 Sep 22, 2023
@MGatner

MGatner commented Sep 26, 2023

Copy link
Copy Markdown
Member

@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.

@samsonasik

samsonasik commented Sep 26, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.

@samsonasik
samsonasikforce-pushed the boolean-in-if branch 2 times, most recently from 7fc6c79 to 15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr removed the stale Pull requests with conflicts label Oct 16, 2023
@kenjis

kenjis commented Oct 16, 2023

Copy link
Copy Markdown
Member

@samsonasik Can you update the PR branch, and run rector again?

samsonasikand others added 4 commits October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik

samsonasik commented Oct 16, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis done 👍

kenjis
kenjis reviewed Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php Outdated
kenjis
kenjis reviewed Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php Outdated
samsonasikand others added 2 commits October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik

samsonasik commented Oct 16, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis updated 👍

@kenjis

kenjis commented Oct 16, 2023

Copy link
Copy Markdown
Member

Please run to remove ignoreErrors.

$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis

kenjis commented Oct 16, 2023

Copy link
Copy Markdown
Member

Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.

@samsonasik

samsonasik commented Oct 16, 2023

Copy link
Copy Markdown
MemberAuthor

@kenjis done 👍

@kenjis

kenjis commented Oct 16, 2023

Copy link
Copy Markdown
Member

@samsonasik Thank you! 👍
PHPStan and Rector check have passed.
I'm going to merge this after all checks have passed.

samsonasik
samsonasik commented Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik

samsonasik commented Oct 16, 2023

Copy link
Copy Markdown
MemberAuthor

Ready to merge 👍

@kenjis
kenjis merged commit 431748b into codeigniter4:developOct 16, 2023
@samsonasik
samsonasik deleted the boolean-in-if branch October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr
, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr

, '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
[Rector] Apply BooleanInIfConditionRuleFixerRector - #7951
Merged
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Oct 16, 2023
Merged
[Rector] Apply BooleanInIfConditionRuleFixerRector#7951
kenjis merged 20 commits into
codeigniter4:developfrom 
samsonasik:boolean-in-if
Conversation
@samsonasik
@samsonasiksamsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

Member
Description
@kenjis@paulbalandan here based on #7943 (review)
I apply BooleanInIfConditionRuleFixerRector to ensure pass bool to if cond.
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
samsonasik
samsonasik
commented
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

@samsonasiksamsonasik
mentioned this pull request
Sep 18, 2023
 Merged

1 task
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/Exceptions.php
Outdated

kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Debug/ExceptionHandler.php
Outdated

@kenjiskenjis
added
the 
refactor
Pull requests that refactor code
label
Sep 18, 2023
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
phpstan baseline regenerated 👍
kenjis
kenjis
reviewed
Sep 18, 2023
View reviewed changes
Comment threadsystem/Config/Factories.php
Outdated

@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@samsonasik
samsonasik
commented
Sep 18, 2023

Copy link


Copy Markdown

MemberAuthor
should be ready for merge 👍
kenjis
kenjis
previously approved these changes
Sep 19, 2023
View reviewed changes
paulbalandan
paulbalandan
reviewed
Sep 19, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
Outdated

Comment threadsystem/CLI/CLI.php
Comment threadsystem/BaseModel.php
Comment threadsystem/CLI/Commands.php
Outdated

Comment threadsystem/Cache/Handlers/PredisHandler.php
Comment threadsystem/Pager/Pager.php
Comment threadsystem/Test/FeatureTestCase.php
Outdated

Comment threadsystem/Test/FeatureTestTrait.php
Outdated

Comment threadsystem/View/View.php
Outdated

Comment threadsystem/View/View.php
Outdated

@kenjis
kenjis
dismissed
their stale reviewSeptember 19, 2023 02:19
It would be better to remove conditions that are not necessary.
@ddevsrddevsr
added

stale
Pull requests with conflicts
and removed

stale
Pull requests with conflicts
labels
Sep 20, 2023
@github-actions
github-actionsBot
commented
Sep 22, 2023

Copy link


Copy Markdown

👋 Hi, @samsonasik!

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
Sep 22, 2023
@MGatner
MGatner
commented
Sep 26, 2023

Copy link


Copy Markdown

Member
@samsonasik I think this is a good direction to go but will need some more individual attention to the changes. Please review @paulbalandan and @kenjis suggestions.
@samsonasik
samsonasik
commented
Sep 26, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis@paulbalandan the type check is based on type defined in param, so that check fix also phpstan, except, we use assert before if to enforce type.
@samsonasik
samsonasikforce-pushed
the
boolean-in-if
branch
2 times, most recently
from
7fc6c79 to
15e91b2CompareOctober 2, 2023 00:31
@ddevsrddevsr
removed
the 
stale
Pull requests with conflicts
label
Oct 16, 2023
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Can you update the PR branch, and run rector again?
samsonasikand others
added 4 commits
October 16, 2023 11:28
@samsonasik
[Rector] Apply BooleanInIfConditionRuleFixerRector
83ebb79
@samsonasik@kenjis
use compare string for ini_get('display_errors')
8e288d2
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
use compare string for ini_get('display_errors')
41ecd8b
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
Update system/Config/Factories.php
2d3327f
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

kenjis
kenjis
reviewed
Oct 16, 2023
View reviewed changes
Comment threadsystem/HTTP/URI.php
Outdated

samsonasikand others
added 2 commits
October 16, 2023 12:42
@samsonasik@kenjis
add empty string check
3803fbc
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik@kenjis
add empty string check
faa0c99
Co-authored-by: kenjis <kenji.uui@gmail.com>
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis updated 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Please run to remove ignoreErrors.
$ vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php

@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
Run vendor/bin/rector process system/CLI/CLI.php first, and run phpstan to update the baseline.
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
@kenjis done 👍
@kenjis
kenjis
commented
Oct 16, 2023

Copy link


Copy Markdown

Member
@samsonasik Thank you! 👍

PHPStan and Rector check have passed.

I'm going to merge this after all checks have passed.
samsonasik
samsonasik
commented
Oct 16, 2023
View reviewed changes
Comment threadsystem/BaseModel.php
@samsonasik
samsonasik
commented
Oct 16, 2023

Copy link


Copy Markdown

MemberAuthor
Ready to merge 👍
@kenjis
kenjis
merged commit 431748b
into
codeigniter4:developOct 16, 2023
@samsonasik
samsonasik
deleted the

boolean-in-if

branch
October 16, 2023 06:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis left review comments
@paulbalandanpaulbalandanpaulbalandan left review comments
@MGatnerMGatnerAwaiting requested review from MGatner

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.

5 participants

@samsonasik@MGatner@kenjis@paulbalandan@ddevsr