' . preg_replace('/\n\s*\n\n?(.)/', "
\n$1", $chunk) . "
\n"; // make paragraphs, including one at the end + $chunk = '' . preg_replace('/\n\s*\n\n?(.)/', "
\n$1", $chunk) . "
\n"; // Make paragraphs, including one at the end $chunk = preg_replace("|( ", $chunk);
$chunk = str_replace(' \s* \s* \s*(]*>)!', "$1", $chunk);
$chunk = preg_replace('!(]*>)\s*
\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/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/node/node.views_execution.inc b/core/modules/node/node.views_execution.inc
index 193e479..26a612a 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/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/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
index 14f9df5..2a99e22 100644
--- a/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -159,7 +159,7 @@ 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_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/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php
index 449a0ae..70c60ec 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/rest/src/Tests/NodeTest.php b/core/modules/rest/src/Tests/NodeTest.php
index 357109c..e06fa27 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/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 58ede7c..d0d5f6e 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -295,7 +295,7 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
$old_cwd = getcwd();
chdir(\Drupal::root() . "/core");
- // exec in a subshell so that the environment is isolated when running tests
+ // Exec in a subshell so that the environment is isolated when running tests
// via the simpletest UI.
$ret = exec(join($command, " "), $output, $status);
diff --git a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
index 9a69d78..0a79fed 100644
--- a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
@@ -69,7 +69,7 @@ public function infoParserProvider() {
'Drupal\Tests\simpletest\Functional\BrowserTestBaseTest',
];
- // kernel PHPUnit test.
+ // Kernel PHPUnit test.
$tests['phpunit-kernel'] = [
// Expected result.
[
diff --git a/core/modules/system/src/Tests/Common/SizeUnitTest.php b/core/modules/system/src/Tests/Common/SizeUnitTest.php
index 4fd5c17..c006230 100644
--- a/core/modules/system/src/Tests/Common/SizeUnitTest.php
+++ b/core/modules/system/src/Tests/Common/SizeUnitTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
);
$this->roundedTestCases = array(
'2 bytes' => 2,
- '1 MB' => ($kb * $kb) - 1, // rounded to 1 MB (not 1000 or 1024 kilobyte!)
+ '1 MB' => ($kb * $kb) - 1, // Rounded to 1 MB (not 1000 or 1024 kilobyte!)
round(3623651 / ($this->exactTestCases['1 MB']), 2) . ' MB' => 3623651, // megabytes
round(67234178751368124 / ($this->exactTestCases['1 PB']), 2) . ' PB' => 67234178751368124, // petabytes
round(235346823821125814962843827 / ($this->exactTestCases['1 YB']), 2) . ' YB' => 235346823821125814962843827, // yottabytes
diff --git a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
index 7ccbbb5..1974a79 100644
--- a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
+++ b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
@@ -21,7 +21,7 @@ function testTableSortQuery() {
array('field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'),
array('field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'),
array('field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'),
- // more elements here
+ // More elements here
);
@@ -49,7 +49,7 @@ function testTableSortQueryFirst() {
array('field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'),
array('field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'),
array('field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'),
- // more elements here
+ // More elements here
);
diff --git a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
index c8e3820..d60c506 100644
--- a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
+++ b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
@@ -60,7 +60,7 @@ function _writeDirectory($base, $files = array()) {
$this->_writeDirectory($base . DIRECTORY_SEPARATOR . $key, $file);
}
else {
- //just write the filename into the file
+ //Just write the filename into the file
file_put_contents($base . DIRECTORY_SEPARATOR . $file, $file);
}
}
diff --git a/core/modules/system/src/Tests/Theme/ThemeTest.php b/core/modules/system/src/Tests/Theme/ThemeTest.php
index 4eae7ae..23c6e3b 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeTest.php
@@ -70,7 +70,7 @@ function testThemeDataTypes() {
}
}
- // suggestionnotimplemented is not an implemented theme hook so \Drupal::theme() service
+ // Suggestionnotimplemented is not an implemented theme hook so \Drupal::theme() service
// should return FALSE instead of a string.
$output = \Drupal::theme()->render(array('suggestionnotimplemented'), array());
$this->assertIdentical($output, FALSE, '\Drupal::theme() returns FALSE when a hook suggestion is not implemented.');
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
index e6a87b1..7af3ba0 100644
--- a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
@@ -15,7 +15,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
$this->derivatives[$key] = $base_plugin_definition;
$this->derivatives[$key]['title'] = $title;
$this->derivatives[$key]['route_parameters'] = array('placeholder' => $key);
- $this->derivatives[$key]['weight'] = $weight++; // ensure weights for testing.
+ $this->derivatives[$key]['weight'] = $weight++; // Ensure weights for testing.
}
return $this->derivatives;
}
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
index 0415a7a..0819ddd 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
@@ -36,7 +36,7 @@ public function preQuery() {
$argument = -10;
}
- // figure out which argument preceded us.
+ // Figure out which argument preceded us.
$keys = array_reverse(array_keys($this->view->argument));
$skip = TRUE;
foreach ($keys as $key) {
diff --git a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
index b375b10..8a51961 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
@@ -200,7 +200,7 @@ public function getArgument() {
}
if (!empty($this->options['limit'])) {
$tids = array();
- // filter by vocabulary
+ // Filter by vocabulary
foreach ($taxonomy as $tid => $vocab) {
if (!empty($this->options['vids'][$vocab])) {
$tids[] = $tid;
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 0158881..3d4e0df 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -340,7 +340,7 @@ public function validateExposed(&$form, FormStateInterface $form_state) {
}
protected function valueSubmit($form, FormStateInterface $form_state) {
- // prevent array_filter from messing up our arrays in parent submit.
+ // Prevent array_filter from messing up our arrays in parent submit.
}
public function buildExposeForm(&$form, FormStateInterface $form_state) {
@@ -356,7 +356,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
}
public function adminSummary() {
- // set up $this->valueOptions for the parent summary
+ // Set up $this->valueOptions for the parent summary
$this->valueOptions = array();
if ($this->value) {
diff --git a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
index faa5d70..a2680af 100644
--- a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
@@ -140,7 +140,7 @@ public function query() {
$join = \Drupal::service('plugin.manager.views.join')->createInstance('standard', $def);
- // use a short alias for this:
+ // Use a short alias for this:
$alias = $def['table'] . '_' . $this->table;
$this->alias = $this->query->addRelationship($alias, $join, 'taxonomy_term_field_data', $this->relationship);
diff --git a/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php
index 00bc589..9fd1516 100644
--- a/core/modules/taxonomy/src/TermViewsData.php
+++ b/core/modules/taxonomy/src/TermViewsData.php
@@ -137,12 +137,12 @@ public function getViewsData() {
$data['taxonomy_index']['table']['join'] = array(
'taxonomy_term_field_data' => array(
- // links directly to taxonomy_term_field_data via tid
+ // Links directly to taxonomy_term_field_data via tid
'left_field' => 'tid',
'field' => 'tid',
),
'node_field_data' => array(
- // links directly to node via nid
+ // Links directly to node via nid
'left_field' => 'nid',
'field' => 'nid',
),
diff --git a/core/modules/user/src/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php
index 411e04b..5896fb7 100644
--- a/core/modules/user/src/Plugin/views/argument_validator/User.php
+++ b/core/modules/user/src/Plugin/views/argument_validator/User.php
@@ -75,7 +75,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) {
- // filter trash out of the options so we don't store giant unnecessary arrays
+ // Filter trash out of the options so we don't store giant unnecessary arrays
$options['roles'] = array_filter($options['roles']);
}
diff --git a/core/modules/user/src/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php
index 7554adf..598150d 100644
--- a/core/modules/user/src/Plugin/views/filter/Name.php
+++ b/core/modules/user/src/Plugin/views/filter/Name.php
@@ -93,7 +93,7 @@ public function validateExposed(&$form, FormStateInterface $form_state) {
}
protected function valueSubmit($form, FormStateInterface $form_state) {
- // prevent array filter from removing our anonymous user.
+ // Prevent array filter from removing our anonymous user.
}
/**
@@ -104,7 +104,7 @@ public function getValueOptions() {
}
public function adminSummary() {
- // set up $this->valueOptions for the parent summary
+ // Set up $this->valueOptions for the parent summary
$this->valueOptions = array();
if ($this->value) {
diff --git a/core/modules/user/tests/src/Kernel/UserValidationTest.php b/core/modules/user/tests/src/Kernel/UserValidationTest.php
index 251c810..387e381 100644
--- a/core/modules/user/tests/src/Kernel/UserValidationTest.php
+++ b/core/modules/user/tests/src/Kernel/UserValidationTest.php
@@ -46,9 +46,9 @@ function testUsernames() {
'Foo O\'Bar' => array('Valid username', 'assertNull'),
'foo@bar' => array('Valid username', 'assertNull'),
'foo@example.com' => array('Valid username', 'assertNull'),
- 'foo@-example.com' => array('Valid username', 'assertNull'), // invalid domains are allowed in usernames
+ 'foo@-example.com' => array('Valid username', 'assertNull'), // Invalid domains are allowed in usernames
'þòøÇߪř€' => array('Valid username', 'assertNull'),
- 'ᚠᛇᚻ᛫ᛒᛦᚦ' => array('Valid UTF8 username', 'assertNull'), // runes
+ 'ᚠᛇᚻ᛫ᛒᛦᚦ' => array('Valid UTF8 username', 'assertNull'), // Runes
' foo' => array('Invalid username that starts with a space', 'assertNotNull'),
'foo ' => array('Invalid username that ends with a space', 'assertNotNull'),
'foo bar' => array('Invalid username that contains 2 spaces \' \'', 'assertNotNull'),
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index d0716c9..7eb5cb3 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -97,7 +97,7 @@ function hook_user_cancel_methods_alter(&$methods) {
$methods['mymodule_zero_out'] = array(
'title' => t('Delete the account and remove all content.'),
'description' => t('All your content will be replaced by empty strings.'),
- // access should be used for administrative methods only.
+ // Access should be used for administrative methods only.
'access' => $account->hasPermission('access zero-out account cancellation method'),
);
}
diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index 09accee..c4719c9 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -118,7 +118,7 @@ public function summaryJoin() {
$field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
$join = $this->getJoin();
- // shortcuts
+ // Shortcuts
$options = $this->handler->options;
$view = $this->handler->view;
$query = $this->handler->query;
@@ -158,7 +158,7 @@ public function ensureMyTable() {
$field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
if ($this->handler->operator == 'or' && empty($this->handler->options['reduce_duplicates'])) {
if (empty($this->handler->options['add_table']) && empty($this->handler->view->many_to_one_tables[$field])) {
- // query optimization, INNER joins are slightly faster, so use them
+ // Query optimization, INNER joins are slightly faster, so use them
// when we know we can.
$join = $this->getJoin();
if (isset($join)) {
@@ -331,7 +331,7 @@ public function addFilter() {
$clause->condition("$alias.$field", $value);
}
- // implode on either AND or OR.
+ // Implode on either AND or OR.
$this->handler->query->addWhere($options['group'], $clause);
}
}
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index fab36a0..23af236 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -569,7 +569,7 @@ public function storeExposedInput($input, $status) { return TRUE; }
* {@inheritdoc}
*/
public function getJoin() {
- // get the join from this table that links back to the base table.
+ // Get the join from this table that links back to the base table.
// Determine the primary table to seek
if (empty($this->query->relationships[$this->relationship])) {
$base_table = $this->view->storage->get('base_table');
@@ -734,7 +734,7 @@ public static function breakString($str, $force_int = FALSE) {
*/
public function displayExposedForm($form, FormStateInterface $form_state) {
$item = &$this->options;
- // flip
+ // Flip
$item['exposed'] = empty($item['exposed']);
// If necessary, set new defaults:
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index d0ae5eb..70d86e8 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -411,7 +411,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
$plugin->validateOptionsForm($form['argument_default'][$default_id], $form_state, $option_values['argument_default'][$default_id]);
}
- // summary plugin
+ // Summary plugin
$summary_id = $option_values['summary']['format'];
$plugin = $this->getPlugin('style', $summary_id);
if ($plugin) {
@@ -444,7 +444,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
$option_values['default_argument_options'] = $options;
}
- // summary plugin
+ // Summary plugin
$summary_id = $option_values['summary']['format'];
$plugin = $this->getPlugin('style', $summary_id);
if ($plugin) {
@@ -498,7 +498,7 @@ protected function defaultActions($which = NULL) {
'method' => 'defaultDefault',
'form method' => 'defaultArgumentForm',
'has default argument' => TRUE,
- 'default only' => TRUE, // this can only be used for missing argument, not validation failure
+ 'default only' => TRUE, // This can only be used for missing argument, not validation failure
),
'not found' => array(
'title' => $this->t('Hide view'),
@@ -669,7 +669,7 @@ public function defaultSummaryForm(&$form, FormStateInterface $form_state) {
'#suffix' => '',
'#id' => 'edit-options-summary-options-' . $id,
'#type' => 'item',
- '#input' => TRUE, // trick it into checking input to make #process run
+ '#input' => TRUE, // Trick it into checking input to make #process run
'#states' => array(
'visible' => array(
':input[name="options[default_action]"]' => array('value' => 'summary'),
@@ -863,7 +863,7 @@ protected function summaryNameField() {
// name field would be 'name' (i.e, the username).
if (isset($this->name_table)) {
- // if the alias is different then we're probably added, not ensured,
+ // If the alias is different then we're probably added, not ensured,
// so look up the join and add it instead.
if ($this->tableAlias != $this->name_table) {
$j = HandlerBase::getTableJoin($this->name_table, $this->table);
@@ -1059,7 +1059,7 @@ public function getValue() {
if (!isset($arg) && $argument->hasDefaultArgument()) {
$arg = $argument->getDefaultArgument();
- // remember that this argument was computed, not passed on the URL.
+ // Remember that this argument was computed, not passed on the URL.
$this->is_default = TRUE;
}
// Set the argument, which will also validate that the argument can be set.
@@ -1102,7 +1102,7 @@ public function getPlugin($type = 'argument_default', $name = NULL) {
$name = $plugin_name;
}
- // we only fetch the options if we're fetching the plugin actually
+ // We only fetch the options if we're fetching the plugin actually
// in use.
if ($name == $plugin_name) {
$options = isset($this->options[$options_name]) ? $this->options[$options_name] : [];
diff --git a/core/modules/views/src/Plugin/views/argument/DayDate.php b/core/modules/views/src/Plugin/views/argument/DayDate.php
index 187be04..ced2e8f 100644
--- a/core/modules/views/src/Plugin/views/argument/DayDate.php
+++ b/core/modules/views/src/Plugin/views/argument/DayDate.php
@@ -24,7 +24,7 @@ class DayDate extends Date {
*/
public function summaryName($data) {
$day = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
- // strtotime respects server timezone, so we need to set the time fixed as utc time
+ // Strtotime respects server timezone, so we need to set the time fixed as utc time
return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
diff --git a/core/modules/views/src/Plugin/views/argument/ManyToOne.php b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
index 48385d5..e2ff8ba 100644
--- a/core/modules/views/src/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
@@ -61,7 +61,7 @@ protected function defineOptions() {
public function buildOptionsForm(&$form, FormStateInterface $form_state) {
parent::buildOptionsForm($form, $form_state);
- // allow + for or, , for and
+ // Allow + for or, , for and
$form['break_phrase'] = array(
'#type' => 'checkbox',
'#title' => $this->t('Allow multiple values'),
diff --git a/core/modules/views/src/Plugin/views/argument/NumericArgument.php b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
index b314836..f8fc56a 100644
--- a/core/modules/views/src/Plugin/views/argument/NumericArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/NumericArgument.php
@@ -38,7 +38,7 @@ protected function defineOptions() {
public function buildOptionsForm(&$form, FormStateInterface $form_state) {
parent::buildOptionsForm($form, $form_state);
- // allow + for or, , for and
+ // Allow + for or, , for and
$form['break_phrase'] = array(
'#type' => 'checkbox',
'#title' => $this->t('Allow multiple values'),
diff --git a/core/modules/views/src/Plugin/views/argument/StringArgument.php b/core/modules/views/src/Plugin/views/argument/StringArgument.php
index 085589a..5f5495b 100644
--- a/core/modules/views/src/Plugin/views/argument/StringArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/StringArgument.php
@@ -130,7 +130,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
);
}
- // allow + for or, , for and
+ // Allow + for or, , for and
$form['break_phrase'] = array(
'#type' => 'checkbox',
'#title' => $this->t('Allow multiple values'),
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index a046698..b5be14d 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -470,7 +470,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
$menu = $form_state->getValue('menu');
list($menu['menu_name'], $menu['parent']) = explode(':', $menu['parent'], 2);
$this->setOption('menu', $menu);
- // send ajax form to options page if we use it.
+ // Send ajax form to options page if we use it.
if ($form_state->getValue(array('menu', 'type')) == 'default tab') {
$form_state->get('view')->addFormToStack('display', $this->display['id'], 'tab_options');
}
diff --git a/core/modules/views/src/Plugin/views/field/Counter.php b/core/modules/views/src/Plugin/views/field/Counter.php
index 06d9b56..bdbda82 100644
--- a/core/modules/views/src/Plugin/views/field/Counter.php
+++ b/core/modules/views/src/Plugin/views/field/Counter.php
@@ -51,7 +51,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function query() {
- // do nothing -- to override the parent query.
+ // Do nothing -- to override the parent query.
}
/**
diff --git a/core/modules/views/src/Plugin/views/field/Custom.php b/core/modules/views/src/Plugin/views/field/Custom.php
index 19552b2..8320bd8 100644
--- a/core/modules/views/src/Plugin/views/field/Custom.php
+++ b/core/modules/views/src/Plugin/views/field/Custom.php
@@ -27,7 +27,7 @@ public function usesGroupBy() {
* {@inheritdoc}
*/
public function query() {
- // do nothing -- to override the parent query.
+ // Do nothing -- to override the parent query.
}
/**
diff --git a/core/modules/views/src/Plugin/views/field/Date.php b/core/modules/views/src/Plugin/views/field/Date.php
index f5a5204..210873d 100644
--- a/core/modules/views/src/Plugin/views/field/Date.php
+++ b/core/modules/views/src/Plugin/views/field/Date.php
@@ -143,7 +143,7 @@ public function render(ResultRow $values) {
if ($value) {
$timezone = !empty($this->options['timezone']) ? $this->options['timezone'] : NULL;
- $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
+ $time_diff = REQUEST_TIME - $value; // Will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
switch ($format) {
case 'raw time ago':
return $this->dateFormatter->formatTimeDiffSince($value, array('granularity' => is_numeric($custom_format) ? $custom_format : 2));
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index cde5ecb..8d527ee 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -151,7 +151,7 @@ public function query() {
*/
protected function addAdditionalFields($fields = NULL) {
if (!isset($fields)) {
- // notice check
+ // Notice check
if (empty($this->additional_fields)) {
return;
}
diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
index 616666b..2d89ff7 100644
--- a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
@@ -41,7 +41,7 @@ class BooleanOperator extends FilterPluginBase {
*/
const NOT_EQUAL = '<>';
- // exposed filter options
+ // Exposed filter options
protected $alwaysMultiple = TRUE;
// Don't display empty space where the operator would be.
public $no_operator = TRUE;
diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php
index 8ea3750..a8e4a90 100644
--- a/core/modules/views/src/Plugin/views/filter/Date.php
+++ b/core/modules/views/src/Plugin/views/filter/Date.php
@@ -16,7 +16,7 @@ class Date extends NumericFilter {
protected function defineOptions() {
$options = parent::defineOptions();
- // value is already set up properly, we're just adding our new field to it.
+ // Value is already set up properly, we're just adding our new field to it.
$options['value']['contains']['type']['default'] = 'date';
return $options;
@@ -154,7 +154,7 @@ public function acceptExposedInput($input) {
}
}
- // restore what got overwritten by the parent.
+ // Restore what got overwritten by the parent.
$this->value['type'] = $type;
return $rc;
}
@@ -164,7 +164,7 @@ protected function opBetween($field) {
$b = intval(strtotime($this->value['max'], 0));
if ($this->value['type'] == 'offset') {
- $a = '***CURRENT_TIME***' . sprintf('%+d', $a); // keep sign
+ $a = '***CURRENT_TIME***' . sprintf('%+d', $a); // Keep sign
$b = '***CURRENT_TIME***' . sprintf('%+d', $b); // keep sign
}
// This is safe because we are manually scrubbing the values.
@@ -176,7 +176,7 @@ protected function opBetween($field) {
protected function opSimple($field) {
$value = intval(strtotime($this->value['value'], 0));
if (!empty($this->value['type']) && $this->value['type'] == 'offset') {
- $value = '***CURRENT_TIME***' . sprintf('%+d', $value); // keep sign
+ $value = '***CURRENT_TIME***' . sprintf('%+d', $value); // Keep sign
}
// This is safe because we are manually scrubbing the value.
// It is necessary to do it this way because $value is a formula when using an offset.
diff --git a/core/modules/views/src/Plugin/views/filter/Equality.php b/core/modules/views/src/Plugin/views/filter/Equality.php
index 748c60d..41ef1ba 100644
--- a/core/modules/views/src/Plugin/views/filter/Equality.php
+++ b/core/modules/views/src/Plugin/views/filter/Equality.php
@@ -13,7 +13,7 @@
*/
class Equality extends FilterPluginBase {
- // exposed filter options
+ // Exposed filter options
protected $alwaysMultiple = TRUE;
/**
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index cf00bf7..bc65c2c 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -1399,7 +1399,7 @@ public function storeExposedInput($input, $status) {
// know where to look for session stored values.
$display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
- // shortcut test.
+ // Shortcut test.
$operator = !empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']);
// False means that we got a setting that means to recurse ourselves,
diff --git a/core/modules/views/src/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php
index f3f1ca4..dcee317 100644
--- a/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -88,7 +88,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
'#type' => 'checkbox',
'#title' => $this->t('Limit list to selected items'),
'#description' => $this->t('If checked, the only items presented to the user will be the ones selected here.'),
- '#default_value' => !empty($this->options['expose']['reduce']), // safety
+ '#default_value' => !empty($this->options['expose']['reduce']), // Safety
);
}
@@ -124,7 +124,7 @@ function operators() {
'values' => 1,
),
);
- // if the definition allows for the empty operator, add it.
+ // If the definition allows for the empty operator, add it.
if (!empty($this->definition['allow empty'])) {
$operators += array(
'empty' => array(
@@ -190,7 +190,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
$identifier = $this->options['expose']['identifier'];
if (empty($this->options['expose']['use_operator']) || empty($this->options['expose']['operator_id'])) {
- // exposed and locked.
+ // Exposed and locked.
$which = in_array($this->operator, $this->operatorValues(1)) ? 'value' : 'none';
}
else {
diff --git a/core/modules/views/src/Plugin/views/filter/ManyToOne.php b/core/modules/views/src/Plugin/views/filter/ManyToOne.php
index 7fa1fbc..69fa441 100644
--- a/core/modules/views/src/Plugin/views/filter/ManyToOne.php
+++ b/core/modules/views/src/Plugin/views/filter/ManyToOne.php
@@ -81,7 +81,7 @@ function operators() {
'ensure_my_table' => 'helper',
),
);
- // if the definition allows for the empty operator, add it.
+ // If the definition allows for the empty operator, add it.
if (!empty($this->definition['allow empty'])) {
$operators += array(
'empty' => array(
diff --git a/core/modules/views/src/Plugin/views/filter/NumericFilter.php b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
index e1ad6b3..3b68c47 100644
--- a/core/modules/views/src/Plugin/views/filter/NumericFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/NumericFilter.php
@@ -87,7 +87,7 @@ function operators() {
),
);
- // if the definition allows for the empty operator, add it.
+ // If the definition allows for the empty operator, add it.
if (!empty($this->definition['allow empty'])) {
$operators += array(
'empty' => array(
@@ -149,7 +149,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
$identifier = $this->options['expose']['identifier'];
if (empty($this->options['expose']['use_operator']) || empty($this->options['expose']['operator_id'])) {
- // exposed and locked.
+ // Exposed and locked.
$which = in_array($this->operator, $this->operatorValues(2)) ? 'minmax' : 'value';
}
else {
@@ -304,7 +304,7 @@ public function acceptExposedInput($input) {
return TRUE;
}
- // rewrite the input value so that it's in the correct format so that
+ // Rewrite the input value so that it's in the correct format so that
// the parent gets the right data.
if (!empty($this->options['expose']['identifier'])) {
$value = &$input[$this->options['expose']['identifier']];
diff --git a/core/modules/views/src/Plugin/views/filter/StringFilter.php b/core/modules/views/src/Plugin/views/filter/StringFilter.php
index 10c4070..598f953 100644
--- a/core/modules/views/src/Plugin/views/filter/StringFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/StringFilter.php
@@ -14,7 +14,7 @@
*/
class StringFilter extends FilterPluginBase {
- // exposed filter options
+ // Exposed filter options
protected $alwaysMultiple = TRUE;
protected function defineOptions() {
@@ -111,7 +111,7 @@ function operators() {
'values' => 1,
),
);
- // if the definition allows for the empty operator, add it.
+ // If the definition allows for the empty operator, add it.
if (!empty($this->definition['allow empty'])) {
$operators += array(
'empty' => array(
@@ -190,7 +190,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
$identifier = $this->options['expose']['identifier'];
if (empty($this->options['expose']['use_operator']) || empty($this->options['expose']['operator_id'])) {
- // exposed and locked.
+ // Exposed and locked.
$which = in_array($this->operator, $this->operatorValues(1)) ? 'value' : 'none';
}
else {
@@ -286,7 +286,7 @@ protected function opContainsWord($field) {
return;
}
- // previously this was a call_user_func_array but that's unnecessary
+ // Previously this was a call_user_func_array but that's unnecessary
// as views will unpack an array that is a single arg.
$this->query->addWhere($this->options['group'], $where);
}
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 43b4a44..6f99c9a 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -121,7 +121,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
'base' => $base_table
);
- // init the table queue with our primary table.
+ // Init the table queue with our primary table.
$this->tableQueue[$base_table] = array(
'alias' => $base_table,
'table' => $base_table,
@@ -129,7 +129,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
'join' => NULL,
);
- // init the tables with our primary table
+ // Init the tables with our primary table
$this->tables[$base_table][$base_table] = array(
'count' => 1,
'alias' => $base_table,
@@ -451,7 +451,7 @@ protected function markTable($table, $relationship, $alias) {
if (!isset($alias)) {
$alias = '';
if ($relationship != $this->view->storage->get('base_table')) {
- // double underscore will help prevent accidental name
+ // Double underscore will help prevent accidental name
// space collisions.
$alias = $relationship . '__';
}
@@ -488,7 +488,7 @@ protected function markTable($table, $relationship, $alias) {
* cannot be ensured.
*/
public function ensureTable($table, $relationship = NULL, JoinPluginBase $join = NULL) {
- // ensure a relationship
+ // Ensure a relationship
if (empty($relationship)) {
$relationship = $this->view->storage->get('base_table');
}
@@ -538,7 +538,7 @@ public function ensureTable($table, $relationship = NULL, JoinPluginBase $join =
// example, a view that filters on 3 taxonomy terms using AND
// needs to join taxonomy_term_data 3 times with the same join.
- // scan through the table queue to see if a matching join and
+ // Scan through the table queue to see if a matching join and
// relationship exists. If so, use it instead of this join.
// TODO: Scanning through $this->tableQueue results in an
@@ -1280,7 +1280,7 @@ public function query($get_count = FALSE) {
}
if (!$this->getCountOptimized) {
- // we only add the orderby if we're not counting.
+ // We only add the orderby if we're not counting.
if ($this->orderby) {
foreach ($this->orderby as $order) {
if ($order['field'] == 'rand_') {
@@ -1722,7 +1722,7 @@ public function getDateField($field) {
public function setupTimezone() {
$timezone = drupal_get_user_timezone();
- // set up the database timezone
+ // Set up the database timezone
$db_type = Database::getConnection()->databaseType();
if (in_array($db_type, array('mysql', 'pgsql'))) {
$offset = '+00:00';
@@ -1815,7 +1815,7 @@ public function getDateFormat($field, $format, $string_date = FALSE) {
'd' => '%d',
// No format for full day name.
'l' => '%d',
- // no format for day of month number without leading zeros.
+ // No format for day of month number without leading zeros.
'j' => '%d',
'W' => '%W',
'H' => '%H',
diff --git a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
index c1b8821..21e62b4 100644
--- a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
+++ b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
@@ -97,7 +97,7 @@ public function query() {
$second_join = $this->joinManager->createInstance($id, $second);
$second_join->adjusted = TRUE;
- // use a short alias for this:
+ // Use a short alias for this:
$alias = $this->definition['field_name'] . '_' . $this->table;
$this->alias = $this->query->addRelationship($alias, $second_join, $this->definition['base'], $this->relationship);
diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index dc23a68..5b91c2f 100644
--- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -378,7 +378,7 @@ public function query() {
}
$join = Views::pluginManager('join')->createInstance($id, $def);
- // use a short alias for this:
+ // Use a short alias for this:
$alias = $def['table'] . '_' . $this->table;
$this->alias = $this->query->addRelationship($alias, $join, $this->definition['base'], $this->relationship);
diff --git a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 25a0001..9f62aa5 100644
--- a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -153,7 +153,7 @@ public function query() {
}
$join = Views::pluginManager('join')->createInstance($id, $def);
- // use a short alias for this:
+ // Use a short alias for this:
$alias = $def['table'] . '_' . $this->table;
$this->alias = $this->query->addRelationship($alias, $join, $this->definition['base'], $this->relationship);
diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php
index c49f6e9..19cb25e 100644
--- a/core/modules/views/src/Plugin/views/style/Table.php
+++ b/core/modules/views/src/Plugin/views/style/Table.php
@@ -104,7 +104,7 @@ public function buildSortPost() {
$query = $this->view->getRequest()->query;
$order = $query->get('order');
if (!isset($order)) {
- // check for a 'default' clicksort. If there isn't one, exit gracefully.
+ // Check for a 'default' clicksort. If there isn't one, exit gracefully.
if (empty($this->options['default'])) {
return;
}
@@ -317,7 +317,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#return_value' => $field,
'#parents' => array('style_options', 'default'),
'#id' => $radio_id,
- // because 'radio' doesn't fully support '#id' =(
+ // Because 'radio' doesn't fully support '#id' =(
'#attributes' => array('id' => $radio_id),
'#default_value' => $default,
'#states' => array(
@@ -380,7 +380,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
),
);
- // markup for the field name
+ // Markup for the field name
$form['info'][$field]['name'] = array(
'#markup' => $field_names[$field],
);
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
index 0708b86..0dc8aef 100644
--- a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
@@ -127,7 +127,7 @@ public function testArgumentDefaultFixed() {
/**
* @todo Test php default argument.
*/
- //function testArgumentDefaultPhp() {}
+ //Function testArgumentDefaultPhp() {}
/**
* Test node default argument.
diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php
index 3bbfd66..bdc7988 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php
@@ -140,7 +140,7 @@ public function testFilterGroupsOverriding() {
$view = Views::getView('test_filter_groups');
$view->initDisplay();
- // mark is as overridden, yes FALSE, means overridden.
+ // Mark is as overridden, yes FALSE, means overridden.
$view->displayHandlers->get('page')->setOverride('filter_groups', FALSE);
$this->assertFalse($view->displayHandlers->get('page')->isDefaulted('filter_groups'), "Make sure that 'filter_groups' is marked as overridden.");
$this->assertFalse($view->displayHandlers->get('page')->isDefaulted('filters'), "Make sure that 'filters'' is marked as overridden.");
diff --git a/core/modules/views/src/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php
index e3282a3..0fd7269 100644
--- a/core/modules/views/src/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/src/Tests/Plugin/PagerTest.php
@@ -91,7 +91,7 @@ public function testStorePagerSettings() {
$this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/default/pager_options', $edit, t('Apply'));
$this->assertText('20 items');
- // add new display and test the settings again, by override it.
+ // Add new display and test the settings again, by override it.
$edit = array( );
// Add a display and override the pager settings.
$this->drupalPostForm('admin/structure/views/view/test_store_pager_settings/edit', $edit, t('Add Page'));
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index a29d452..f3c7f63 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -680,7 +680,7 @@ public function getExposedInput() {
$this->initDisplay();
$this->exposed_input = \Drupal::request()->query->all();
- // unset items that are definitely not our input:
+ // Unset items that are definitely not our input:
foreach (array('page', 'q') as $key) {
if (isset($this->exposed_input[$key])) {
unset($this->exposed_input[$key]);
@@ -1053,7 +1053,7 @@ protected function _buildArguments() {
return TRUE;
}
- // build arguments.
+ // Build arguments.
$position = -1;
$substitutions = array();
$status = TRUE;
@@ -1078,11 +1078,11 @@ protected function _buildArguments() {
if (isset($arg) || $argument->hasDefaultArgument()) {
if (!isset($arg)) {
$arg = $argument->getDefaultArgument();
- // make sure default args get put back.
+ // Make sure default args get put back.
if (isset($arg)) {
$this->args[$position] = $arg;
}
- // remember that this argument was computed, not passed on the URL.
+ // Remember that this argument was computed, not passed on the URL.
$argument->is_default = TRUE;
}
@@ -1110,7 +1110,7 @@ protected function _buildArguments() {
}
}
else {
- // determine default condition and handle.
+ // Determine default condition and handle.
$status = $argument->defaultAction();
break;
}
@@ -1119,7 +1119,7 @@ protected function _buildArguments() {
unset($argument);
}
- // set the title in the build info.
+ // Set the title in the build info.
if (!empty($title)) {
$this->build_info['title'] = $title;
}
@@ -1154,7 +1154,7 @@ public function initQuery() {
if (!empty($this->query)) {
$class = get_class($this->query);
if ($class && $class != 'stdClass') {
- // return if query is already initialized.
+ // Return if query is already initialized.
return TRUE;
}
}
@@ -1275,7 +1275,7 @@ public function build($display_id = NULL) {
if ($this->style_plugin->buildSort()) {
$this->_build('sort');
}
- // allow the plugin to build second sorts as well.
+ // Allow the plugin to build second sorts as well.
$this->style_plugin->buildSortPost();
}
@@ -1683,7 +1683,7 @@ public function preExecute($args = array()) {
* Unsets the current view, mostly.
*/
public function postExecute() {
- // unset current view so we can be properly destructed later on.
+ // Unset current view so we can be properly destructed later on.
// Return the previous value in case we're an attachment.
if ($this->old_view) {
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 10d8240..8b706f7 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -425,7 +425,7 @@ public static function getHandlerTypes() {
if (!isset(static::$handlerTypes)) {
static::$handlerTypes = array(
'field' => array(
- // title
+ // Title
'title' => static::t('Fields'),
// Lowercase title for mid-sentence.
'ltitle' => static::t('fields'),
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index 791cd37..e8877ac 100644
--- a/core/modules/views/src/ViewsDataHelper.php
+++ b/core/modules/views/src/ViewsDataHelper.php
@@ -70,7 +70,7 @@ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) {
foreach ($table_data as $field => $info) {
// Collect table data from this table
if ($field == 'table') {
- // calculate what tables this table can join to.
+ // Calculate what tables this table can join to.
if (!empty($info['join'])) {
$bases = array_keys($info['join']);
}
diff --git a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
index 3c46c9e..7139b91 100644
--- a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -292,7 +292,7 @@ public function testVariousTableUpdates() {
// base <-> base + revision
// base <-> base + translation + revision
- // base <-> base + translation
+ // Base <-> base + translation
$this->updateEntityTypeToTranslatable();
$this->entityDefinitionUpdateManager->applyUpdates();
list($view, $display) = $this->getUpdatedViewAndDisplay();
@@ -311,7 +311,7 @@ public function testVariousTableUpdates() {
$this->resetEntityType();
- // base + translation <-> base + translation + revision
+ // Base + translation <-> base + translation + revision
$this->updateEntityTypeToTranslatable();
$this->entityDefinitionUpdateManager->applyUpdates();
list($view, $display) = $this->getUpdatedViewAndDisplay();
@@ -338,7 +338,7 @@ public function testVariousTableUpdates() {
$this->resetEntityType();
- // base + revision <-> base + translation + revision
+ // Base + revision <-> base + translation + revision
$this->updateEntityTypeToRevisionable();
list($view, $display) = $this->getUpdatedViewAndDisplay();
@@ -364,7 +364,7 @@ public function testVariousTableUpdates() {
$this->resetEntityType();
- // base <-> base + revision
+ // Base <-> base + revision
$this->updateEntityTypeToRevisionable();
$this->entityDefinitionUpdateManager->applyUpdates();
list($view, $display) = $this->getUpdatedViewAndDisplay();
@@ -383,7 +383,7 @@ public function testVariousTableUpdates() {
$this->resetEntityType();
- // base <-> base + translation + revision
+ // Base <-> base + translation + revision
$this->updateEntityTypeToRevisionable();
$this->updateEntityTypeToTranslatable();
$this->entityDefinitionUpdateManager->applyUpdates();
@@ -407,7 +407,7 @@ public function testVariousTableUpdates() {
* Tests some possible entity table updates for a revision view.
*/
public function testVariousTableUpdatesForRevisionView() {
- // base + revision <-> base + translation + revision
+ // Base + revision <-> base + translation + revision
$this->updateEntityTypeToRevisionable();
// Multiple changes, so we have to invalidate the caches, otherwise
// the second update will revert the first.
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
index 5ccacd8..1ef035a 100644
--- a/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
@@ -35,7 +35,7 @@ public function testAreaText() {
$view = Views::getView('test_view');
$view->setDisplay();
- // add a text header
+ // Add a text header
$string = $this->randomMachineName();
$view->displayHandlers->get('default')->overrideOption('header', array(
'area' => array(
diff --git a/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php b/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
index e90ec85..07a6080 100644
--- a/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
@@ -45,7 +45,7 @@ public function testAreaText() {
// Make sure that the argument is not validated yet.
unset($view->argument['null']->argument_validated);
$this->assertTrue($view->argument['null']->validateArgument(26));
- // test must_not_be option.
+ // Test must_not_be option.
unset($view->argument['null']->argument_validated);
$view->argument['null']->options['must_not_be'] = TRUE;
$this->assertFalse($view->argument['null']->validateArgument(26), 'must_not_be returns FALSE, if there is an argument');
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
index 1a5551c..14b6c17 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
@@ -64,7 +64,7 @@ public function testFieldBoolean() {
$this->assertEqual(t('False'), $view->field['age']->advancedRender($view->result[0]));
$this->assertEqual(t('True'), $view->field['age']->advancedRender($view->result[1]));
- // test awesome unicode.
+ // Test awesome unicode.
$view->field['age']->options['type'] = 'unicode-yes-no';
$this->assertEqual('✖', $view->field['age']->advancedRender($view->result[0]));
$this->assertEqual('✔', $view->field['age']->advancedRender($view->result[1]));
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
index 7721479..1bd99e7 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
@@ -123,7 +123,7 @@ public function testFilterNumericBetween() {
);
$this->assertIdenticalResultset($view, $resultset, $this->columnMap);
- // test not between
+ // Test not between
$view->destroy();
$view->setDisplay();
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 9672dc2..6c78ad7 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -336,7 +336,7 @@ public function providerTestRenderAsLinkWithPathAndOptions() {
// entity_type flag.
$entity_type_id = 'node';
$data[] = ['test-path', ['entity_type' => $entity_type_id], 'value'];
- // prefix
+ // Prefix
$data[] = ['test-path', ['prefix' => 'test_prefix'], 'value', 'test_prefixvalue'];
// suffix.
$data[] = ['test-path', ['suffix' => 'test_suffix'], 'value', 'valuetest_suffix'];
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 94c519e..a237101 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -90,11 +90,11 @@ function template_preprocess_views_view_fields(&$variables) {
// Loop through the fields for this view.
$previous_inline = FALSE;
- $variables['fields'] = array(); // ensure it's at least an empty array.
+ $variables['fields'] = array(); // Ensure it's at least an empty array.
/** @var \Drupal\views\ResultRow $row */
$row = $variables['row'];
foreach ($view->field as $id => $field) {
- // render this even if set to exclude so it can be used elsewhere.
+ // Render this even if set to exclude so it can be used elsewhere.
$field_output = $view->style_plugin->getField($row->index, $id);
$empty = $field->isValueEmpty($field_output, $field->options['empty_zero']);
if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($variables['options']['hide_empty'])))) {
@@ -123,7 +123,7 @@ function template_preprocess_views_view_fields(&$variables) {
$object->raw = $row->{$view->field[$id]->field_alias};
}
else {
- $object->raw = NULL; // make sure it exists to reduce NOTICE
+ $object->raw = NULL; // Make sure it exists to reduce NOTICE
}
if (!empty($variables['options']['separator']) && $previous_inline && $object->inline && $object->content) {
diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index 3be2087..a2998c3 100644
--- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -91,13 +91,13 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
$relationship_options = array();
foreach ($relationships as $relationship) {
- // relationships can't link back to self. But also, due to ordering,
+ // Relationships can't link back to self. But also, due to ordering,
// relationships can only link to prior relationships.
if ($type == 'relationship' && $id == $relationship['id']) {
break;
}
$relationship_handler = Views::handlerManager('relationship')->getHandler($relationship);
- // ignore invalid/broken relationships.
+ // Ignore invalid/broken relationships.
if (empty($relationship_handler)) {
continue;
}
diff --git a/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
index 0487769..1d93508 100644
--- a/core/modules/views_ui/src/Form/Ajax/Rearrange.php
+++ b/core/modules/views_ui/src/Form/Ajax/Rearrange.php
@@ -156,7 +156,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Make an array with the weights
foreach ($form_state->getValue('fields') as $field => $info) {
- // add each value that is a field with a weight to our list, but only if
+ // Add each value that is a field with a weight to our list, but only if
// it has had its 'removed' checkbox checked.
if (is_array($info) && isset($info['weight']) && empty($info['removed'])) {
$order[$field] = $info['weight'];
diff --git a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
index e858a84..8d80ab6 100644
--- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
@@ -119,7 +119,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
),
);
- $form['remove_groups'][$id] = array(); // to prevent a notice
+ $form['remove_groups'][$id] = array(); // To prevent a notice
if ($id != 1) {
$form['remove_groups'][$id] = array(
'#type' => 'submit',
@@ -240,7 +240,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Make an array with the weights
foreach ($form_state->getValue('filters') as $field => $info) {
- // add each value that is a field with a weight to our list, but only if
+ // Add each value that is a field with a weight to our list, but only if
// it has had its 'removed' checkbox checked.
if (is_array($info) && empty($info['removed'])) {
if (isset($info['weight'])) {
diff --git a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
index 93bd049..54980f7 100644
--- a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
@@ -96,7 +96,7 @@ public function getForm(ViewEntityInterface $view, $display_id, $js) {
// being used.
Html::resetSeenIds();
- // check to see if this is the top form of the stack. If it is, pop
+ // Check to see if this is the top form of the stack. If it is, pop
// it off; if it isn't, the user clicked somewhere else and the stack is
// now irrelevant.
if (!empty($view->stack)) {
@@ -147,7 +147,7 @@ public function getForm(ViewEntityInterface $view, $display_id, $js) {
$response = $this->ajaxFormWrapper($form_class, $form_state);
}
elseif (!$form_state->get('ajax')) {
- // if nothing on the stack, non-js forms just go back to the main view editor.
+ // If nothing on the stack, non-js forms just go back to the main view editor.
$display_id = $form_state->get('display_id');
return new RedirectResponse($this->url('entity.view.edit_display_form', ['view' => $view->id(), 'display_id' => $display_id], ['absolute' => TRUE]));
}
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 6195c8c..3c22661 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -457,7 +457,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) {
}
$id = $this->getExecutable()->addHandler($display_id, $type, $table, $field);
- // check to see if we have group by settings
+ // Check to see if we have group by settings
$key = $type;
// Footer,header and empty text have a different internal handler type(area).
if (isset($types[$type]['type'])) {
@@ -472,7 +472,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) {
$this->addFormToStack('handler-group', $display_id, $type, $id);
}
- // check to see if this type has settings, if so add the settings form first
+ // Check to see if this type has settings, if so add the settings form first
if ($handler && $handler->hasExtraOptions()) {
$this->addFormToStack('handler-extra', $display_id, $type, $id);
}
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 5240aa7..0c9bec7 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -62,7 +62,7 @@ function views_ui_entity_type_build(array &$entity_types) {
*/
function views_ui_theme() {
return array(
- // edit a view
+ // Edit a view
'views_ui_display_tab_setting' => array(
'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()),
'file' => 'views_ui.theme.inc',
@@ -80,7 +80,7 @@ function views_ui_theme() {
'file' => 'views_ui.theme.inc',
),
- // list views
+ // List views
'views_ui_view_info' => array(
'variables' => array('view' => NULL, 'displays' => NULL),
'file' => 'views_ui.theme.inc',
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 129168a..7e6cf2a 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -69,6 +69,14 @@