Skip to content

Check object is actual array before calling count to prevent warnings #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Check object is actual array before calling count to prevent warnings #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f92eb6
Check object is actual array before calling count to prevent warnings
daum Apr 1, 2020
694b490
Switche dto is_array instead of countable
daum Apr 1, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Caxy/HtmlDiff/HtmlDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ protected function findIsolatedDiffTagsInOld($operation, $posInNew)
protected function insertTag($tag, $cssClass, &$words)
{
while (true) {
if (count($words) == 0) {
if (!is_array($words) || count($words) == 0) {
Copy link
Contributor

@SavageTiger SavageTiger Jan 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Hi @daum could you please do strict type checking here? (using ===) and rebase this PR on the latest master
break;
}

Expand Down Expand Up @@ -567,7 +567,7 @@ protected function insertTag($tag, $cssClass, &$words)
}
}
}
if (count($words) == 0 && $this->stringUtil->strlen($specialCaseTagInjection) == 0) {
if ((!is_array($words) || count($words) == 0) && $this->stringUtil->strlen($specialCaseTagInjection) == 0) {
break;
}
if ($specialCaseTagInjectionIsBefore) {
Expand Down