[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: EtcdConfig: use array_key_exists(), the value can be null

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351208 )

Change subject: EtcdConfig: use array_key_exists(), the value can be null
......................................................................

EtcdConfig: use array_key_exists(), the value can be null

Change-Id: Iae175401da8d49f5475d8c88cc5390b16e7cba32
(cherry picked from commit 4e6270223875bc09c816931e2ac7a992d963205e)
---
M includes/config/EtcdConfig.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/351208/1

diff --git a/includes/config/EtcdConfig.php b/includes/config/EtcdConfig.php
index d3fbd65..06d8dfb 100644
--- a/includes/config/EtcdConfig.php
+++ b/includes/config/EtcdConfig.php
@@ -251,7 +251,7 @@
 
                        $name = basename( $node['key'] );
                        $value = $this->unserialize( $node['value'] );
-                       if ( !is_array( $value ) || !isset( $value['val'] ) ) {
+                       if ( !is_array( $value ) || !array_key_exists( 'val', 
$value ) ) {
                                return [ null, "Failed to parse value for 
'$name'.", false ];
                        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/351208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae175401da8d49f5475d8c88cc5390b16e7cba32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits