Skip to content
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.

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

[REF][PHP8.1] Fix some further places where passing in NULL is deprec… #348

Merged
merged 1 commit into from
Jul 20, 2022

Conversation

seamuslee001
Copy link
Contributor

@civibot
Copy link

civibot bot commented Jul 19, 2022

(Standard links)

@civibot civibot bot added the master label Jul 19, 2022
@@ -158,7 +158,7 @@ public static function convertFromJSCharcode($value)
if (preg_match_all('/\d*[+-\/\* ]\d+/', $char, $matches)) {
$match = preg_split('/(\W?\d+)/',
(implode('', $matches[0])),
null,
'',
Copy link
Contributor

Choose a reason for hiding this comment

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

3rd param is an int for preg_split?

Copy link
Contributor

Choose a reason for hiding this comment

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

Otherwise PR looks good.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah good point will update to -1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok fixed now @demeritcowboy

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool. It turns out -1 and 0 mean the same thing in that spot (previously null would have been cast to 0).

@demeritcowboy
Copy link
Contributor

Jenkins retest this please.

(Fails have been seen before I think as intermittent time-related, but let's check.)

@seamuslee001 seamuslee001 merged commit 0aee74c into civicrm:master Jul 20, 2022
@seamuslee001 seamuslee001 deleted the packages_php81_3 branch July 20, 2022 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants