diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 1571f97..221c8ee 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -3,6 +3,9 @@ encouraged to submit issues and changes (patches) to improve Drupal, and to contribute in other ways -- see https://www.drupal.org/contribute to find out how. +This file lists the active maintainers. For a list of past maintainers, see: +https://www.drupal.org/core/maintainers/past + Core committers --------------- @@ -53,12 +56,11 @@ Actions - ? Aggregator -- Paris Liakos 'ParisLiakos' https://www.drupal.org/u/parisliakos +- ? Ajax - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia -- Earl Miles 'merlinofchaos' https://www.drupal.org/u/merlinofchaos -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett Asset Library API - ? @@ -73,26 +75,24 @@ Ban - ? Bartik -- Jen Simmons 'jensimmons' https://www.drupal.org/u/jensimmons -- Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emma.maria +- Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emmamaria Base system -- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud -- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman +- ? Basic Auth - Klaus Purer 'klausi' https://www.drupal.org/u/klausi - Juampy Novillo Requena 'juampy' https://www.drupal.org/u/juampy Batch API -- Yves Chedemois 'yched' https://www.drupal.org/u/yched +- ? BigPipe - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx Block -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy Block Content @@ -109,9 +109,7 @@ Breakpoint - Marc Drummond 'mdrummond' https://www.drupal.org/u/mdrummond Cache -- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch -- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum CKEditor - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers @@ -130,17 +128,15 @@ Comment - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost Configuration API -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott - Matthew Tift 'mtift' https://www.drupal.org/u/mtift Configuration Entity API - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett Configuration UI -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett Configuration Translation - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy @@ -159,10 +155,10 @@ Content Translation - Francesco Placella 'plach' https://www.drupal.org/u/plach Contextual -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun +- ? Cron -- Derek Wright 'dww' https://www.drupal.org/u/dww +- ? CSS - John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin @@ -175,14 +171,13 @@ Database API - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss PostgreSQL DB driver - - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - - Josh Waihi 'fiasco' https://www.drupal.org/u/fiasco + - ? Sqlite DB driver - - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud + - ? Database Logging -- Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey +- ? Database Update API - ? @@ -203,7 +198,6 @@ Editor - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers Entity API -- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch - Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir - Francesco Placella 'plach' https://www.drupal.org/u/plach @@ -213,7 +207,6 @@ Extension API - ? Field API -- Yves Chedemois 'yched' https://www.drupal.org/u/yched - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu Field UI @@ -221,20 +214,17 @@ Field UI - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu File -- Andrew Morton 'drewish' https://www.drupal.org/u/drewish -- Aaron Winborn 'aaron' https://www.drupal.org/u/aaron +- ? Filter -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun +- ? Forum - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan Form API - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia -- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett History - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost @@ -266,13 +256,13 @@ Link Field - Weber Macedo 'Mac_Weber' https://www.drupal.org/u/mac_weber Lock -- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud +- ? Mail - ? Markup -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun +- ? Migrate - Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima @@ -301,16 +291,15 @@ Menu UI - ? Node -- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman -- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss +- ? Node Access -- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman - Ken Rickard 'agentrickard' https://www.drupal.org/u/agentrickard +- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm Options -- Yves Chedemois 'yched' https://www.drupal.org/u/yched +- ? Outside In - Ted Bowman 'tedbow' https://www.drupal.org/u/tedbow @@ -325,11 +314,10 @@ Path Plugin - Kris Vanderwater 'EclipseGc' https://www.drupal.org/u/eclipseGc - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett Queue - James Gilliland 'neclimdul' https://www.drupal.org/u/neclimdul -- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum Quick Edit - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers @@ -339,8 +327,8 @@ RDF - Stéphane Corlosquet 'scor' https://www.drupal.org/u/scor Render API -- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia +- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman Request Processing - Larry Garfield 'Crell' https://www.drupal.org/u/crell @@ -357,7 +345,7 @@ Responsive Image Routing - Larry Garfield 'Crell' https://www.drupal.org/u/crell -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett Search - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin @@ -390,10 +378,9 @@ System (module) Taxonomy - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch -- Benjamin Doherty 'bangpound' https://www.drupal.org/u/bangpound Telephone -- Dave Reid 'dave-reid' https://www.drupal.org/u/dave-reid +- ? Testing framework - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott @@ -411,7 +398,7 @@ Theme API - Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii Token -- Dave Reid 'davereid' https://www.drupal.org/u/davereid +- ? Toolbar - Théodore Biadala 'nod_' https://www.drupal.org/u/nod_ @@ -420,36 +407,38 @@ Tour - Nick Schuch 'nick_schuch' https://www.drupal.org/u/nick_schuch Tracker -- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss +- ? Transliteration - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu -- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud -- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun Typed Data - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago Update UI -- Derek Wright 'dww' https://www.drupal.org/u/dww +- ? User - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman -- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss Views - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner -- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett - Damian Lee 'damiankloip' https://www.drupal.org/u/damiankloip - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm - Len Swaneveld 'Lendude' https://www.drupal.org/u/lendude +Views UI +- Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner +- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/timplunkett +- Damian Lee 'damiankloip' https://www.drupal.org/u/damiankloip +- Len Swaneveld 'Lendude' https://www.drupal.org/u/lendude + Topic maintainers ----------------- Accessibility - Mike Gifford 'mgifford' https://www.drupal.org/u/mgifford -- Jesse Renée Beach 'jessebeach' https://www.drupal.org/u/jessebeach - Andrew Macpherson 'andrewmacpherson' https://www.drupal.org/u/andrewmacpherson Documentation @@ -488,21 +477,9 @@ re-architect or otherwise improve large areas of Drupal core. See https://www.drupal.org/community-initiatives/drupal-core for more information on their responsibilities. The initiative coordinators for Drupal 8 are: -Configuration management -- Greg Dunlap 'heyrocker' https://www.drupal.org/u/heyrocker - -Design -- Jeff Burns 'Jeff Burnz' https://www.drupal.org/u/jeff-burnz - -Mobile -- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin - Multi-lingual - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy -Web services -- Larry Garfield 'Crell' https://www.drupal.org/u/crell - Workflow Initiative - Dick Olsson 'dixon_' https://www.drupal.org/u/dixon_ diff --git a/core/modules/migrate/src/Plugin/MigrateSourcePluginManager.php b/core/modules/migrate/src/Plugin/MigrateSourcePluginManager.php index 2d12750..1aaf4f1 100644 --- a/core/modules/migrate/src/Plugin/MigrateSourcePluginManager.php +++ b/core/modules/migrate/src/Plugin/MigrateSourcePluginManager.php @@ -21,6 +21,13 @@ class MigrateSourcePluginManager extends MigratePluginManager { /** + * The class loader. + * + * @var object + */ + protected $classLoader; + + /** * MigrateSourcePluginManager constructor. * * @param string $type diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js index e802a6c..d079664 100644 --- a/core/modules/outside_in/js/outside_in.js +++ b/core/modules/outside_in/js/outside_in.js @@ -85,17 +85,6 @@ } /** - * Close any active toolbar tray before entering edit mode. - */ - function closeToolbarTrays() { - $('#toolbar-bar') - .find('.toolbar-tab') - .not('.contextual-toolbar-tab') - .has('.toolbar-tray.is-active') - .find('.toolbar-item').click(); - } - - /** * Helper to switch edit mode state. * * @param {boolean} editMode @@ -108,7 +97,10 @@ // Turn on edit mode. if (editMode) { $editButton.text(Drupal.t('Editing')); - closeToolbarTrays(); + // Close the Manage tray if open when entering edit mode. + if ($('#toolbar-item-administration-tray').hasClass('is-active')) { + $('#toolbar-item-administration').trigger('click'); + } $editables = $('[data-drupal-outsidein="editable"]').once('outsidein'); if ($editables.length) { diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php index e0b4ce13..dd79fc2 100644 --- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php +++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php @@ -51,21 +51,18 @@ protected function setUp() { * Tests opening Offcanvas tray by click blocks and elements in the blocks. */ public function testBlocks() { - $web_assert = $this->assertSession(); $blocks = [ [ 'id' => 'block-powered', 'new_page_text' => 'Can you imagine anyone showing the label on this block?', 'element_selector' => '.content a', 'button_text' => 'Save Powered by Drupal', - 'toolbar_item' => '#toolbar-item-user', ], [ 'id' => 'block-branding', 'new_page_text' => 'The site that will live a very short life.', 'element_selector' => 'a[rel="home"]:nth-child(2)', 'button_text' => 'Save Site branding', - 'toolbar_item' => '#toolbar-item-administration', ], [ 'id' => 'block-search', @@ -77,22 +74,7 @@ public function testBlocks() { foreach ($blocks as $block) { $block_selector = '#' . $block['id']; $this->drupalGet('user'); - if (isset($block['toolbar_item'])) { - // Check that you can open a toolbar tray and it will be closed after - // entering edit mode. - if ($element = $page->find('css', "#toolbar-administration a.is-active")) { - // If a tray was open from page load close it. - $element->click(); - $this->waitForNoElement("#toolbar-administration a.is-active"); - } - $page->find('css', $block['toolbar_item'])->click(); - $this->waitForElement("{$block['toolbar_item']}.is-active"); - } $this->toggleEditingMode(); - if (isset($block['toolbar_item'])) { - $this->waitForNoElement("{$block['toolbar_item']}.is-active"); - } - $this->openBlockForm($block_selector); switch ($block['id']) { @@ -112,6 +94,7 @@ public function testBlocks() { $page->pressButton($block['button_text']); // Make sure the changes are present. $this->getSession()->wait(500); + $web_assert = $this->assertSession(); $web_assert->pageTextContains($block['new_page_text']); } @@ -172,5 +155,4 @@ protected function openBlockForm($block_selector) { $this->waitForOffCanvasToOpen(); $this->assertOffCanvasBlockFormIsValid(); } - } diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php index ab7cf59..da0be1b 100644 --- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php +++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php @@ -36,7 +36,8 @@ protected function waitForOffCanvasToOpen() { * Waits for Off-canvas tray to close. */ protected function waitForOffCanvasToClose() { - $this->waitForNoElement('#drupal-offcanvas'); + $condition = "(jQuery('#drupal-offcanvas').length == 0)"; + $this->assertJsCondition($condition); } /** @@ -63,17 +64,4 @@ protected function getTray() { return $tray; } - /** - * Waits for an element to be removed from the page. - * - * @param string $selector - * CSS selector. - * @param int $timeout - * (optional) Timeout in milliseconds, defaults to 1000. - */ - protected function waitForNoElement($selector, $timeout = 1000) { - $condition = "(jQuery('$selector').length == 0)"; - $this->assertJsCondition($condition, $timeout); - } - } diff --git a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php b/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php index eb50a0d..dbb15be 100644 --- a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php @@ -44,7 +44,7 @@ protected function setUpSettings() { } /** - * {@inheritdoc} + * @{inheritdoc} */ protected function setUpSite() { // This step should not appear as we had a failure prior to the settings diff --git a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php b/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php index c98a5de..32829c8 100644 --- a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php @@ -13,7 +13,7 @@ class InstallerDatabaseErrorMessagesTest extends InstallerTestBase { /** - * {@inheritdoc} + * @{inheritdoc} */ protected function setUpSettings() { // We are creating a table here to force an error in the installer because @@ -25,7 +25,7 @@ protected function setUpSettings() { } /** - * {@inheritdoc} + * @{inheritdoc} */ protected function setUpSite() { // This step should not appear as we had a failure on the settings screen. diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php index fd6e001..330d61f 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php @@ -42,7 +42,7 @@ protected function setUpLanguage() { } /** - * {@inheritdoc} + * @{inheritdoc} */ protected function setUpSettings() { // We are creating a table here to force an error in the installer because diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php index fb69ccb..b339f5b 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php @@ -19,7 +19,7 @@ class EntityTestNoLabel extends EntityTest { /** - * {@inheritdoc} + * @{inheritdoc} */ public function label() { return $this->getName(); diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index 4136172..103dd9d 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -1222,12 +1222,6 @@ public function renderText($alter) { if (!empty($alter['alter_text']) && $alter['text'] !== '') { $tokens = $this->getRenderTokens($alter); $value = $this->renderAltered($alter, $tokens); - // $alter['text'] is entered through the views admin UI and will be safe - // because the output of $this->renderAltered() is run through - // Xss::filterAdmin(). - // @see \Drupal\views\Plugin\views\PluginBase::viewsTokenReplace() - // @see \Drupal\Component\Utility\Xss::filterAdmin() - $value_is_safe = TRUE; } if (!empty($this->options['alter']['trim_whitespace'])) { diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php index be8a4f1..a57e478 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php @@ -169,67 +169,6 @@ public function testRewrite() { } /** - * Tests rewriting of the output with HTML. - */ - public function testRewriteHtmlWithTokens() { - /** @var \Drupal\Core\Render\RendererInterface $renderer */ - $renderer = \Drupal::service('renderer'); - - $view = Views::getView('test_view'); - $view->initHandlers(); - $this->executeView($view); - $row = $view->result[0]; - $id_field = $view->field['id']; - - $id_field->options['alter']['text'] = '

