foobar
'")); $this->assertText(Html::escape("foo: 'foobar
'")); @@ -310,7 +309,7 @@ function testImportDiff() { $result = $this->xpath('//table[contains(@class, :class)]', array(':class' => 'diff')); $this->assertEqual(count($result), 1, "Diff UI is displaying colors."); - // Reset data back to original, and remove a key + // Reset data back to original, and remove a key. $sync_data = $original_data; unset($sync_data[$remove_key]); $sync->write($config_name, $sync_data); @@ -323,7 +322,7 @@ function testImportDiff() { // Removed key is escaped. $this->assertText(Html::escape("404: 'herp'")); - // Reset data back to original and add a key + // Reset data back to original and add a key. $sync_data = $original_data; $sync_data[$add_key] = $add_data; $sync->write($config_name, $sync_data); diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php index c260e63..54adffa 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php @@ -489,8 +489,7 @@ public function testTranslateOperationInListUi() { $this->doDateFormatListTest(); $this->doFieldListTest(); - // Views is tested in Drupal\config_translation\Tests\ConfigTranslationViewListUiTest - + // Views is tested in Drupal\config_translation\Tests\ConfigTranslationViewListUiTest. // Test the maintenance settings page. $this->doSettingsPageTest('admin/config/development/maintenance'); // Test the site information settings page. diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php index 908b925..7604cc5 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -646,7 +646,7 @@ public function testPluralConfigStringsSourceElements() { ); foreach ($languages as $langcode => $data) { - // Import a .po file to add a new language with a given number of plural forms + // Import a .po file to add a new language with a given number of plural forms. $name = tempnam('temporary://', $langcode . '_') . '.po'; file_put_contents($name, $this->getPoFile($data['plurals'])); $this->drupalPostForm('admin/config/regional/translate/import', array( @@ -839,7 +839,7 @@ public function testLocaleDBStorage() { $translation = $this->getTranslation('user.settings', 'anonymous', 'fr'); $this->assertEqual('Anonyme', $translation->getString()); - // revert custom translations to base translation. + // Revert custom translations to base translation. $edit = array( 'translation[config_names][user.settings][anonymous]' => 'Anonymous', ); @@ -856,7 +856,7 @@ public function testLocaleDBStorage() { public function testSingleLanguageUI() { $this->drupalLogin($this->adminUser); - // Delete French language + // Delete French language. $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete')); $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'French', '%langcode' => 'fr'))); @@ -867,7 +867,7 @@ public function testSingleLanguageUI() { $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration')); $this->assertRaw(t('Configuration saved.')); - // Delete English language + // Delete English language. $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete')); $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'English', '%langcode' => 'en'))); diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php index 8504a6a..db6707d 100644 --- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php +++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php @@ -235,7 +235,7 @@ public function getSendMailMessages() { $results[] = $result + $default_result; $data[] = array($message, $sender, $results); - //For authenticated user. + // For authenticated user. $results = array(); $message = $this->getAuthenticatedMockMessage(); $sender = $this->getMockSender(FALSE, 'user@drupal.org'); diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php index df23426..2b1096e 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php +++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php @@ -22,7 +22,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen // identifying this item in error messages. We do not want to display this // title because the actual title display is handled at a higher level by // the Field module. - $element['#theme_wrappers'][] = 'datetime_wrapper'; $element['#attributes']['class'][] = 'container-inline'; diff --git a/core/modules/datetime/src/Plugin/views/filter/Date.php b/core/modules/datetime/src/Plugin/views/filter/Date.php index e53cb1c..5c48ce2 100644 --- a/core/modules/datetime/src/Plugin/views/filter/Date.php +++ b/core/modules/datetime/src/Plugin/views/filter/Date.php @@ -95,8 +95,6 @@ protected function opBetween($field) { $b = intval(strtotime($this->value['max'], $origin)); // Formatting will vary on date storage. - - // Convert to ISO format and format for query. UTC timezone is used since // dates are stored in UTC. $a = $this->query->getDateFormat("'" . $this->dateFormatter->format($a, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE) . "'", $this->dateFormat, TRUE); diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php index 1fc1d60..6ecb84b 100644 --- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php +++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php @@ -401,11 +401,11 @@ function testDatelistWidget() { // Display creation form. $this->drupalGet('entity_test/add'); - // Assert that Hour and Minute Elements do not appear on Date Only + // Assert that Hour and Minute Elements do not appear on Date Only. $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element not found on Date Only.'); $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-minute\"]", NULL, 'Minute element not found on Date Only.'); - // Go to the form display page to assert that increment option does not appear on Date Only + // Go to the form display page to assert that increment option does not appear on Date Only. $fieldEditUrl = 'entity_test/structure/entity_test/form-display'; $this->drupalGet($fieldEditUrl); @@ -431,7 +431,7 @@ function testDatelistWidget() { ->save(); \Drupal::entityManager()->clearCachedFieldDefinitions(); - // Go to the form display page to assert that increment option does appear on Date Time + // Go to the form display page to assert that increment option does appear on Date Time. $fieldEditUrl = 'entity_test/structure/entity_test/form-display'; $this->drupalGet($fieldEditUrl); diff --git a/core/modules/dblog/src/Tests/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php index e8cf1cd..0d07290 100644 --- a/core/modules/dblog/src/Tests/DbLogTest.php +++ b/core/modules/dblog/src/Tests/DbLogTest.php @@ -151,7 +151,7 @@ private function generateLogEntries($count, $options = array()) { // Make it just a little bit harder to pass the link part of the test. $link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle'); - // Prepare the fields to be logged + // Prepare the fields to be logged. $log = $options + array( 'channel' => 'custom', 'message' => 'Dblog test log message', diff --git a/core/modules/editor/js/editor.admin.js b/core/modules/editor/js/editor.admin.js index 1fdb353..119a5b7 100644 --- a/core/modules/editor/js/editor.admin.js +++ b/core/modules/editor/js/editor.admin.js @@ -392,15 +392,15 @@ } // Check if a property value of a tag in the universe is forbidden. - // For all filter rules… + // For all filter rules…. for (var n = 0; n < filterStatus.rules.length; n++) { filterRule = filterStatus.rules[n]; - // … if there are tags with restricted property values … + // … if there are tags with restricted property values …. if (filterRule.restrictedTags.tags.length && !emptyProperties(filterRule.restrictedTags.forbidden)) { - // … for all those tags … + // … for all those tags …. for (var j = 0; j < filterRule.restrictedTags.tags.length; j++) { var tag = filterRule.restrictedTags.tags[j]; - // … then iterate over all properties … + // … then iterate over all properties …. for (var k = 0; k < properties.length; k++) { var property = properties[k]; // … and return true if just one of the forbidden property @@ -447,15 +447,15 @@ } // Check if a property value of a tag in the universe is allowed. - // For all filter rules… + // For all filter rules…. for (var i = 0; !_.isEmpty(universe) && i < filterStatus.rules.length; i++) { filterRule = filterStatus.rules[i]; - // … if there are tags with restricted property values … + // … if there are tags with restricted property values …. if (filterRule.restrictedTags.tags.length && !emptyProperties(filterRule.restrictedTags.allowed)) { - // … for all those tags … + // … for all those tags …. for (var j = 0; !_.isEmpty(universe) && j < filterRule.restrictedTags.tags.length; j++) { tag = filterRule.restrictedTags.tags[j]; - // … then iterate over all properties … + // … then iterate over all properties …. for (var k = 0; k < properties.length; k++) { var property = properties[k]; // … and try to delete this tag from the universe if just one diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php index 0d6840b..eb558ac 100644 --- a/core/modules/editor/src/Tests/EditorSecurityTest.php +++ b/core/modules/editor/src/Tests/EditorSecurityTest.php @@ -171,7 +171,7 @@ protected function setUp() { // - "trusted": restricted_plus_dangerous_tag_with_editor // - "privileged": restricted_without_editor, restricted_with_editor, // restricted_plus_dangerous_tag_with_editor, - // unrestricted_without_editor and unrestricted_with_editor + // unrestricted_without_editor and unrestricted_with_editor. $this->untrustedUser = $this->drupalCreateUser(array( 'create article content', 'edit any article content', @@ -383,7 +383,7 @@ function testSwitchingSecurity() { // Log in as the privileged user, and for every sample, do the following: // - switch to every other text format/editor - // - assert the XSS-filtered values that we get from the server + // - assert the XSS-filtered values that we get from the server. $this->drupalLogin($this->privilegedUser); foreach ($expected as $case) { $this->drupalGet('node/' . $case['node_id'] . '/edit'); diff --git a/core/modules/editor/tests/src/Kernel/EditorManagerTest.php b/core/modules/editor/tests/src/Kernel/EditorManagerTest.php index b6077a5..449bac5 100644 --- a/core/modules/editor/tests/src/Kernel/EditorManagerTest.php +++ b/core/modules/editor/tests/src/Kernel/EditorManagerTest.php @@ -31,7 +31,6 @@ protected function setUp() { parent::setUp(); // Install the Filter module. - // Add text formats. $filtered_html_format = FilterFormat::create(array( 'format' => 'filtered_html', diff --git a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php index 5e47c36..e8a551a 100644 --- a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php +++ b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php @@ -67,7 +67,6 @@ protected function setUp() { parent::setUp(); // Install the Filter module. - // Create a field. $this->fieldName = 'field_textarea'; $this->createFieldWithStorage( @@ -152,7 +151,7 @@ public function testEditorSelection() { $entity->save(); $this->assertEqual('editor', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality 1, and the full_html text format, the 'editor' editor is selected."); - // Editor selection with text processing, cardinality >1 + // Editor selection with text processing, cardinality >1. $this->fields->field_textarea_field_storage->setCardinality(2); $this->fields->field_textarea_field_storage->save(); $this->assertEqual('form', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected."); diff --git a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php index d19758e..74ee840 100644 --- a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php +++ b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php @@ -56,7 +56,6 @@ public function providerTestFilterXss() { $data[] = array('Hello, world!
Hello, world!
ignored ignoredprocessed" + // "processed
ignored ignoredprocessed". $chunks = preg_split('@(|]*>)@i', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // Note: PHP ensures the array consists of alternating delimiters and literals // and begins and ends with a literal (inserting NULL as required). @@ -729,20 +729,20 @@ function _filter_autop($text) { } } elseif (!$ignore) { - $chunk = preg_replace('|\n*$|', '', $chunk) . "\n\n"; // just to make things a little easier, pad the end + $chunk = preg_replace('|\n*$|', '', $chunk) . "\n\n"; // Just to make things a little easier, pad the end. $chunk = preg_replace('|
' . preg_replace('/\n\s*\n\n?(.)/', "
\n$1", $chunk) . "
\n"; // make paragraphs, including one at the end - $chunk = preg_replace("|( ' . preg_replace('/\n\s*\n\n?(.)/', " $1", $chunk) . " ( ", $chunk);
$chunk = str_replace(' \s* \s* \s*(]*>)!', "$1", $chunk);
$chunk = preg_replace('!(]*>)\s* $body
\n", $chunk); // make line breaks
+ $chunk = preg_replace('|(?)\s*\n|', "
\n", $chunk); // Make line breaks.
$chunk = preg_replace('!(]*>)\s*
!', "$1", $chunk);
$chunk = preg_replace('!
(\s*)!', '$1', $chunk);
$chunk = preg_replace('/&([^#])(?![A-Za-z0-9]{1,8};)/', '&$1', $chunk);
diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php
index c1924ed..a994846 100644
--- a/core/modules/filter/src/FilterFormatFormBase.php
+++ b/core/modules/filter/src/FilterFormatFormBase.php
@@ -111,7 +111,7 @@ public function form(array $form, FormStateInterface $form_state) {
// Filter order (tabledrag).
$form['filters']['order'] = array(
'#type' => 'table',
- // For filter.admin.js
+ // For filter.admin.js.
'#attributes' => array('id' => 'filter-order'),
'#title' => $this->t('Filter processing order'),
'#tabledrag' => array(
diff --git a/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php b/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
index 4b3684b..44dc16d 100644
--- a/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
@@ -19,7 +19,6 @@ protected function setUp() {
// Drupal\filter\FilterPermissions::permissions() builds a URL to output
// a link in the description.
-
$this->installEntitySchema('user');
// Install filter_test module, which ships with custom default format.
diff --git a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
index c4744bb..e45ea76 100644
--- a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
@@ -555,7 +555,6 @@ function testUrlFilter() {
// @todo Possible categories:
// - absolute, mail, partial
// - characters/encoding, surrounding markup, security
-
// Create a email that is too long.
$long_email = str_repeat('a', 254) . '@example.com';
$too_long_email = str_repeat('b', 255) . '@example.com';
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 04e5ff4..5aae4e7 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -118,9 +118,9 @@ protected function setUp() {
* Tests forum functionality through the admin and user interfaces.
*/
function testForum() {
- //Check that the basic forum install creates a default forum topic
+ // Check that the basic forum install creates a default forum topic.
$this->drupalGet('/forum');
- // Look for the "General discussion" default forum
+ // Look for the "General discussion" default forum.
$this->assertRaw(t('General discussion'), "Found the default forum at the /forum listing");
// Check the presence of expected cache tags.
diff --git a/core/modules/history/history.views.inc b/core/modules/history/history.views.inc
index 4b98136..d4a8387 100644
--- a/core/modules/history/history.views.inc
+++ b/core/modules/history/history.views.inc
@@ -9,8 +9,7 @@
* Implements hook_views_data().
*/
function history_views_data() {
- // History table
-
+ // History table.
// We're actually defining a specific instance of the table, so let's
// alias it so that we can later add the real table for other purposes if we
// need it.
diff --git a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
index 92e1acd..392a105 100644
--- a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
@@ -67,7 +67,6 @@ public function query() {
// Hey, Drupal kills old history, so nodes that haven't been updated
// since HISTORY_READ_LIMIT are bzzzzzzzt outta here!
-
$limit = REQUEST_TIME - HISTORY_READ_LIMIT;
$this->ensureMyTable();
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 7f8314a..623f6b6 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -173,7 +173,7 @@ function image_file_download($uri) {
if (strpos($path, 'styles/') === 0) {
$args = explode('/', $path);
- // Discard "styles", style name, and scheme from the path
+ // Discard "styles", style name, and scheme from the path.
$args = array_slice($args, 3);
// Then the remaining parts are the path to the image.
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 4b7ff43..6cc8838 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -97,7 +97,6 @@ function testStyle() {
);
// Add style form.
-
$edit = array(
'name' => $style_name,
'label' => $style_label,
@@ -112,7 +111,6 @@ function testStyle() {
$this->assertLinkByHref($style_path . '/delete');
// Add effect form.
-
// Add each sample effect to the style.
foreach ($effect_edits as $effect => $edit) {
$edit_data = array();
@@ -161,7 +159,6 @@ function testStyle() {
}
// Image style overview form (ordering and renaming).
-
// Confirm the order of effects is maintained according to the order we
// added the fields.
$effect_edits_order = array_keys($effect_edits);
@@ -224,7 +221,6 @@ function testStyle() {
$this->assertTrue($order_correct, 'The order of the effects is correctly set by default.');
// Image effect deletion form.
-
// Create an image to make sure it gets flushed after deleting an effect.
$image_path = $this->createSampleImage($style);
$this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
@@ -261,7 +257,6 @@ function testStyle() {
$this->assertEqual(count($style->getEffects()), 6, 'Rotate effect with transparent background was added.');
// Style deletion form.
-
// Delete the style.
$this->drupalPostForm($style_path . '/delete', array(), t('Delete'));
@@ -272,7 +267,6 @@ function testStyle() {
$this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label())));
// Test empty text when there are no image styles.
-
// Delete all image styles.
foreach (ImageStyle::loadMultiple() as $image_style) {
$image_style->delete();
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 666a791..cf3a65b 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -68,7 +68,7 @@ function _testImageFieldFormatters($scheme) {
$this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit");
$this->assertNoLinkByHref(\Drupal::url('entity.image_style.collection'), 'Link to image styles configuration is absent when permissions are insufficient');
- // Restore 'administer image styles' permission to testing admin user
+ // Restore 'administer image styles' permission to testing admin user.
user_role_change_permissions(reset($admin_user_roles), array('administer image styles' => TRUE));
// Create a new node with an image attached.
@@ -239,7 +239,6 @@ function testImageFieldSettings() {
// We have to create the article first and then edit it because the alt
// and title fields do not display until the image has been attached.
-
// Create alt text for the image.
$alt = $this->randomMachineName();
@@ -372,7 +371,6 @@ function testImageFieldDefaultImage() {
// Create a node with an image attached and ensure that the default image
// is not displayed.
-
// Create alt text for the image.
$alt = $this->randomMachineName();
diff --git a/core/modules/image/src/Tests/ImageFieldWidgetTest.php b/core/modules/image/src/Tests/ImageFieldWidgetTest.php
index ea2332d..49b04af 100644
--- a/core/modules/image/src/Tests/ImageFieldWidgetTest.php
+++ b/core/modules/image/src/Tests/ImageFieldWidgetTest.php
@@ -13,7 +13,7 @@ class ImageFieldWidgetTest extends ImageFieldTestBase {
* Tests file widget element.
*/
public function testWidgetElement() {
- // Check for image widget in add/node/article page
+ // Check for image widget in add/node/article page.
$field_name = strtolower($this->randomMachineName());
$min_resolution = 50;
$max_resolution = 100;
diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php
index 3257567..8e4aad7 100644
--- a/core/modules/language/src/LanguageNegotiator.php
+++ b/core/modules/language/src/LanguageNegotiator.php
@@ -326,13 +326,11 @@ function updateConfiguration(array $types) {
// settings are always considered non-configurable. In turn if default
// settings are missing, the language type is always considered
// configurable.
-
// If the language type is locked we can just store its default language
// negotiation settings if it has some, since it is not configurable.
if ($has_default_settings) {
$method_weights = array();
// Default settings are in $info['fixed'].
-
foreach ($info['fixed'] as $weight => $method_id) {
if (isset($method_definitions[$method_id])) {
$method_weights[$method_id] = $weight;
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index 53d80c8..c9faa31d 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -104,7 +104,6 @@ public function processOutbound($path, &$options = [], Request $request = NULL,
// If appropriate, process outbound to add a query parameter to the url and
// remove the language option, so that url negotiator does not rewrite the
// url.
-
// First, check if processing conditions are met.
if (!($request && !empty($options['route']) && $this->hasLowerLanguageNegotiationWeight() && $this->meetsContentEntityRoutesCondition($options['route'], $request))) {
return $path;
diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php
index c83cc61..9702770 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php
@@ -103,7 +103,7 @@ function testLanguageConfiguration() {
$this->drupalPostForm(NULL, $edit, t('Save configuration'));
$this->assertText(t('The prefix may only be left blank for the selected detection fallback language.'));
- // Check that prefix cannot be changed to contain a slash.
+ // Check that prefix cannot be changed to contain a slash.
$edit = array(
'prefix[en]' => 'foo/bar',
);
diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php
index 25de99c..81096df 100644
--- a/core/modules/language/src/Tests/LanguageListTest.php
+++ b/core/modules/language/src/Tests/LanguageListTest.php
@@ -136,7 +136,6 @@ function testLanguageList() {
$this->drupalGet('admin/config/regional/language/delete/fr');
$this->assertResponse(404, 'Language no longer found.');
// Make sure the "language_count" state has not changed.
-
// Ensure we can delete the English language. Right now English is the only
// language so we must add a new language and make it the default before
// deleting English.
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php
index c076e6f..539ceb4 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -201,7 +201,7 @@ function testLanguageBlockWithDomain() {
/** @var \Drupal\Core\Routing\UrlGenerator $generator */
$generator = $this->container->get('url_generator');
- // Verify the English URL is correct
+ // Verify the English URL is correct.
list($english_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', array(
':id' => 'block-test-language-block',
':hreflang' => 'en',
@@ -209,7 +209,7 @@ function testLanguageBlockWithDomain() {
$english_url = $generator->generateFromRoute('entity.user.canonical', array('user' => 2), array('language' => $languages['en']));
$this->assertEqual($english_url, (string) $english_link['href']);
- // Verify the Italian URL is correct
+ // Verify the Italian URL is correct.
list($italian_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', array(
':id' => 'block-test-language-block',
':hreflang' => 'it',
diff --git a/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php b/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
index 92b2a04..809387d 100644
--- a/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
+++ b/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
@@ -64,7 +64,7 @@ public function testConditions() {
// Check for the proper summary.
$this->assertEqual($condition->summary(), 'The language is Italian.');
- // Negate the condition
+ // Negate the condition.
$condition->setConfig('negate', TRUE);
$this->assertTrue($condition->execute(), 'Language condition passes as expected.');
// Check for the proper summary.
@@ -87,7 +87,7 @@ public function testConditions() {
// Check for the proper summary.
$this->assertEqual($condition->summary(), 'The language is Italian.');
- // Negate the condition
+ // Negate the condition.
$condition->setConfig('negate', TRUE);
$this->assertFalse($condition->execute(), 'Language condition fails as expected.');
// Check for the proper summary.
diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index fd670fd..8e8da91 100644
--- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -106,7 +106,7 @@ protected static function getUserEnteredStringAsUri($string) {
$entity_id = EntityAutocomplete::extractEntityIdFromAutocompleteInput($string);
if ($entity_id !== NULL) {
// @todo Support entity types other than 'node'. Will be fixed in
- // https://www.drupal.org/node/2423093.
+ // https://www.drupal.org/node/2423093.
$uri = 'entity:node/' . $entity_id;
}
// Detect a schemeless string, map to 'internal:' URI.
@@ -182,7 +182,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
if ($this->supportsInternalLinks()) {
$element['uri']['#type'] = 'entity_autocomplete';
// @todo The user should be able to select an entity type. Will be fixed
- // in https://www.drupal.org/node/2423093.
+ // in https://www.drupal.org/node/2423093.
$element['uri']['#target_type'] = 'node';
// Disable autocompletion when the first character is '/', '#' or '?'.
$element['uri']['#attributes']['data-autocomplete-first-character-blacklist'] = '/#?';
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 639f519..3e52783 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -144,9 +144,9 @@ function testURLValidation() {
$validation_error_2 = 'Manually entered paths should start with /, ? or #.';
$validation_error_3 = "The path '@link_path' is inaccessible.";
$invalid_external_entries = array(
- // Invalid protocol
+ // Invalid protocol.
'invalid://not-a-valid-protocol' => $validation_error_1,
- // Missing host name
+ // Missing host name.
'http://' => $validation_error_1,
);
$invalid_internal_entries = array(
diff --git a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
index b80624f..3230fa0 100644
--- a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
+++ b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
@@ -80,13 +80,13 @@ public function testLinkViewsTokens() {
$this->drupalGet('test_link_tokens');
foreach ($uris as $uri => $title) {
- // Formatted link: {{ field_link }}
+ // Formatted link: {{ field_link }}
.
$this->assertRaw("Formated: $title");
- // Raw uri: {{ field_link__uri }}
+ // Raw uri: {{ field_link__uri }}
.
$this->assertRaw("Raw uri: $uri");
- // Raw title: {{ field_link__title }}
+ // Raw title: {{ field_link__title }}
.
$this->assertRaw("Raw title: $title");
// Raw options: {{ field_link__options }}
diff --git a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
index 69776fd..594d09c 100644
--- a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
@@ -44,7 +44,7 @@ public function testValidate($value, $valid) {
public function providerValidate() {
$data = [];
- // External URL
+ // External URL.
$data[] = [Url::fromUri('https://www.drupal.org'), TRUE];
// Existing routed URL.
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index 72e8cfe..804bccf 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -458,7 +458,7 @@ function locale_translate_file_attach_properties($file, array $options = array()
}
// Extract project, version and language code from the file name. Supported:
- // {project}-{version}.{langcode}.po, {prefix}.{langcode}.po or {langcode}.po
+ // {project}-{version}.{langcode}.po, {prefix}.{langcode}.po or {langcode}.po.
preg_match('!
( # project OR project and version OR empty (group 1)
([a-z_]+) # project name (group 2)
diff --git a/core/modules/locale/locale.compare.inc b/core/modules/locale/locale.compare.inc
index e24490c..a47c865 100644
--- a/core/modules/locale/locale.compare.inc
+++ b/core/modules/locale/locale.compare.inc
@@ -56,7 +56,7 @@ function locale_translation_build_projects() {
// to fall back to the latest stable release for that branch.
if (isset($data['info']['version']) && strpos($data['info']['version'], '-dev')) {
if (preg_match("/^(\d+\.x-\d+\.).*$/", $data['info']['version'], $matches)) {
- // Example matches: 8.x-1.x-dev, 8.x-1.0-alpha1+5-dev => 8.x-1.x
+ // Example matches: 8.x-1.x-dev, 8.x-1.0-alpha1+5-dev => 8.x-1.x.
$data['info']['version'] = $matches[1] . 'x';
}
elseif (preg_match("/^(\d+\.\d+\.).*$/", $data['info']['version'], $matches)) {
diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index 0755104..9f9183d 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -111,7 +111,7 @@ function locale_schema() {
'customized' => array(
'type' => 'int',
'not null' => TRUE,
- 'default' => 0, // LOCALE_NOT_CUSTOMIZED
+ 'default' => 0, // LOCALE_NOT_CUSTOMIZED.
'description' => 'Boolean indicating whether the translation is custom to this site.',
),
),
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index aecad6c..c08ce80 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -920,7 +920,6 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
// Follow-up issue: https://www.drupal.org/node/1842362.
// Split status storage per module/language and expire individually. This will
// improve performance for large sites.
-
// Load the translation status or build it if not already available.
module_load_include('translation.inc', 'locale');
$status = locale_translation_get_status();
@@ -1366,7 +1365,6 @@ function _locale_rebuild_js($langcode = NULL) {
$logger->warning('JavaScript translation file %file.js was lost.', array('%file' => $locale_javascripts[$language->getId()]));
// Proceed to the 'created' case as the JavaScript translation file has
// been created again.
-
case 'created':
$logger->notice('Created JavaScript translation file for the language %language.', array('%language' => $language->getName()));
return TRUE;
diff --git a/core/modules/locale/locale.translation.inc b/core/modules/locale/locale.translation.inc
index 0383aaf..29fb0e9 100644
--- a/core/modules/locale/locale.translation.inc
+++ b/core/modules/locale/locale.translation.inc
@@ -229,7 +229,6 @@ function locale_translation_source_build($project, $langcode, $filename = NULL)
// Follow-up issue: https://www.drupal.org/node/1842380.
// Convert $source object to a TranslatableProject class and use a typed class
// for $source-file.
-
// Create a source object with data of the project object.
$source = clone $project;
$source->project = $project->name;
diff --git a/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/core/modules/locale/src/Tests/LocalePluralFormatTest.php
index 0f6c9c1..b216688 100644
--- a/core/modules/locale/src/Tests/LocalePluralFormatTest.php
+++ b/core/modules/locale/src/Tests/LocalePluralFormatTest.php
@@ -201,7 +201,7 @@ public function testPluralEditDateFormatter() {
);
$this->drupalPostForm($path, $edit, t('Save translations'));
- // User interface input for translating seconds should not be duplicated
+ // User interface input for translating seconds should not be duplicated.
$this->assertUniqueText('@count seconds', 'Interface translation input for @count seconds only appears once.');
// Member for time should be translated. Change the created time to ensure
diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
index 1f790b6..32977d0 100644
--- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
@@ -229,7 +229,6 @@ public function testJavaScriptTranslation() {
$this->container->get('language_manager')->reset();
// Build the JavaScript translation file.
-
// Retrieve the source string of the first string available in the
// {locales_source} table and translate it.
$query = db_select('locales_source', 's');
@@ -307,7 +306,6 @@ public function testStringValidation() {
);
$this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
// Find the edit path.
-
$textarea = current($this->xpath('//textarea'));
$lid = (string) $textarea[0]['name'];
foreach ($bad_translations as $translation) {
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/src/Tests/LinksTest.php
index 5fd0ca1..1d8548c 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/src/Tests/LinksTest.php
@@ -53,9 +53,9 @@ function createLinkHierarchy($module = 'menu_test') {
// Then create a simple link hierarchy:
// - parent
// - child-1
- // - child-1-1
- // - child-1-2
- // - child-2
+ // - child-1-1
+ // - child-1-2
+ // - child-2.
$base_options = array(
'title' => 'Menu link test',
'provider' => $module,
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
index e6ec76e..895e1a3 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
@@ -48,7 +48,7 @@ public function testMenuLinkContentDeleteForm() {
$this->drupalGet($menu_link->urlInfo('delete-form'));
$this->assertRaw(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
$this->assertLink(t('Cancel'));
- // Make sure cancel link points to link edit
+ // Make sure cancel link points to link edit.
$this->assertLinkByHref($menu_link->url('edit-form'));
\Drupal::service('module_installer')->install(['menu_ui']);
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
index 58171e3..50a06a0 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
@@ -60,7 +60,7 @@ public function testMenuLinks() {
$this->assertIdentical('https://www.drupal.org', $menu_link->link->uri);
$this->assertIdentical(-50, $menu_link->getWeight());
- // assert that missing title attributes don't stop or break migration.
+ // Assert that missing title attributes don't stop or break migration.
$menu_link = MenuLinkContent::load(393);
$this->assertIdentical('Test 3', $menu_link->getTitle());
$this->assertIdentical('secondary-links', $menu_link->getMenuName());
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 463f8ca..aca417f 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -198,7 +198,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
$defaults = FALSE;
if ($node->id()) {
$id = FALSE;
- // Give priority to the default menu
+ // Give priority to the default menu.
$type_menus = $node_type->getThirdPartySetting('menu_ui', 'available_menus', array('main'));
if (in_array($menu_name, $type_menus)) {
$query = \Drupal::entityQuery('menu_link_content')
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 45bf16f..5576c2c 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -307,8 +307,7 @@ function doMenuTests() {
// <$menu_name>
// - item1
// -- item2
- // --- item3
-
+ // --- item3.
$this->assertMenuLink($item1->getPluginId(), array(
'children' => array($item2->getPluginId(), $item3->getPluginId()),
'parents' => array($item1->getPluginId()),
@@ -347,8 +346,7 @@ function doMenuTests() {
// --- item3
// - item4
// -- item5
- // -- item6
-
+ // -- item6.
$this->assertMenuLink($item4->getPluginId(), array(
'children' => array($item5->getPluginId(), $item6->getPluginId()),
'parents' => array($item4->getPluginId()),
@@ -387,8 +385,7 @@ function doMenuTests() {
// -- item5
// --- item2
// ---- item3
- // -- item6
-
+ // -- item6.
$this->assertMenuLink($item1->getPluginId(), array(
'children' => array(),
'parents' => array($item1->getPluginId()),
diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php
index 7275920..8a5b4eb 100644
--- a/core/modules/migrate/src/MigrateExecutable.php
+++ b/core/modules/migrate/src/MigrateExecutable.php
@@ -111,7 +111,7 @@ public function __construct(MigrationInterface $migration, MigrateMessageInterfa
$this->message = $message;
$this->migration->getIdMap()->setMessage($message);
$this->eventDispatcher = $event_dispatcher;
- // Record the memory limit in bytes
+ // Record the memory limit in bytes.
$limit = trim(ini_get('memory_limit'));
if ($limit == '-1') {
$this->memoryLimit = PHP_INT_MAX;
@@ -476,7 +476,7 @@ protected function memoryExceeded() {
$usage = $this->attemptMemoryReclaim();
$pct_memory = $usage / $this->memoryLimit;
// Use a lower threshold - we don't want to be in a situation where we keep
- // coming back here and trimming a tiny amount
+ // coming back here and trimming a tiny amount.
if ($pct_memory > (0.90 * $threshold)) {
$this->message->display(
$this->t('Memory usage is now @usage (@pct% of limit @limit), not enough reclaimed, starting new batch',
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 9b22e35..787a8af 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -616,7 +616,7 @@ public function setProcessOfProperty($property, $process_of_property) {
*/
public function mergeProcessOfProperty($property, array $process_of_property) {
// If we already have a process value then merge the incoming process array
- //otherwise simply set it.
+ // otherwise simply set it.
$current_process = $this->getProcess();
if (isset($current_process[$property])) {
$this->process = NestedArray::mergeDeepArray([$current_process, $this->getProcessNormalized([$property => $process_of_property])], TRUE);
diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
index d08e035..18360bb 100644
--- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
@@ -68,7 +68,7 @@ public function testImport() {
// Assert that save is called.
$entity->save()
->shouldBeCalledTimes(1);
- // Set an id for the entity
+ // Set an id for the entity.
$entity->id()
->willReturn(5);
$destination->setEntity($entity->reveal());
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 11689c3..f80e7f7 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -272,7 +272,6 @@ function hook_node_grants_alter(&$grants, \Drupal\Core\Session\AccountInterface
// content. Since some other node access modules might allow this
// permission, we expressly remove it by returning an empty $grants
// array for roles specified in our variable setting.
-
// Get our list of banned roles.
$restricted = \Drupal::config('example.settings')->get('restricted_roles');
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index ebfd07f..d39113d 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -650,7 +650,7 @@ function node_ranking() {
$ranking = array(
'relevance' => array(
'title' => t('Keyword relevance'),
- // Average relevance values hover around 0.15
+ // Average relevance values hover around 0.15.
'score' => 'i.relevance',
),
'sticky' => array(
@@ -1161,7 +1161,7 @@ function node_access_rebuild($batch_mode = FALSE) {
batch_set($batch);
}
else {
- // Try to allocate enough time to rebuild node grants
+ // Try to allocate enough time to rebuild node grants.
drupal_set_time_limit(240);
// Rebuild newest nodes first so that recent content becomes available
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index 81fa3f0..c9cb445 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -140,7 +140,6 @@ function node_tokens($type, $tokens, array $data, array $options, BubbleableMeta
// A summary was requested.
if ($name == 'summary') {
// Generate an optionally trimmed summary of the body field.
-
// Get the 'trim_length' size used for the 'teaser' mode, if
// present, or use the default trim_length size.
$display_options = entity_get_display('node', $node->getType(), 'teaser')->getComponent('body');
diff --git a/core/modules/node/node.views_execution.inc b/core/modules/node/node.views_execution.inc
index 701f439..842aa04 100644
--- a/core/modules/node/node.views_execution.inc
+++ b/core/modules/node/node.views_execution.inc
@@ -30,7 +30,7 @@ function node_views_analyze(ViewExecutable $view) {
if ($view->storage->get('base_table') == 'node') {
foreach ($view->displayHandlers as $display) {
if (!$display->isDefaulted('access') || !$display->isDefaulted('filters')) {
- // check for no access control
+ // Check for no access control.
$access = $display->getOption('access');
if (empty($access['type']) || $access['type'] == 'none') {
$anonymous_role = Role::load(RoleInterface::ANONYMOUS_ID);
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 0e0f1a9..36b1e8c 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -247,8 +247,7 @@ protected function actions(array $form, FormStateInterface $form_state) {
// 1 | 1 » publish & Save and publish & Save as unpublished
// 1 | 0 » unpublish & Save and publish & Save as unpublished
// 0 | 1 » publish & Save and keep published & Save and unpublish
- // 0 | 0 » unpublish & Save and keep unpublished & Save and publish
-
+ // 0 | 0 » unpublish & Save and keep unpublished & Save and publish.
// Add a "Publish" button.
$element['publish'] = $element['submit'];
// If the "Publish" button is clicked, we want to update the status to "published".
diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php
index 21e1e44..35dcde6 100644
--- a/core/modules/node/src/NodeViewsData.php
+++ b/core/modules/node/src/NodeViewsData.php
@@ -75,7 +75,6 @@ public function getViewsData() {
);
// Bogus fields for aliasing purposes.
-
// @todo Add similar support to any date field
// @see https://www.drupal.org/node/2337507
$data['node_field_data']['created_fulldate'] = array(
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 3bf7ced..a0b1ece 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -717,7 +717,6 @@ protected function parseAdvancedDefaults($f, $keys) {
}
// Split out the negative, phrase, and OR parts of keywords.
-
// For phrases, the form only supports one phrase.
$matches = array();
$keys = ' ' . $keys . ' ';
diff --git a/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
index c70fd27..bad2510 100644
--- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -111,7 +111,7 @@ public function fields() {
* {@inheritdoc}
*/
public function prepareRow(Row $row) {
- // format = 0 can happen when the body field is hidden. Set the format to 1
+ // Format = 0 can happen when the body field is hidden. Set the format to 1
// to avoid migration map issues (since the body field isn't used anyway).
if ($row->getSourceProperty('format') === '0') {
$row->setSourceProperty('format', $this->filterDefaultFormat);
diff --git a/core/modules/node/src/Plugin/views/field/Node.php b/core/modules/node/src/Plugin/views/field/Node.php
index d721414..5a34d10 100644
--- a/core/modules/node/src/Plugin/views/field/Node.php
+++ b/core/modules/node/src/Plugin/views/field/Node.php
@@ -26,7 +26,7 @@ class Node extends FieldPluginBase {
public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
parent::init($view, $display, $options);
- // Don't add the additional fields to groupby
+ // Don't add the additional fields to groupby.
if (!empty($this->options['link_to_node'])) {
$this->additional_fields['nid'] = array('table' => 'node_field_data', 'field' => 'nid');
}
diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php
index c2a5f0a..5e4b0f8 100644
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -123,7 +123,6 @@ public function render($row) {
// The node gets built and modules add to or modify $node->rss_elements
// and $node->rss_namespaces.
-
$build_mode = $display_mode;
$build = node_view($node, $build_mode);
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index 833b092..3eadf0d 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -47,7 +47,7 @@ class Node extends WizardPluginBase {
* corresponding values are human readable labels.
*/
public function getAvailableSorts() {
- // You can't execute functions in properties, so override the method
+ // You can't execute functions in properties, so override the method.
return array(
'node_field_data-title:DESC' => $this->t('Title')
);
@@ -199,7 +199,6 @@ protected function buildFilters(&$form, FormStateInterface $form_state) {
}
// Add the "tagged with" filter to the view.
-
// We construct this filter using taxonomy_index.tid (which limits the
// filtering to a specific vocabulary) rather than
// taxonomy_term_field_data.name (which matches terms in any vocabulary).
@@ -207,12 +206,10 @@ protected function buildFilters(&$form, FormStateInterface $form_state) {
// the autocomplete UI, and also to avoid confusion with other vocabularies
// on the site that may have terms with the same name but are not used for
// free tagging.
-
// The downside is that if there *is* more than one vocabulary on the site
// that is used for free tagging, the wizard will only be able to make the
// "tagged with" filter apply to one of them (see below for the method it
// uses to choose).
-
// Find all "tag-like" taxonomy fields associated with the view's
// entities. If a particular entity type (i.e., bundle) has been
// selected above, then we only search for taxonomy fields associated
diff --git a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
index e84fc0e..435cd6c 100644
--- a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
@@ -87,7 +87,7 @@ function testNodeAccessBasic() {
$num_simple_users = 2;
$simple_users = array();
- // Nodes keyed by uid and nid: $nodes[$uid][$nid] = $is_private;
+ // Nodes keyed by uid and nid: $nodes[$uid][$nid] = $is_private;.
$this->nodesByUser = array();
// Titles keyed by nid.
$titles = [];
diff --git a/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php b/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
index 5932108..5cedfaf 100644
--- a/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
+++ b/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
@@ -124,7 +124,7 @@ public function testCacheContext() {
3 => 'view.all',
]);
- // Uninstall the node_access_test module
+ // Uninstall the node_access_test module.
$this->container->get('module_installer')->uninstall(['node_access_test']);
drupal_static_reset('node_access_view_all_nodes');
$this->assertUserCacheContext([
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
index acf9217..fd3f305 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
@@ -93,7 +93,6 @@ protected function setUp() {
// implemented by one or both modules to enforce that private nodes or
// translations are always private, but we want to test the default,
// additive behavior of node access).
-
// Create six Hungarian nodes with Catalan translations:
// 1. One public with neither language marked as private.
// 2. One private with neither language marked as private.
@@ -251,7 +250,6 @@ function testNodeAccessLanguageAwareCombination() {
$this->assertNodeAccess($expected_node_access_no_access, $this->nodes['private_no_language_public'], $this->webUser);
// Query the node table with the node access tag in several languages.
-
// Query with no language specified. The fallback (hu or und) will be used.
$select = db_select('node', 'n')
->fields('n', array('nid'))
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
index ea5a883..9b24daf 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
@@ -85,7 +85,6 @@ protected function setUp() {
// The node_access_test_language module allows individual translations of a
// node to be marked private (not viewable by normal users).
-
// Create six nodes:
// 1. Four Hungarian nodes with Catalan translations
// - One with neither language marked as private.
@@ -192,7 +191,6 @@ function testNodeAccessLanguageAware() {
$this->assertNodeAccess($expected_node_access, $this->nodes['no_language_public'], $this->webUser);
// Query the node table with the node access tag in several languages.
-
// Query with no language specified. The fallback (hu) will be used.
$select = db_select('node', 'n')
->fields('n', array('nid'))
diff --git a/core/modules/node/src/Tests/NodeEditFormTest.php b/core/modules/node/src/Tests/NodeEditFormTest.php
index 659567d..844b24f 100644
--- a/core/modules/node/src/Tests/NodeEditFormTest.php
+++ b/core/modules/node/src/Tests/NodeEditFormTest.php
@@ -73,7 +73,7 @@ public function testNodeEdit() {
$this->assertUrl($node->url('edit-form', ['absolute' => TRUE]));
// Check that the title and body fields are displayed with the correct values.
- // As you see the expected link text has no HTML, but we are using
+ // As you see the expected link text has no HTML, but we are using.
$link_text = 'Edit(active tab)';
// @todo Ideally assertLink would support HTML, but it doesn't.
$this->assertRaw($link_text, 'Edit tab found and marked active.');
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 0d2d8de..ba9238c 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -119,7 +119,7 @@ function testNodeTypeEditing() {
$this->assertRaw('Foo', 'Title field was found.');
$this->assertRaw('Body', 'Body field was found.');
- // Change the name through the API
+ // Change the name through the API.
/** @var \Drupal\node\NodeTypeInterface $node_type */
$node_type = NodeType::load('page');
$node_type->set('name', 'NewBar');
@@ -235,7 +235,7 @@ public function testNodeTypeNoContentType() {
// Delete 'page' bundle.
$this->drupalPostForm('admin/structure/types/manage/page/delete', [], t('Delete'));
- // Navigate to content type administration screen
+ // Navigate to content type administration screen.
$this->drupalGet('admin/structure/types');
$this->assertRaw(t('No content types available. Add content type.', [
':link' => Url::fromRoute('node.type_add')->toString()
diff --git a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
index 9c12446..953a2e7 100644
--- a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
+++ b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
@@ -46,16 +46,16 @@ public function testViewsTokenReplacement() {
$this->drupalGet('test_node_tokens');
- // Body: {{ body }}
+ // Body: {{ body }}
.
$this->assertRaw("Body:
+ // Raw value: {{ body__value }}
.
$this->assertRaw("Raw value: $body");
- // Raw summary: {{ body__summary }}
+ // Raw summary: {{ body__summary }}
.
$this->assertRaw("Raw summary: $summary");
- // Raw format: {{ body__format }}
+ // Raw format: {{ body__format }}
.
$this->assertRaw("Raw format: plain_text");
}
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index aa7d4dd..15a82e6 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -123,7 +123,7 @@ function node_test_node_grants_alter(&$grants, AccountInterface $account, $op) {
*/
function node_test_node_presave(NodeInterface $node) {
if ($node->getTitle() == 'testing_node_presave') {
- // Sun, 19 Nov 1978 05:00:00 GMT
+ // Sun, 19 Nov 1978 05:00:00 GMT.
$node->setCreatedTime(280299600);
// Drupal 1.0 release.
$node->changed = 979534800;
diff --git a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
index f88e45e..51b921c 100644
--- a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
+++ b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
@@ -71,7 +71,7 @@ function testAccessToAdministrativeFields() {
// An unprivileged user.
$page_unrelated_user = $this->createUser(array(), array('access content'));
- // List of all users
+ // List of all users.
$test_users = array(
$content_admin_user,
$page_creator_user,
diff --git a/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
index 0c31810..689a42f 100644
--- a/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
@@ -111,7 +111,6 @@ protected function setUp() {
);
// Add another row with an article node and make sure it is not migrated.
-
foreach ($database_contents as $k => $row) {
foreach (array('nid', 'vid', 'title', 'uid', 'body', 'teaser', 'format', 'timestamp', 'log') as $field) {
$this->databaseContents['node_revisions'][$k][$field] = $row[$field];
diff --git a/core/modules/options/src/Tests/OptionsWidgetsTest.php b/core/modules/options/src/Tests/OptionsWidgetsTest.php
index 23f0f0d..527599d 100644
--- a/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/src/Tests/OptionsWidgetsTest.php
@@ -296,12 +296,11 @@ function testSelectListSingle() {
$this->assertFieldValues($entity_init, 'card_1', array());
// Test optgroups.
-
$this->card1->setSetting('allowed_values', []);
$this->card1->setSetting('allowed_values_function', 'options_test_allowed_values_callback');
$this->card1->save();
- // Display form: with no field data, nothing is selected
+ // Display form: with no field data, nothing is selected.
$this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
$this->assertNoOptionSelected('edit-card-1', 0);
$this->assertNoOptionSelected('edit-card-1', 1);
@@ -392,7 +391,6 @@ function testSelectListMultiple() {
$this->assertFieldValues($entity_init, 'card_2', array());
// Test the 'None' option.
-
// Check that the 'none' option has no effect if actual options are selected
// as well.
$edit = array('card_2[]' => array('_none' => '_none', 0 => 0));
@@ -412,9 +410,7 @@ function testSelectListMultiple() {
// We do not have to test that a required select list with one option is
// auto-selected because the browser does it for us.
-
// Test optgroups.
-
// Use a callback function defining optgroups.
$this->card2->setSetting('allowed_values', []);
$this->card2->setSetting('allowed_values_function', 'options_test_allowed_values_callback');
diff --git a/core/modules/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
index 14f9df5..f2500e5 100644
--- a/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -159,8 +159,8 @@ protected function lookup(Request $request, $type = self::MASTER_REQUEST, $catch
$if_none_match = $request->server->has('HTTP_IF_NONE_MATCH') ? stripslashes($request->server->get('HTTP_IF_NONE_MATCH')) : FALSE;
if ($if_modified_since && $if_none_match
- && $if_none_match == $response->getEtag() // etag must match
- && $if_modified_since == $last_modified->getTimestamp()) { // if-modified-since must match
+ && $if_none_match == $response->getEtag() // Etag must match
+ && $if_modified_since == $last_modified->getTimestamp()) { // if-modified-since must match.
$response->setStatusCode(304);
$response->setContent(NULL);
diff --git a/core/modules/page_cache/tests/modules/page_cache_form_test.module b/core/modules/page_cache/tests/modules/page_cache_form_test.module
index eb76d4d..eb25f96 100644
--- a/core/modules/page_cache/tests/modules/page_cache_form_test.module
+++ b/core/modules/page_cache/tests/modules/page_cache_form_test.module
@@ -34,7 +34,7 @@ function page_cache_form_test_form_page_cache_form_test_process($form, FormState
*/
function page_cache_form_test_module_implements_alter(&$implementations, $hook) {
if ($hook === 'form_alter' && \Drupal::state()->get('page_cache_bypass_form_immutability', FALSE)) {
- // Disable system_form_alter
+ // Disable system_form_alter.
unset($implementations['system']);
}
}
diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php
index e6b1738..1df85ad 100644
--- a/core/modules/path/src/Tests/PathAliasTest.php
+++ b/core/modules/path/src/Tests/PathAliasTest.php
@@ -125,7 +125,7 @@ function testAdminAlias() {
// Set alias to second test node.
$edit['source'] = '/node/' . $node2->id();
- // leave $edit['alias'] the same
+ // Leave $edit['alias'] the same.
$this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
// Confirm no duplicate was created.
diff --git a/core/modules/quickedit/js/models/EntityModel.js b/core/modules/quickedit/js/models/EntityModel.js
index f444fbb..7e614d1 100644
--- a/core/modules/quickedit/js/models/EntityModel.js
+++ b/core/modules/quickedit/js/models/EntityModel.js
@@ -73,7 +73,6 @@
// The attributes below are stateful. The ones above will never change
// during the life of a EntityModel instance.
-
/**
* Indicates whether this entity is currently being edited in-place.
*
diff --git a/core/modules/quickedit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
index 8aeff10..1f5fd6d 100644
--- a/core/modules/quickedit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -72,7 +72,6 @@
// The attributes below are stateful. The ones above will never change
// during the life of a FieldModel instance.
-
/**
* In-place editing state of this field. Defaults to the initial state.
* Possible values: {@link Drupal.quickedit.FieldModel.states}.
diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
index b9ebf12..c0e70c8 100644
--- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
@@ -80,7 +80,7 @@ protected function setUp() {
));
// Create 2 users, the only difference being the ability to use in-place
- // editing
+ // editing.
$basic_permissions = array('access content', 'create article content', 'edit any article content', 'use text format filtered_html', 'access contextual links');
$this->authorUser = $this->drupalCreateUser($basic_permissions);
$this->editorUser = $this->drupalCreateUser(array_merge($basic_permissions, array('access in-place editing')));
@@ -180,7 +180,7 @@ public function testUserWithPermission() {
// Retrieving the attachments should result in a 200 response, containing:
// 1. a settings command with useless metadata: AjaxController is dumb
- // 2. an insert command that loads the required in-place editors
+ // 2. an insert command that loads the required in-place editors.
$post = array('editors[0]' => 'form') + $this->getAjaxPageStatePostData();
$response = $this->drupalPost('quickedit/attachments', 'application/vnd.drupal-ajax', $post);
$ajax_commands = Json::decode($response);
@@ -314,7 +314,7 @@ public function testTitleBaseField() {
$this->drupalLogin($this->editorUser);
$this->drupalGet('node/1');
- // Ensure that the full page title is actually in-place editable
+ // Ensure that the full page title is actually in-place editable.
$node = Node::load(1);
$elements = $this->xpath('//h1/span[@data-quickedit-field-id="node/1/title/en/full" and normalize-space(text())=:title]', array(':title' => $node->label()));
$this->assertTrue(!empty($elements), 'Title with data-quickedit-field-id attribute found.');
diff --git a/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php b/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
index 18a86f8..ed3e6a3 100644
--- a/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
+++ b/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
@@ -68,7 +68,7 @@ public function testText() {
// With cardinality 1.
$this->assertEqual('plain_text', $this->getSelectedEditor($entity->id(), $field_name), "With cardinality 1, the 'plain_text' editor is selected.");
- // With cardinality >1
+ // With cardinality >1.
$this->fields->field_text_field_storage->setCardinality(2);
$this->fields->field_text_field_storage->save();
$this->assertEqual('form', $this->getSelectedEditor($entity->id(), $field_name), "With cardinality >1, the 'form' editor is selected.");
diff --git a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
index ce9a977..9f4f8a1 100644
--- a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
@@ -172,7 +172,7 @@ public function testEditorWithCustomMetadata() {
'format' => 'full_html'
),
);
- $this->assertEqual($expected, $metadata); //, 'The correct metadata (including custom metadata) is generated.');
+ $this->assertEqual($expected, $metadata); // , 'The correct metadata (including custom metadata) is generated.');.
}
}
diff --git a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php b/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
index 48653a5..e00d822 100644
--- a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
@@ -125,23 +125,23 @@ function testNodeTeaser() {
'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
);
// @todo Enable with https://www.drupal.org/node/2072791.
- //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');
+ // $this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');
$expected_value = array(
'type' => 'literal',
'value' => $term1->getName(),
);
- //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');
+ // $this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');
// Term 2.
$expected_value = array(
'type' => 'uri',
'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
);
- //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');
+ // $this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');.
$expected_value = array(
'type' => 'literal',
'value' => $term2->getName(),
);
- //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');
+ // $this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');.
}
}
diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php
index 1c72d71..663dc75 100644
--- a/core/modules/rdf/src/Tests/StandardProfileTest.php
+++ b/core/modules/rdf/src/Tests/StandardProfileTest.php
@@ -407,8 +407,7 @@ protected function assertRdfaArticleProperties($graph, $message_prefix) {
// Tag type.
// @todo Enable with https://www.drupal.org/node/2072791.
- //$this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).');
-
+ // $this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).');
// Tag name.
$expected_value = array(
'type' => 'literal',
@@ -416,7 +415,7 @@ protected function assertRdfaArticleProperties($graph, $message_prefix) {
'lang' => 'en',
);
// @todo Enable with https://www.drupal.org/node/2072791.
- //$this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name).");
+ // $this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name).");
}
/**
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 7df1da8..0176fed 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -145,7 +145,7 @@ function template_preprocess_responsive_image_formatter(&$variables) {
*/
function template_preprocess_responsive_image(&$variables) {
// Make sure that width and height are proper values
- // If they exists we'll output them
+ // If they exists we'll output them.
// @see http://www.w3.org/community/respimg/2012/06/18/florians-compromise/
if (isset($variables['width']) && empty($variables['width'])) {
unset($variables['width']);
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index c0fbc90..f772475 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -475,7 +475,7 @@ private function assertResponsiveImageFieldFormattersLink($link_type) {
// Ensure that preview works.
$this->previewNodeImage($test_image, $field_name, 'article');
- // Look for a picture tag in the preview output
+ // Look for a picture tag in the preview output.
$this->assertPattern('/picture/');
$nid = $this->uploadNodeImage($test_image, $field_name, 'article');
diff --git a/core/modules/rest/src/Tests/NodeTest.php b/core/modules/rest/src/Tests/NodeTest.php
index 357109c..724e3ba 100644
--- a/core/modules/rest/src/Tests/NodeTest.php
+++ b/core/modules/rest/src/Tests/NodeTest.php
@@ -187,7 +187,7 @@ public function testMissingBundle() {
'title' => [['value' => $this->randomString() ]],
];
- // testing
+ // Testing.
$this->postNode($data);
// Make sure the response is "Bad Request".
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index f642d2d..7b04486 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -82,7 +82,6 @@ public function testSerializerResponses() {
$this->assertCacheContexts(['languages:language_interface', 'theme', 'request_format']);
// @todo Due to https://www.drupal.org/node/2352009 we can't yet test the
// propagation of cache max-age.
-
// Test the http Content-type.
$headers = $this->drupalGetHeaders();
$this->assertEqual($headers['content-type'], 'application/json', 'The header Content-type is correct.');
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 0bd22ab..5ac3843 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -205,7 +205,7 @@ function search_cron() {
function search_update_totals() {
// Update word IDF (Inverse Document Frequency) counts for new/changed words.
foreach (search_dirty() as $word => $dummy) {
- // Get total count
+ // Get total count.
$total = db_query("SELECT SUM(score) FROM {search_index} WHERE word = :word", array(':word' => $word), array('target' => 'replica'))->fetchField();
// Apply Zipf's law to equalize the probability distribution.
$total = log10(1 + 1/(max(1, $total)));
@@ -253,10 +253,10 @@ function search_update_totals() {
* @see hook_search_preprocess()
*/
function search_simplify($text, $langcode = NULL) {
- // Decode entities to UTF-8
+ // Decode entities to UTF-8.
$text = Html::decodeEntities($text);
- // Lowercase
+ // Lowercase.
$text = Unicode::strtolower($text);
// Remove diacritics.
@@ -265,7 +265,7 @@ function search_simplify($text, $langcode = NULL) {
// Call an external processor for word handling.
search_invoke_preprocess($text, $langcode);
- // Simple CJK handling
+ // Simple CJK handling.
if (\Drupal::config('search.settings')->get('index.overlap_cjk')) {
$text = preg_replace_callback('/[' . PREG_CLASS_CJK . ']+/u', 'search_expand_cjk', $text);
}
@@ -365,11 +365,11 @@ function search_index_split($text, $langcode = NULL) {
if ($last == $text) {
return $lastsplit;
}
- // Process words
+ // Process words.
$text = search_simplify($text, $langcode);
$words = explode(' ', $text);
- // Save last keyword result
+ // Save last keyword result.
$last = $text;
$lastsplit = $words;
@@ -444,19 +444,18 @@ function search_index($type, $sid, $langcode, $text) {
$split = preg_split('/\s*<([^>]+?)>\s*/', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
// Note: PHP ensures the array consists of alternating delimiters and literals
// and begins and ends with a literal (inserting $null as required).
-
$tag = FALSE; // Odd/even counter. Tag or no tag.
$score = 1; // Starting score per word
$accum = ' '; // Accumulator for cleaned up data
$tagstack = array(); // Stack with open tags
$tagwords = 0; // Counter for consecutive words
- $focus = 1; // Focus state
+ $focus = 1; // Focus state.
- $scored_words = array(); // Accumulator for words for index
+ $scored_words = array(); // Accumulator for words for index.
foreach ($split as $value) {
if ($tag) {
- // Increase or decrease score per word based on tag
+ // Increase or decrease score per word based on tag.
list($tagname) = explode(' ', $value, 2);
$tagname = Unicode::strtolower($tagname);
// Closing or opening tag?
@@ -468,7 +467,7 @@ function search_index($type, $sid, $langcode, $text) {
$score = 1;
}
else {
- // Remove from tag stack and decrement score
+ // Remove from tag stack and decrement score.
$score = max(1, $score - $tags[array_shift($tagstack)]);
}
}
@@ -480,7 +479,7 @@ function search_index($type, $sid, $langcode, $text) {
$score = 1;
}
else {
- // Add to open tag stack and increment score
+ // Add to open tag stack and increment score.
array_unshift($tagstack, $tagname);
$score += $tags[$tagname];
}
@@ -489,13 +488,13 @@ function search_index($type, $sid, $langcode, $text) {
$tagwords = 0;
}
else {
- // Note: use of PREG_SPLIT_DELIM_CAPTURE above will introduce empty values
+ // Note: use of PREG_SPLIT_DELIM_CAPTURE above will introduce empty values.
if ($value != '') {
$words = search_index_split($value, $langcode);
foreach ($words as $word) {
- // Add word to accumulator
+ // Add word to accumulator.
$accum .= $word . ' ';
- // Check wordlength
+ // Check wordlength.
if (is_numeric($word) || Unicode::strlen($word) >= $minimum_word_size) {
if (!isset($scored_words[$word])) {
$scored_words[$word] = 0;
@@ -521,7 +520,7 @@ function search_index($type, $sid, $langcode, $text) {
// cache tags.
search_index_clear($type, $sid, $langcode);
- // Insert cleaned up data into dataset
+ // Insert cleaned up data into dataset.
db_insert('search_dataset')
->fields(array(
'sid' => $sid,
@@ -532,7 +531,7 @@ function search_index($type, $sid, $langcode, $text) {
))
->execute();
- // Insert results into search index
+ // Insert results into search index.
foreach ($scored_words as $word => $score) {
// If a word already exists in the database, its score gets increased
// appropriately. If not, we create a new record with the appropriate
diff --git a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
index 3e19fb2..dd2be01 100644
--- a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
+++ b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
@@ -59,12 +59,12 @@ protected function setUp() {
$this->searchableNodes['1 comment'] = $this->drupalCreateNode($node_params);
$this->searchableNodes['0 comments'] = $this->drupalCreateNode($node_params);
- // Create a comment array
+ // Create a comment array.
$edit_comment = array();
$edit_comment['subject[0][value]'] = $this->randomMachineName();
$edit_comment['comment_body[0][value]'] = $this->randomMachineName();
- // Post comment to the test node with comment
+ // Post comment to the test node with comment.
$this->drupalPostForm('comment/reply/node/' . $this->searchableNodes['1 comment']->id() . '/comment', $edit_comment, t('Save'));
// First update the index. This does the initial processing.
@@ -86,12 +86,12 @@ function testSearchCommentCountToggle() {
);
$this->drupalGet('search/node');
- // Test comment count display for nodes with comment status set to Open
+ // Test comment count display for nodes with comment status set to Open.
$this->drupalPostForm(NULL, $edit, t('Search'));
$this->assertText(t('0 comments'), 'Empty comment count displays for nodes with comment status set to Open');
$this->assertText(t('1 comment'), 'Non-empty comment count displays for nodes with comment status set to Open');
- // Test comment count display for nodes with comment status set to Closed
+ // Test comment count display for nodes with comment status set to Closed.
$this->searchableNodes['0 comments']->set('comment', CommentItemInterface::CLOSED);
$this->searchableNodes['0 comments']->save();
$this->searchableNodes['1 comment']->set('comment', CommentItemInterface::CLOSED);
@@ -101,7 +101,7 @@ function testSearchCommentCountToggle() {
$this->assertNoText(t('0 comments'), 'Empty comment count does not display for nodes with comment status set to Closed');
$this->assertText(t('1 comment'), 'Non-empty comment count displays for nodes with comment status set to Closed');
- // Test comment count display for nodes with comment status set to Hidden
+ // Test comment count display for nodes with comment status set to Hidden.
$this->searchableNodes['0 comments']->set('comment', CommentItemInterface::HIDDEN);
$this->searchableNodes['0 comments']->save();
$this->searchableNodes['1 comment']->set('comment', CommentItemInterface::HIDDEN);
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index acce26e..fde4d29 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -194,7 +194,6 @@ function testSearchResultsComment() {
// @todo Verify the actual search results.
// https://www.drupal.org/node/2551135
-
// Verify there is no script tag in search results.
$this->assertNoRaw('