diff --git a/core/modules/entity_reference/entity_reference.install b/core/modules/entity_reference/entity_reference.install new file mode 100644 index 0000000000..db8eba8592 --- /dev/null +++ b/core/modules/entity_reference/entity_reference.install @@ -0,0 +1,26 @@ + t('Entity Reference: Deprecated'), + 'description' => t('Entity Reference is deprecated, all functionality has been moved to Core.'), + 'value' => \Drupal::VERSION, + 'severity' => REQUIREMENT_ERROR, + ]; + } + + return $requirements; + +} diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module index 7a44f65539..d33bfcc13a 100644 --- a/core/modules/entity_reference/entity_reference.module +++ b/core/modules/entity_reference/entity_reference.module @@ -5,5 +5,3 @@ * Deprecated. All its functionality has been moved to Core. This empty module * will be removed in Drupal 9.0.x. */ - -@trigger_error('The entity reference module is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/2598002', E_USER_DEPRECATED); diff --git a/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php b/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php index 8798df4376..503b1c50b7 100644 --- a/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php +++ b/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php @@ -30,10 +30,6 @@ protected function setDatabaseDumpFiles() { /** * Tests that the content and configuration were properly updated. - * - * @group legacy - * - * @expectedDeprecation The entity reference module is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/2598002 */ public function testUpdatedSite() { $this->runUpdates(); diff --git a/core/tests/Drupal/Tests/DeprecatedModulesTestTrait.php b/core/tests/Drupal/Tests/DeprecatedModulesTestTrait.php index 478a9dcebe..a2e7bdf9b4 100644 --- a/core/tests/Drupal/Tests/DeprecatedModulesTestTrait.php +++ b/core/tests/Drupal/Tests/DeprecatedModulesTestTrait.php @@ -12,7 +12,7 @@ trait DeprecatedModulesTestTrait { * * @var array */ - protected $deprecatedModules = ['block_place', 'entity_reference']; + protected $deprecatedModules = ['block_place']; /** * Flag to exclude deprecated modules from the tests.