{{ id }}

'; - $id_field->options['alter']['alter_text'] = TRUE; - $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { - return $id_field->theme($row); - }); - $this->assertSubString($output, '

1

'); - - // Add a non-safe HTML tag and make sure this gets removed. - $id_field->options['alter']['text'] = '

{{ id }}

'; - $id_field->options['alter']['alter_text'] = TRUE; - $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { - return $id_field->theme($row); - }); - $this->assertSubString($output, '

1 alert("Script removed")

'); - } - - /** - * Tests rewriting of the output with HTML and aggregation. - */ - public function testRewriteHtmlWithTokensAndAggregation() { - /** @var \Drupal\Core\Render\RendererInterface $renderer */ - $renderer = \Drupal::service('renderer'); - - $view = Views::getView('test_view'); - $view->setDisplay(); - $view->displayHandlers->get('default')->options['fields']['id']['group_type'] = 'sum'; - $view->displayHandlers->get('default')->setOption('group_by', TRUE); - $view->initHandlers(); - $this->executeView($view); - $row = $view->result[0]; - $id_field = $view->field['id']; - - $id_field->options['alter']['text'] = '

{{ id }}

'; - $id_field->options['alter']['alter_text'] = TRUE; - $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { - return $id_field->theme($row); - }); - $this->assertSubString($output, '

1

'); - - // Add a non-safe HTML tag and make sure this gets removed. - $id_field->options['alter']['text'] = '

{{ id }}

'; - $id_field->options['alter']['alter_text'] = TRUE; - $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { - return $id_field->theme($row); - }); - $this->assertSubString($output, '

1 alert("Script removed")

'); - } - - /** * Tests the arguments tokens on field level. */ public function testArgumentTokens() {