Verified Commit 93c65749 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3454212 by nathankg, joachim: Update mentions of #2225961 in comments 

(cherry picked from commit d246c433)
parent 2afadf48

core/lib/Drupal/Core/Entity/EntityFieldManager.php

+5 −5
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ protected function buildBaseFieldDefinitions($entity_type_id) { 
    $provider = $entity_type->getProvider();

    foreach ($base_field_definitions as $definition) {

      // @todo Remove this check once FieldDefinitionInterface exposes a proper

      //   provider setter. See https://www.drupal.org/node/2225961.

      //   provider setter. See https://www.drupal.org/node/2346329.

      if ($definition instanceof BaseFieldDefinition) {

        $definition->setProvider($provider);

      }
@@ -292,7 +292,7 @@ function (callable $hook, string $module) use (&$base_field_definitions, $entity 
        // defining the field.

        foreach ($module_definitions as $field_name => $definition) {

          // @todo Remove this check once FieldDefinitionInterface exposes a

          //   proper provider setter. See https://www.drupal.org/node/2225961.

          //   proper provider setter. See https://www.drupal.org/node/2346329.

          if ($definition instanceof BaseFieldDefinition && $definition->getProvider() == NULL) {

            $definition->setProvider($module);

          }
@@ -402,7 +402,7 @@ protected function buildBundleFieldDefinitions($entity_type_id, $bundle, array $ 
    $provider = $entity_type->getProvider();

    foreach ($bundle_field_definitions as $definition) {

      // @todo Remove this check once FieldDefinitionInterface exposes a proper

      //   provider setter. See https://www.drupal.org/node/2225961.

      //   provider setter. See https://www.drupal.org/node/2346329.

      if ($definition instanceof BaseFieldDefinition) {

        $definition->setProvider($provider);

      }
@@ -417,7 +417,7 @@ function (callable $hook, string $module) use (&$bundle_field_definitions, $enti 
        // defining the field.

        foreach ($module_definitions as $field_name => $definition) {

          // @todo Remove this check once FieldDefinitionInterface exposes a

          //   proper provider setter. See https://www.drupal.org/node/2225961.

          //   proper provider setter. See https://www.drupal.org/node/2346329.

          if ($definition instanceof BaseFieldDefinition) {

            $definition->setProvider($module);

          }
@@ -594,7 +594,7 @@ function (callable $hook, string $module) use (&$field_definitions, $entity_type 
        // defining the field.

        foreach ($module_definitions as $field_name => $definition) {

          // @todo Remove this check once FieldDefinitionInterface exposes a

          //   proper provider setter. See https://www.drupal.org/node/2225961.

          //   proper provider setter. See https://www.drupal.org/node/2346329.

          if ($definition instanceof BaseFieldDefinition) {

            $definition->setProvider($module);

            $definition->setName($field_name);

core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ public function testGetFieldDefinitionsProvider() { 
    $module = 'entity_field_manager_test_module';



    // @todo Mock FieldDefinitionInterface once it exposes a proper provider

    //   setter. See https://www.drupal.org/node/2225961.

    //   setter. See https://www.drupal.org/node/2346329.

    $field_definition = $this->prophesize(BaseFieldDefinition::class);



    // We expect two calls as the field definition will be returned from both