diff --git a/core/lib/Drupal/Core/Extension/Dependency.php b/core/lib/Drupal/Core/Extension/Dependency.php index a8b59d7c80..c68b9e938c 100644 --- a/core/lib/Drupal/Core/Extension/Dependency.php +++ b/core/lib/Drupal/Core/Extension/Dependency.php @@ -7,14 +7,6 @@ /** * A value object representing dependency information. - * - * This class implements \ArrayAccess to provide a backwards compatibility layer - * for Drupal 8.x. This will be removed before Drupal 9.x. - * - * @see https://www.drupal.org/node/2756875 - * @deprecated \Drupal\Core\Extension\Dependency is deprecated in drupal:8.8.0. - * Use \Drupal\Core\Extension\Dependency\Composer instead. See - * https://www.drupal.org/node/3047893 */ class Dependency implements \ArrayAccess, DependencyInterface { @@ -60,7 +52,6 @@ public function __construct($name, $project, $constraint) { $this->name = $name; $this->project = $project; $this->constraintString = $constraint; - @trigger_error('\Drupal\Core\Extension\Dependency is deprecated in drupal:8.8.0. Use \Drupal\Core\Extension\Dependency\Composer instead. See https://www.drupal.org/node/3047893', E_USER_DEPRECATED); } /** diff --git a/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryDeprecationTest.php b/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryDeprecationTest.php deleted file mode 100644 index d138bbccc2..0000000000 --- a/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryDeprecationTest.php +++ /dev/null @@ -1,51 +0,0 @@ - [ - 'modules' => [ - 'system' => [ - 'system.info.yml' => Yaml::encode([ - 'type' => 'module', - 'name' => "System module", - 'core' => '8.x', - ]), - ], - ], - 'profiles' => [ - 'myprofile' => Yaml::encode([ - 'type' => 'profile', - 'name' => "My profile", - 'core' => '8.x', - ]), - ], - ], - ]); - $root = $vfs->url(); - - $this->assertFileExists($root . '/core/modules/system/system.info.yml'); - // Create an ExtensionDiscovery with $root. - $extension_discovery = new ExtensionDiscovery($root, FALSE, NULL, 'sites/default'); - $extension_discovery->setProfileDirectories(['myprofile' => 'profiles/myprofile']); - $extension_discovery->scan('module', FALSE); - } - -}