Avoid deprecation notice on PHP 8.1 due to converting false to array
#1040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ray to avoid deprecation notices
dkotter
requested review from
Sidsector9 and
peterwilsoncc
and removed request for
a team and
Sidsector9
peterwilsoncc
previously approved these changes
Mar 26, 2023
| @@ -832,12 +832,13 @@ public static function build_available_authorized_sites( $user_id = false, $cont | |||
| $authorized_sites = get_transient( $cache_key ); | |||
|
|
|||
| if ( $force || false === $authorized_sites ) { | |||
| $sites = get_sites( | |||
| $authorized_sites = ! is_array( $authorized_sites ) ? array() : $authorized_sites; | |||
There was a problem hiding this comment.
Suggested change
| $authorized_sites = ! is_array( $authorized_sites ) ? array() : $authorized_sites; | |
| $authorized_sites = array(); |
I think it should always start empty:
=== falseit's not an array$force === truethen we're repopulating the authorized sites from 0. If the old value is retained then each site will appear in the array twice.
There was a problem hiding this comment.
Yeah, good point, I think this should always be a new empty array if we make it inside this conditional. I've made that change
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 of the Change
In testing something else on Distributor, I was going PHP deprecation notices showing up on the internal Pull Content screen. This notice said:
PHP Deprecated: Automatic conversion of false to array is deprecated. Looking at the code, we have a place where a value may befalseand then later we use that as anarraybut we don't ever set that as anarrayfirst.This PR fixes that by adding a check to convert that variable to an
arrayif it isn't already.How to test the Change
In an environment running PHP 8.1, go to the internal Pull screen and notice a PHP deprecation notice.
Check out the code in this PR and note the notice should no longer be there.
Ensure all connections show up properly in the Pull dropdown, that you can switch between connections successfully, and that you can pull in content.
Changelog Entry
Credits
Props @dkotter
Checklist: