core/modules/ckeditor/src/CKEditorPluginBase.php | 2 +- core/modules/ckeditor/src/Plugin/Editor/CKEditor.php | 2 +- .../Drupal/KernelTests/Core/Extension/ExtensionPathResolverTest.php | 6 +++--- core/tests/Drupal/Tests/ExtensionListTestTrait.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/modules/ckeditor/src/CKEditorPluginBase.php b/core/modules/ckeditor/src/CKEditorPluginBase.php index f69b737e8c..e78448a78b 100644 --- a/core/modules/ckeditor/src/CKEditorPluginBase.php +++ b/core/modules/ckeditor/src/CKEditorPluginBase.php @@ -51,7 +51,7 @@ public function getModuleList() { } /** - * Gets the drupal-root relative installation directory of a module. + * Gets the Drupal-root relative installation directory of a module. * * @param string $module_name * The machine name of the module. diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php index 69662f1fb7..e2caaf015a 100644 --- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php +++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php @@ -92,7 +92,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition $this->languageManager = $language_manager; $this->renderer = $renderer; if (!$module_list) { - @trigger_error('Calling CKEditor::__construct() without the $module_list argument is deprecated in drupal:8.0.0 and is required in drupal:9.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED); + @trigger_error('Calling CKEditor::__construct() without the $module_list argument is deprecated in drupal:8.8.0 and is required in drupal:9.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED); $module_list = \Drupal::service('extension.list.module'); } $this->moduleList = $module_list; diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ExtensionPathResolverTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ExtensionPathResolverTest.php index 6bcf30d8d4..897d3b1db8 100644 --- a/core/tests/Drupal/KernelTests/Core/Extension/ExtensionPathResolverTest.php +++ b/core/tests/Drupal/KernelTests/Core/Extension/ExtensionPathResolverTest.php @@ -18,7 +18,7 @@ class ExtensionPathResolverTest extends KernelTestBase { /** * @covers ::getPathname */ - public function testGetPath() { + public function testGetPathname() { $path_resolver = $this->container->get('extension.path.resolver'); assert($path_resolver instanceof ExtensionPathResolver); $this->assertEquals('core/modules/system/system.info.yml', $path_resolver->getPathname('module', 'system')); @@ -35,7 +35,7 @@ public function testGetPath() { /** * @covers ::getPath */ - public function testGetDir() { + public function testGetPath() { $path_resolver = $this->container->get('extension.path.resolver'); assert($path_resolver instanceof ExtensionPathResolver); $this->assertEquals('core/modules/system', $path_resolver->getPath('module', 'system')); @@ -47,7 +47,7 @@ public function testGetDir() { // Assert unknown extension type. $this->expectException(UnknownExtensionTypeException::class); $this->expectExceptionMessage("foo is not a valid extension list type"); - $path_resolver->getPathname('foo', 'bar'); + $path_resolver->getPath('foo', 'bar'); } /** diff --git a/core/tests/Drupal/Tests/ExtensionListTestTrait.php b/core/tests/Drupal/Tests/ExtensionListTestTrait.php index 3f80c9a24d..7abb6c2955 100644 --- a/core/tests/Drupal/Tests/ExtensionListTestTrait.php +++ b/core/tests/Drupal/Tests/ExtensionListTestTrait.php @@ -14,7 +14,7 @@ trait ExtensionListTestTrait { * The module name. * * @return string - * The drupal-root relative path to the module directory. + * The Drupal-root relative path to the module directory. * * @throws \Drupal\Core\Extension\Exception\UnknownExtensionException * If the module does not exist. @@ -30,7 +30,7 @@ protected function getModulePath($module_name) { * The theme name. * * @return string - * The drupal-root relative path to the theme directory. + * The Drupal-root relative path to the theme directory. * * @throws \Drupal\Core\Extension\Exception\UnknownExtensionException * If the theme does not exist.