[stable10] Update backported code from 33302 33859 now we have PHP7 #34925
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR #33302 used some PHP7 specific code, e.g. "null coalescing operator" https://www.php.net/manual/en/migration70.new-features.php
So that had to be backported differently in
stable10
PR #33859This PR applies the "null coalescing operator" changes to
stable10
to make these files the same instable10
andmaster
Related Issue
Aligning core master and stable10
Motivation and Context
How Has This Been Tested?
CI
Types of changes
Checklist:
Open tasks: