Commit d5d0d6ce authored by alexpott's avatar alexpott
Browse files

Issue #2572777 by andypost, alexpott, attiks, andriyun: Fix...

Issue #2572777 by andypost, alexpott, attiks, andriyun: Fix 'Squiz.Strings.ConcatenationSpacing' coding standard
parent e0c2d965
...@@ -181,7 +181,7 @@ function _drupal_log_error($error, $fatal = FALSE) { ...@@ -181,7 +181,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
if ($fatal) { if ($fatal) {
// When called from CLI, simply output a plain text message. // When called from CLI, simply output a plain text message.
// Should not translate the string to avoid errors producing more errors. // Should not translate the string to avoid errors producing more errors.
$response->setContent(html_entity_decode(strip_tags(SafeMarkup::format('%type: @message in %function (line %line of %file).', $error))). "\n"); $response->setContent(html_entity_decode(strip_tags(SafeMarkup::format('%type: @message in %function (line %line of %file).', $error))) . "\n");
$response->send(); $response->send();
exit; exit;
} }
......
...@@ -227,7 +227,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) { ...@@ -227,7 +227,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
else { else {
_drupal_rewrite_settings_global($settings_settings, $data); _drupal_rewrite_settings_global($settings_settings, $data);
} }
$variable_names['$'. $setting] = $setting; $variable_names['$' . $setting] = $setting;
} }
$contents = file_get_contents($settings_file); $contents = file_get_contents($settings_file);
if ($contents !== FALSE) { if ($contents !== FALSE) {
...@@ -515,7 +515,7 @@ function drupal_install_config_directories() { ...@@ -515,7 +515,7 @@ function drupal_install_config_directories() {
// they can later be added to git. Since this directory is auto-created, we // they can later be added to git. Since this directory is auto-created, we
// have to write out the README rather than just adding it to the drupal core // have to write out the README rather than just adding it to the drupal core
// repo. // repo.
$text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.' .' For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config'; $text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.' . ' For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config';
file_put_contents(config_get_config_directory(CONFIG_SYNC_DIRECTORY) . '/README.txt', $text); file_put_contents(config_get_config_directory(CONFIG_SYNC_DIRECTORY) . '/README.txt', $text);
} }
......
...@@ -326,7 +326,7 @@ function update_get_update_list() { ...@@ -326,7 +326,7 @@ function update_get_update_list() {
$updates = array_combine($updates, $updates); $updates = array_combine($updates, $updates);
foreach (array_keys($updates) as $update) { foreach (array_keys($updates) as $update) {
if ($update == \Drupal::CORE_MINIMUM_SCHEMA_VERSION) { if ($update == \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
$ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.'; $ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.';
continue 2; continue 2;
} }
if ($update > $schema_version) { if ($update > $schema_version) {
......
...@@ -593,7 +593,7 @@ protected function getParameterAlternatives($name) { ...@@ -593,7 +593,7 @@ protected function getParameterAlternatives($name) {
*/ */
public function enterScope($name) { public function enterScope($name) {
if ('request' !== $name) { if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
} }
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
...@@ -604,7 +604,7 @@ public function enterScope($name) { ...@@ -604,7 +604,7 @@ public function enterScope($name) {
*/ */
public function leaveScope($name) { public function leaveScope($name) {
if ('request' !== $name) { if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
} }
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
...@@ -617,7 +617,7 @@ public function addScope(ScopeInterface $scope) { ...@@ -617,7 +617,7 @@ public function addScope(ScopeInterface $scope) {
$name = $scope->getName(); $name = $scope->getName();
if ('request' !== $name) { if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
} }
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
} }
...@@ -627,7 +627,7 @@ public function addScope(ScopeInterface $scope) { ...@@ -627,7 +627,7 @@ public function addScope(ScopeInterface $scope) {
*/ */
public function hasScope($name) { public function hasScope($name) {
if ('request' !== $name) { if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
} }
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
...@@ -637,7 +637,7 @@ public function hasScope($name) { ...@@ -637,7 +637,7 @@ public function hasScope($name) {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function isScopeActive($name) { public function isScopeActive($name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__)); throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
} }
......
...@@ -251,7 +251,7 @@ public function sentences($min_word_count, $capitalize = FALSE) { ...@@ -251,7 +251,7 @@ public function sentences($min_word_count, $capitalize = FALSE) {
public function paragraphs($paragraph_count = 12) { public function paragraphs($paragraph_count = 12) {
$output = ''; $output = '';
for ($i = 1; $i <= $paragraph_count; $i++) { for ($i = 1; $i <= $paragraph_count; $i++) {
$output .= $this->sentences(mt_rand(20, 60)) ."\n\n"; $output .= $this->sentences(mt_rand(20, 60)) . "\n\n";
} }
return $output; return $output;
} }
...@@ -291,7 +291,7 @@ public function image($destination, $min_resolution, $max_resolution) { ...@@ -291,7 +291,7 @@ public function image($destination, $min_resolution, $max_resolution) {
$smaller_dimension = ($smaller_dimension % 2) ? $smaller_dimension : $smaller_dimension; $smaller_dimension = ($smaller_dimension % 2) ? $smaller_dimension : $smaller_dimension;
imageellipse($im, $width / 2, $height / 2, $smaller_dimension, $smaller_dimension, $color); imageellipse($im, $width / 2, $height / 2, $smaller_dimension, $smaller_dimension, $color);
$save_function = 'image'. ($extension == 'jpg' ? 'jpeg' : $extension); $save_function = 'image' . ($extension == 'jpg' ? 'jpeg' : $extension);
$save_function($im, $destination); $save_function($im, $destination);
return $destination; return $destination;
} }
......
...@@ -19,7 +19,7 @@ class AssetDumper implements AssetDumperInterface { ...@@ -19,7 +19,7 @@ class AssetDumper implements AssetDumperInterface {
public function dump($data, $file_extension) { public function dump($data, $file_extension) {
// Prefix filename to prevent blocking by firewalls which reject files // Prefix filename to prevent blocking by firewalls which reject files
// starting with "ad*". // starting with "ad*".
$filename = $file_extension. '_' . Crypt::hashBase64($data) . '.' . $file_extension; $filename = $file_extension . '_' . Crypt::hashBase64($data) . '.' . $file_extension;
// Create the css/ or js/ path within the files folder. // Create the css/ or js/ path within the files folder.
$path = 'public://' . $file_extension; $path = 'public://' . $file_extension;
$uri = $path . '/' . $filename; $uri = $path . '/' . $filename;
......
...@@ -214,7 +214,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { ...@@ -214,7 +214,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
// hook_library_info_alter(). Additionally add the current language to // hook_library_info_alter(). Additionally add the current language to
// support translation of JavaScript files via hook_js_alter(). // support translation of JavaScript files via hook_js_alter().
$libraries_to_load = $this->getLibrariesToLoad($assets); $libraries_to_load = $this->getLibrariesToLoad($assets);
$cid = 'js:' . $theme_info->getName() . ':' . $this->languageManager->getCurrentLanguage()->getId() . ':' . Crypt::hashBase64(serialize($libraries_to_load) . serialize($assets->getLibraries())) . (int) (count($assets->getSettings()) > 0) . (int) $optimize; $cid = 'js:' . $theme_info->getName() . ':' . $this->languageManager->getCurrentLanguage()->getId() . ':' . Crypt::hashBase64(serialize($libraries_to_load) . serialize($assets->getLibraries())) . (int) (count($assets->getSettings()) > 0) . (int) $optimize;
if ($cached = $this->cache->get($cid)) { if ($cached = $this->cache->get($cid)) {
list($js_assets_header, $js_assets_footer, $settings, $settings_in_header) = $cached->data; list($js_assets_header, $js_assets_footer, $settings, $settings_in_header) = $cached->data;
......
...@@ -163,7 +163,7 @@ protected function loadNestedFile($matches) { ...@@ -163,7 +163,7 @@ protected function loadNestedFile($matches) {
$directory = dirname($filename); $directory = dirname($filename);
// If the file is in the current directory, make sure '.' doesn't appear in // If the file is in the current directory, make sure '.' doesn't appear in
// the url() path. // the url() path.
$directory = $directory == '.' ? '' : $directory .'/'; $directory = $directory == '.' ? '' : $directory . '/';
// Alter all internal url() paths. Leave external paths alone. We don't need // Alter all internal url() paths. Leave external paths alone. We don't need
// to normalize absolute paths here because that will be done later. // to normalize absolute paths here because that will be done later.
......
...@@ -442,7 +442,7 @@ public function groupBy($field, $langcode = NULL) { ...@@ -442,7 +442,7 @@ public function groupBy($field, $langcode = NULL) {
* The alias for the field. * The alias for the field.
*/ */
protected function getAggregationAlias($field, $function) { protected function getAggregationAlias($field, $function) {
return strtolower($field . '_'. $function); return strtolower($field . '_' . $function);
} }
/** /**
......
...@@ -94,7 +94,7 @@ public function onResponse(FilterResponseEvent $event) { ...@@ -94,7 +94,7 @@ public function onResponse(FilterResponseEvent $event) {
// the JSON data by making it the value of a textarea. // the JSON data by making it the value of a textarea.
// @see http://malsup.com/jquery/form/#file-upload // @see http://malsup.com/jquery/form/#file-upload
// @see https://www.drupal.org/node/1009382 // @see https://www.drupal.org/node/1009382
$response->setContent('<textarea>' . $response->getContent() . '</textarea>'); $response->setContent('<textarea>' . $response->getContent() . '</textarea>');
} }
// User-uploaded files cannot set any response headers, so a custom header // User-uploaded files cannot set any response headers, so a custom header
......
...@@ -143,7 +143,7 @@ public function __construct(Connection $connection, StateInterface $state, Curre ...@@ -143,7 +143,7 @@ public function __construct(Connection $connection, StateInterface $state, Curre
public function getRouteCollectionForRequest(Request $request) { public function getRouteCollectionForRequest(Request $request) {
// Cache both the system path as well as route parameters and matching // Cache both the system path as well as route parameters and matching
// routes. // routes.
$cid = 'route:' . $request->getPathInfo() . ':' . $request->getQueryString(); $cid = 'route:' . $request->getPathInfo() . ':' . $request->getQueryString();
if ($cached = $this->cache->get($cid)) { if ($cached = $this->cache->get($cid)) {
$this->currentPath->setPath($cached->data['path'], $request); $this->currentPath->setPath($cached->data['path'], $request);
$request->query->replace($cached->data['query']); $request->query->replace($cached->data['query']);
......
...@@ -188,7 +188,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens, ...@@ -188,7 +188,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens,
if ('variable' === $token[0]) { if ('variable' === $token[0]) {
if (!$optional || !array_key_exists($token[3], $defaults) || (isset($mergedParams[$token[3]]) && (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]])) { if (!$optional || !array_key_exists($token[3], $defaults) || (isset($mergedParams[$token[3]]) && (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]])) {
// check requirement // check requirement
if (!preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) { if (!preg_match('#^' . $token[2] . '$#', $mergedParams[$token[3]])) {
$message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]); $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
throw new InvalidParameterException($message); throw new InvalidParameterException($message);
} }
...@@ -232,7 +232,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens, ...@@ -232,7 +232,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens,
if ($query_params && $query = http_build_query($query_params, '', '&')) { if ($query_params && $query = http_build_query($query_params, '', '&')) {
// "/" and "?" can be left decoded for better user experience, see // "/" and "?" can be left decoded for better user experience, see
// http://tools.ietf.org/html/rfc3986#section-3.4 // http://tools.ietf.org/html/rfc3986#section-3.4
$url .= '?'.strtr($query, array('%2F' => '/')); $url .= '?' . strtr($query, array('%2F' => '/'));
} }
return $url; return $url;
......
...@@ -16,13 +16,13 @@ function automated_cron_help($route_name, RouteMatchInterface $route_match) { ...@@ -16,13 +16,13 @@ function automated_cron_help($route_name, RouteMatchInterface $route_match) {
case 'help.page.automated_cron': case 'help.page.automated_cron':
$output = ''; $output = '';
$output .= '<h3>' . t('About') . '</h3>'; $output .= '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('The Automated Cron module runs cron operations for your site using normal browser/page requests instead of having to set up a separate cron job. The Automated Cron module checks at the end of each server response when cron operation was last ran and, if it has been too long since last run, it executes the cron tasks after sending a server response. For more information, see the <a href=":automated_cron-documentation">online documentation for the Automated Cron module</a>.', [':automated_cron-documentation' => 'https://www.drupal.org/documentation/modules/automated_cron']) . '</p>'; $output .= '<p>' . t('The Automated Cron module runs cron operations for your site using normal browser/page requests instead of having to set up a separate cron job. The Automated Cron module checks at the end of each server response when cron operation was last ran and, if it has been too long since last run, it executes the cron tasks after sending a server response. For more information, see the <a href=":automated_cron-documentation">online documentation for the Automated Cron module</a>.', [':automated_cron-documentation' => 'https://www.drupal.org/documentation/modules/automated_cron']) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>'; $output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>'; $output .= '<dl>';
$output .= '<dt>' . t('Configuring Automated Cron') . '</dt>'; $output .= '<dt>' . t('Configuring Automated Cron') . '</dt>';
$output .= '<dd>' . t('On the <a href=":cron-settings">Cron page</a>, you can set the frequency (time interval) for running cron jobs.', [':cron-settings' => \Drupal::url('system.cron_settings')]) . '</dd>'; $output .= '<dd>' . t('On the <a href=":cron-settings">Cron page</a>, you can set the frequency (time interval) for running cron jobs.', [':cron-settings' => \Drupal::url('system.cron_settings')]) . '</dd>';
$output .= '<dt>' . t('Disabling Automated Cron') . '</dt>'; $output .= '<dt>' . t('Disabling Automated Cron') . '</dt>';
$output .= '<dd>' . t('To disable automated cron, the recommended method is to uninstall the module, to reduce site overhead. If you only want to disable it temporarily, you can set the frequency to Never on the Cron page, and then change the frequency back when you want to start it up again.') . '</dd>'; $output .= '<dd>' . t('To disable automated cron, the recommended method is to uninstall the module, to reduce site overhead. If you only want to disable it temporarily, you can set the frequency to Never on the Cron page, and then change the frequency back when you want to start it up again.') . '</dd>';
$output .= '</dl>'; $output .= '</dl>';
return $output; return $output;
} }
......
...@@ -221,7 +221,7 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra ...@@ -221,7 +221,7 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra
*/ */
protected static function createBigPipeNoJsPlaceholder($original_placeholder, array $placeholder_render_array, $placeholder_must_be_attribute_safe = FALSE) { protected static function createBigPipeNoJsPlaceholder($original_placeholder, array $placeholder_render_array, $placeholder_must_be_attribute_safe = FALSE) {
if (!$placeholder_must_be_attribute_safe) { if (!$placeholder_must_be_attribute_safe) {
$big_pipe_placeholder = '<div data-big-pipe-nojs-placeholder-id="' . Html::escape(static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array)) . '"></div>'; $big_pipe_placeholder = '<div data-big-pipe-nojs-placeholder-id="' . Html::escape(static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array)) . '"></div>';
} }
else { else {
$big_pipe_placeholder = 'big_pipe_nojs_placeholder_attribute_safe:' . Html::escape($original_placeholder); $big_pipe_placeholder = 'big_pipe_nojs_placeholder_attribute_safe:' . Html::escape($original_placeholder);
......
...@@ -138,7 +138,7 @@ public function prepareRow(Row $row) { ...@@ -138,7 +138,7 @@ public function prepareRow(Row $row) {
$settings['book']['block_mode'] = $this->variableGet('book_block_mode', 'all pages'); $settings['book']['block_mode'] = $this->variableGet('book_block_mode', 'all pages');
break; break;
case 'forum': case 'forum':
$settings['forum']['block_num'] = $this->variableGet('forum_block_num_'. $delta, 5); $settings['forum']['block_num'] = $this->variableGet('forum_block_num_' . $delta, 5);
break; break;
case 'statistics': case 'statistics':
foreach (array('statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num') as $name) { foreach (array('statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num') as $name) {
......
...@@ -69,7 +69,7 @@ function testBlockRenderOrder() { ...@@ -69,7 +69,7 @@ function testBlockRenderOrder() {
foreach ($controller->loadMultiple() as $return_block) { foreach ($controller->loadMultiple() as $return_block) {
$id = $return_block->id(); $id = $return_block->id();
if ($return_block_weight = $return_block->getWeight()) { if ($return_block_weight = $return_block->getWeight()) {
$this->assertTrue($test_blocks[$id]['weight'] == $return_block_weight, 'Block weight is set as "' . $return_block_weight . '" for ' . $id . ' block.'); $this->assertTrue($test_blocks[$id]['weight'] == $return_block_weight, 'Block weight is set as "' . $return_block_weight . '" for ' . $id . ' block.');
$position[$id] = strpos($test_content, Html::getClass('block-' . $test_blocks[$id]['id'])); $position[$id] = strpos($test_content, Html::getClass('block-' . $test_blocks[$id]['id']));
} }
} }
......
...@@ -119,12 +119,12 @@ function testBlockAdminUiPage() { ...@@ -119,12 +119,12 @@ function testBlockAdminUiPage() {
foreach ($this->blockValues as $values) { foreach ($this->blockValues as $values) {
// Check if the region and weight settings changes have persisted. // Check if the region and weight settings changes have persisted.
$this->assertOptionSelected( $this->assertOptionSelected(
'edit-blocks-' . $values['settings']['id'] . '-region', 'edit-blocks-' . $values['settings']['id'] . '-region',
'header', 'header',
'The block "' . $label . '" has the correct region assignment (header).' 'The block "' . $label . '" has the correct region assignment (header).'
); );
$this->assertOptionSelected( $this->assertOptionSelected(
'edit-blocks-' . $values['settings']['id'] . '-weight', 'edit-blocks-' . $values['settings']['id'] . '-weight',
$values['test_weight'], $values['test_weight'],
'The block "' . $label . '" has the correct weight assignment (' . $values['test_weight'] . ').' 'The block "' . $label . '" has the correct weight assignment (' . $values['test_weight'] . ').'
); );
......
...@@ -25,12 +25,12 @@ function block_content_test_block_content_view(array &$build, BlockContent $bloc ...@@ -25,12 +25,12 @@ function block_content_test_block_content_view(array &$build, BlockContent $bloc
*/ */
function block_content_test_block_content_presave(BlockContent $block_content) { function block_content_test_block_content_presave(BlockContent $block_content) {
if ($block_content->label() == 'testing_block_content_presave') { if ($block_content->label() == 'testing_block_content_presave') {
$block_content->setInfo($block_content->label() .'_presave'); $block_content->setInfo($block_content->label() . '_presave');
} }
// Determine changes. // Determine changes.
if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') { if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') {
if ($block_content->original->label() != $block_content->label()) { if ($block_content->original->label() != $block_content->label()) {
$block_content->setInfo($block_content->label() .'_presave'); $block_content->setInfo($block_content->label() . '_presave');
// Drupal 1.0 release. // Drupal 1.0 release.
$block_content->changed = 979534800; $block_content->changed = 979534800;
} }
...@@ -44,7 +44,7 @@ function block_content_test_block_content_update(BlockContent $block_content) { ...@@ -44,7 +44,7 @@ function block_content_test_block_content_update(BlockContent $block_content) {
// Determine changes on update. // Determine changes on update.
if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') { if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') {
if ($block_content->original->label() != $block_content->label()) { if ($block_content->original->label() != $block_content->label()) {
$block_content->setInfo($block_content->label() .'_update'); $block_content->setInfo($block_content->label() . '_update');
} }
} }
} }
......
...@@ -15,7 +15,7 @@ function breakpoint_help($route_name, RouteMatchInterface $route_match) { ...@@ -15,7 +15,7 @@ function breakpoint_help($route_name, RouteMatchInterface $route_match) {
case 'help.page.breakpoint': case 'help.page.breakpoint':
$output = ''; $output = '';
$output .= '<h3>' . t('About') . '</h3>'; $output .= '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('The Breakpoint module keeps track of the height, width, and resolution breakpoints where a responsive design needs to change in order to respond to different devices being used to view the site. This module does not have a user interface. For more information, see the <a href=":docs">online documentation for the Breakpoint module</a>.', array(':docs' => 'https://www.drupal.org/documentation/modules/breakpoint')) . '</p>'; $output .= '<p>' . t('The Breakpoint module keeps track of the height, width, and resolution breakpoints where a responsive design needs to change in order to respond to different devices being used to view the site. This module does not have a user interface. For more information, see the <a href=":docs">online documentation for the Breakpoint module</a>.', array(':docs' => 'https://www.drupal.org/documentation/modules/breakpoint')) . '</p>';
$output .= '<h4>' . t('Terminology') . '</h4>'; $output .= '<h4>' . t('Terminology') . '</h4>';
$output .= '<dl>'; $output .= '<dl>';
$output .= '<dt>' . t('Breakpoint') . '</dt>'; $output .= '<dt>' . t('Breakpoint') . '</dt>';
......
...@@ -104,7 +104,7 @@ public function testCommentNewCommentsIndicator() { ...@@ -104,7 +104,7 @@ public function testCommentNewCommentsIndicator() {
// value, the drupal.node-new-comments-link library would determine that the // value, the drupal.node-new-comments-link library would determine that the
// node received a comment after the user last viewed it, and hence it would // node received a comment after the user last viewed it, and hence it would
// perform an HTTP request to render the "new comments" node link. // perform an HTTP request to render the "new comments" node link.
$this->assertIdentical(1, count($this->xpath('//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-history-node-last-comment-timestamp attribute is set to the correct value.'); $this->assertIdentical(1, count($this->xpath('//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-history-node-last-comment-timestamp attribute is set to the correct value.');
$this->assertIdentical(1, count($this->xpath('//*[@data-history-node-field-name="comment"]')), 'data-history-node-field-name attribute is set to the correct value.'); $this->assertIdentical(1, count($this->xpath('//*[@data-history-node-field-name="comment"]')), 'data-history-node-field-name attribute is set to the correct value.');
// The data will be pre-seeded on this particular page in drupalSettings, to // The data will be pre-seeded on this particular page in drupalSettings, to
// avoid the need for the client to make a separate request to the server. // avoid the need for the client to make a separate request to the server.
......
Markdown is supported
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