comparison core/lib/Drupal/Component/Utility/NestedArray.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

    * @see NestedArray::unsetValue()
    */
   public static function &getValue(array &$array, array $parents, &$key_exists = NULL) {
     $ref = &$array;
     foreach ($parents as $parent) {
-      if (is_array($ref) && array_key_exists($parent, $ref)) {
+      if (is_array($ref) && (isset($ref[$parent]) || array_key_exists($parent, $ref))) {
         $ref = &$ref[$parent];
       }
       else {
         $key_exists = FALSE;
         $null = NULL;

    * @see NestedArray::getValue()
    */
   public static function unsetValue(array &$array, array $parents, &$key_existed = NULL) {
     $unset_key = array_pop($parents);
     $ref = &self::getValue($array, $parents, $key_existed);
-    if ($key_existed && is_array($ref) && array_key_exists($unset_key, $ref)) {
+    if ($key_existed && is_array($ref) && (isset($ref[$unset_key]) || array_key_exists($unset_key, $ref))) {
       $key_existed = TRUE;
       unset($ref[$unset_key]);
     }
     else {
       $key_existed = FALSE;