Skip to content
Snippets Groups Projects
Commit 8ea1c48e authored by catch's avatar catch
Browse files

Issue #2902412 by Jo Fitzgerald, andypost, mfernea, andriyun: Fix... 

Issue #2902412 by Jo Fitzgerald, andypost, mfernea, andriyun: Fix 'Drupal.Strings.UnnecessaryStringConcat' coding standard
parent 6c8526b0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 55 deletions
core/lib/Drupal/Core/Asset/AssetResolver.php
+ 1
− 1
View file @ 8ea1c48e
......@@ -312,7 +312,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
$settings = $this->getJsSettingsAssets($assets);
// Allow modules to add cached JavaScript settings.
foreach ($this->moduleHandler->getImplementations('js_settings_build') as $module) {
$function = $module . '_' . 'js_settings_build';
$function = $module . '_js_settings_build';
$function($settings, $assets);
}
}
......
core/lib/Drupal/Core/Command/DbDumpCommand.php
+ 7
− 4
View file @ 8ea1c48e
......@@ -418,10 +418,13 @@ protected function getTableScript($table, array $schema, array $data) {
foreach ($data as $record) {
$insert .= "->values(" . Variable::export($record) . ")\n";
}
$output .= "\$connection->insert('" . $table . "')\n"
. "->fields(" . Variable::export(array_keys($schema['fields'])) . ")\n"
. $insert
. "->execute();\n\n";
$fields = Variable::export(array_keys($schema['fields']));
$output .= <<<EOT
\$connection->insert('$table')
->fields($fields)
{$insert}->execute();
EOT;
}
return $output;
}
......
core/lib/Drupal/Core/Entity/EntityTypeManager.php
+ 1
− 1
View file @ 8ea1c48e
......@@ -108,7 +108,7 @@ protected function findDefinitions() {
// Directly call the hook implementations to pass the definitions to them
// by reference, so new entity types can be added.
foreach ($this->moduleHandler->getImplementations('entity_type_build') as $module) {
$function = $module . '_' . 'entity_type_build';
$function = $module . '_entity_type_build';
$function($definitions);
}
foreach ($definitions as $plugin_id => $definition) {
......
core/lib/Drupal/Core/Render/theme.api.php
+ 1
− 1
View file @ 8ea1c48e
......@@ -715,7 +715,7 @@ function hook_theme_suggestions_alter(array &$suggestions, array $variables, $ho
*/
function hook_theme_suggestions_HOOK_alter(array &$suggestions, array $variables) {
if (empty($variables['header'])) {
$suggestions[] = 'hookname__' . 'no_header';
$suggestions[] = 'hookname__no_header';
}
}
......
core/modules/config/config.module
+ 1
− 1
View file @ 8ea1c48e
......@@ -70,7 +70,7 @@ function config_file_download($uri) {
$date = DateTime::createFromFormat('U', $request->server->get('REQUEST_TIME'));
$date_string = $date->format('Y-m-d-H-i');
$hostname = str_replace('.', '-', $request->getHttpHost());
$filename = 'config' . '-' . $hostname . '-' . $date_string . '.tar.gz';
$filename = 'config-' . $hostname . '-' . $date_string . '.tar.gz';
$disposition = 'attachment; filename="' . $filename . '"';
return [
'Content-disposition' => $disposition,
......
core/modules/config/tests/src/Functional/ConfigExportUITest.php
+ 1
− 1
View file @ 8ea1c48e
......@@ -57,7 +57,7 @@ public function testExport() {
$this->assertTrue($header_match, "Header with filename matches the expected format.");
// Extract the archive and verify it's not empty.
$file_path = file_directory_temp() . '/' . 'config.tar.gz';
$file_path = file_directory_temp() . '/config.tar.gz';
$archiver = new Tar($file_path);
$archive_contents = $archiver->listContents();
$this->assert(!empty($archive_contents), 'Downloaded archive file is not empty.');
......
core/modules/link/src/Plugin/migrate/process/FieldLink.php
+ 1
− 1
View file @ 8ea1c48e
......@@ -85,7 +85,7 @@ protected function canonicalizeUri($uri) {
$anchor = "(?:#[a-z0-9" . $link_ichars . "_\-\.~+%=&,$'():;*@\[\]\/\?]*)";
// The rest of the path for a standard URL.
$end = $directories . '?' . $query . '?' . $anchor . '?' . '$/i';
$end = $directories . '?' . $query . '?' . $anchor . '?$/i';
if (!preg_match($internal_pattern . $end, $uri)) {
$link_domains = '[a-z][a-z0-9-]{1,62}';
......
core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
+ 3
− 3
View file @ 8ea1c48e
......@@ -32,21 +32,21 @@ function theme_suggestions_test_theme_suggestions_alter(array &$suggestions, arr
*/
function theme_suggestions_test_theme_suggestions_theme_test_suggestions_alter(array &$suggestions, array $variables) {
\Drupal::messenger()->addStatus(__FUNCTION__ . '() executed.');
$suggestions[] = 'theme_test_suggestions__' . 'module_override';
$suggestions[] = 'theme_test_suggestions__module_override';
}
/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function theme_suggestions_test_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
$suggestions[] = 'theme_test_function_suggestions__' . 'module_override';
$suggestions[] = 'theme_test_function_suggestions__module_override';
}
/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function theme_suggestions_test_theme_suggestions_theme_test_specific_suggestions_alter(array &$suggestions, array $variables) {
$suggestions[] = 'theme_test_specific_suggestions__' . 'variant__foo';
$suggestions[] = 'theme_test_specific_suggestions__variant__foo';
}
/**
......
core/modules/system/tests/modules/theme_test/theme_test.module
+ 1
− 1
View file @ 8ea1c48e
......@@ -171,7 +171,7 @@ function theme_theme_test_function_suggestions($variables) {
* Implements hook_theme_suggestions_HOOK().
*/
function theme_test_theme_suggestions_theme_test_suggestion_provided(array $variables) {
return ['theme_test_suggestion_provided__' . 'foo'];
return ['theme_test_suggestion_provided__foo'];
}
/**
......
core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
+ 47
− 39
View file @ 8ea1c48e
......@@ -54,8 +54,8 @@ protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL
$result = MailFormatHelper::htmlToText($html, $allowed_tags);
$pass = $this->assertEqual($result, $text, Html::escape($message));
$verbose = 'html = <pre>' . $this->stringToHtml($html)
. '</pre><br />' . 'result = <pre>' . $this->stringToHtml($result)
. '</pre><br />' . 'expected = <pre>' . $this->stringToHtml($text)
. '</pre><br />result = <pre>' . $this->stringToHtml($result)
. '</pre><br />expected = <pre>' . $this->stringToHtml($text)
. '</pre>';
$this->verbose($verbose);
if (!$pass) {
......@@ -212,27 +212,30 @@ public function testDrupalHtmltoTextCollapsesWhitespace() {
* (at least) a newline in the plaintext version.
*/
public function testDrupalHtmlToTextBlockTagToNewline() {
$input = '[text]'
. '<blockquote>[blockquote]</blockquote>'
. '<br />[br]'
. '<dl><dt>[dl-dt]</dt>'
. '<dt>[dt]</dt>'
. '<dd>[dd]</dd>'
. '<dd>[dd-dl]</dd></dl>'
. '<h1>[h1]</h1>'
. '<h2>[h2]</h2>'
. '<h3>[h3]</h3>'
. '<h4>[h4]</h4>'
. '<h5>[h5]</h5>'
. '<h6>[h6]</h6>'
. '<hr />[hr]'
. '<ol><li>[ol-li]</li>'
. '<li>[li]</li>'
. '<li>[li-ol]</li></ol>'
. '<p>[p]</p>'
. '<ul><li>[ul-li]</li>'
. '<li>[li-ul]</li></ul>'
. '[text]';
$input = <<<'EOT'
[text]
<blockquote>[blockquote]</blockquote>
<br />[br]
<dl><dt>[dl-dt]</dt>
<dt>[dt]</dt>
<dd>[dd]</dd>
<dd>[dd-dl]</dd></dl>
<h1>[h1]</h1>
<h2>[h2]</h2>
<h3>[h3]</h3>
<h4>[h4]</h4>
<h5>[h5]</h5>
<h6>[h6]</h6>
<hr />[hr]
<ol><li>[ol-li]</li>
<li>[li]</li>
<li>[li-ol]</li></ol>
<p>[p]</p>
<ul><li>[ul-li]</li>
<li>[li-ul]</li></ul>
[text]
EOT;
$input = str_replace(["\r", "\n"], '', $input);
$output = MailFormatHelper::htmlToText($input);
$pass = $this->assertFalse(
preg_match('/\][^\n]*\[/s', $output),
......@@ -288,23 +291,28 @@ public function testHeaderSeparation() {
*/
public function testFootnoteReferences() {
global $base_path, $base_url;
$source = '<a href="http://www.example.com/node/1">Host and path</a>'
. '<br /><a href="http://www.example.com">Host, no path</a>'
. '<br /><a href="' . $base_path . 'node/1">Path, no host</a>'
. '<br /><a href="node/1">Relative path</a>';
$source = <<<EOT
<a href="http://www.example.com/node/1">Host and path</a>
<br /><a href="http://www.example.com">Host, no path</a>
<br /><a href="{$base_path}node/1">Path, no host</a>
<br /><a href="node/1">Relative path</a>
EOT;
$source = str_replace(["\r", "\n"], '', $source);
// @todo Footnote URLs should be absolute.
$tt = "Host and path [1]"
. "\nHost, no path [2]"
// @todo The following two references should be combined.
. "\nPath, no host [3]"
. "\nRelative path [4]"
. "\n"
. "\n[1] http://www.example.com/node/1"
. "\n[2] http://www.example.com"
// @todo The following two references should be combined.
. "\n[3] $base_url/node/1"
. "\n[4] node/1\n";
$this->assertHtmlToText($source, $tt, 'Footnotes');
// @todo The last two references should be combined.
$text = <<<EOT
Host and path [1]
Host, no path [2]
Path, no host [3]
Relative path [4]
[1] http://www.example.com/node/1
[2] http://www.example.com
[3] $base_url/node/1
[4] node/1
EOT;
$this->assertHtmlToText($source, $text, 'Footnotes');
}
/**
......
core/modules/user/src/Plugin/views/field/Roles.php
+ 2
− 2
View file @ 8ea1c48e
......@@ -101,8 +101,8 @@ protected function documentSelfTokens(&$tokens) {
protected function addSelfTokens(&$tokens, $item) {
if (!empty($item['role'])) {
$tokens['{{ ' . $this->options['id'] . '__role' . ' }}'] = $item['role'];
$tokens['{{ ' . $this->options['id'] . '__rid' . ' }}'] = $item['rid'];
$tokens['{{ ' . $this->options['id'] . '__role }}'] = $item['role'];
$tokens['{{ ' . $this->options['id'] . '__rid }}'] = $item['rid'];
}
}
......
core/phpcs.xml.dist
+ 1
− 0
View file @ 8ea1c48e
......@@ -130,6 +130,7 @@
<rule ref="Drupal.Semantics.PregSecurity"/>
<rule ref="Drupal.Semantics.TInHookMenu"/>
<rule ref="Drupal.Semantics.TInHookSchema"/>
<rule ref="Drupal.Strings.UnnecessaryStringConcat"/>
<rule ref="Drupal.WhiteSpace.CloseBracketSpacing"/>
<rule ref="Drupal.WhiteSpace.Comma"/>
<rule ref="Drupal.WhiteSpace.EmptyLines"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment