Verified Commit af6fc3f5 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #2904467 by quietone, andyg5000: Plugins do not preserve integer keys... 

Issue #2904467 by quietone, andyg5000: Plugins do not preserve integer keys when parsing annotations

(cherry picked from commit d22493e7)
parent f6c3fb15

core/lib/Drupal/Component/Annotation/Plugin.php

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public function __construct($values) { 
      return $value !== NULL;

    });

    $parsed_values = $this->parse($values);

    $this->definition = NestedArray::mergeDeep($defaults, $parsed_values);

    $this->definition = NestedArray::mergeDeepArray([$defaults, $parsed_values], TRUE);

  }



  /**

core/tests/Drupal/Tests/Component/Annotation/PluginTest.php

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ public function testGet() { 
    // Assert all values are accepted through constructor and default value is

    // used for non existent but defined property.

    $plugin = new PluginStub([

      1 => 'oak',

      'foo' => 'bar',

      'biz' => [

        'baz' => 'boom',
@@ -32,6 +33,7 @@ public function testGet() { 
      // This property wasn't in our definition but is defined as a property on

      // our plugin class.

      'defaultProperty' => 'testvalue',

      1 => 'oak',

      'foo' => 'bar',

      'biz' => [

        'baz' => 'boom',