diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php index ee8bc1c..d759f03 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php @@ -72,7 +72,7 @@ protected function connect() { catch (\Exception $e) { // Detect utf8mb4 incompability. if ($e->getCode() == Connection::UNSUPPORTED_CHARSET) { - $this->fail(t('Your MySQL server and PHP MySQL driver must support utf8mb4 character encoding. Make sure to use a database system that supports this (such as MySQL/MariaDB/Percona 5.5.3 and up), and that the utf8mb4 character set is compiled in. See the MySQL documentation for more information.', array('@documentation' => 'https://dev.mysql.com/doc/refman/5.0/en/cannot-initialize-character-set.html'))); + $this->fail(t('Your MySQL server and PHP MySQL driver must support utf8mb4 character encoding. Make sure to use a database system that supports this (such as MySQL/MariaDB/Percona 5.5.3 and up), and that the utf8mb4 character set is compiled in. See the MySQL documentation for more information.', array(':documentation' => 'https://dev.mysql.com/doc/refman/5.0/en/cannot-initialize-character-set.html'))); $info = Database::getConnectionInfo(); $info_copy = $info; // Set a flag to fall back to utf8. Note: this flag should only be diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php index 8f2fdb7..423b4f8 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php @@ -14,4 +14,4 @@ public function forUpdate($set = TRUE) { // SQLite does not support FOR UPDATE so nothing to do. return $this; } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 92071da..3ee9a8e 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -116,7 +116,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) { // settings page. if ($route_match->getRouteName() != 'system.site_maintenance_mode') { if ($this->account->hasPermission('administer site configuration')) { - $this->drupalSetMessage($this->t('Operating in maintenance mode. Go online.', array('@url' => $this->urlGenerator->generate('system.site_maintenance_mode'))), 'status', FALSE); + $this->drupalSetMessage($this->t('Operating in maintenance mode. Go online.', array(':url' => $this->urlGenerator->generate('system.site_maintenance_mode'))), 'status', FALSE); } else { $this->drupalSetMessage($this->t('Operating in maintenance mode.'), 'status', FALSE); diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php index fef4c32..c495ab4 100644 --- a/core/lib/Drupal/Core/Extension/module.api.php +++ b/core/lib/Drupal/Core/Extension/module.api.php @@ -950,13 +950,13 @@ function hook_requirements($phase) { } else { $requirements['cron'] = array( - 'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for configuring cron jobs.', array('@url' => 'https://www.drupal.org/cron')), + 'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for configuring cron jobs.', array(':url' => 'https://www.drupal.org/cron')), 'severity' => REQUIREMENT_ERROR, 'value' => t('Never run'), ); } - $requirements['cron']['description'] .= ' ' . t('You can run cron manually.', array('@cron' => \Drupal::url('system.run_cron'))); + $requirements['cron']['description'] .= ' ' . t('You can run cron manually.', array(':cron' => \Drupal::url('system.run_cron'))); $requirements['cron']['title'] = t('Cron maintenance tasks'); } diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php index 36bfe15..4f94d29 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php @@ -126,7 +126,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) { $elements['custom_date_format'] = array( '#type' => 'textfield', '#title' => $this->t('Custom date format'), - '#description' => $this->t('See the documentation for PHP date formats.', ['@url' => 'http://php.net/manual/function.date.php']), + '#description' => $this->t('See the documentation for PHP date formats.', [':url' => 'http://php.net/manual/function.date.php']), '#default_value' => $this->getSetting('custom_date_format') ?: '', ); diff --git a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php index 7bc0f1c..e83ecc1 100644 --- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php +++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php @@ -63,7 +63,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { if (!$this->getRequest()->isSecure()) { $form['information']['https_warning'] = array( '#prefix' => '
', - '#markup' => $this->t('WARNING: You are not using an encrypted connection, so your password will be sent in plain text. Learn more.', array('@https-link' => 'https://www.drupal.org/https-information')), + '#markup' => $this->t('WARNING: You are not using an encrypted connection, so your password will be sent in plain text. Learn more.', array(':https-link' => 'https://www.drupal.org/https-information')), '#suffix' => '
', ); } @@ -179,7 +179,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { catch (\Exception $e) { // The format of this error message is similar to that used on the // database connection form in the installer. - $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message: !message For more help installing or updating code on your server, see the handbook.', array( + $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message: !message For more help installing or updating code on your server, see the handbook.', array( '!message' => '

' . $e->getMessage() . '

', ':handbook_url' => 'https://www.drupal.org/documentation/install/modules-themes', ))); diff --git a/core/lib/Drupal/Core/Form/FormValidator.php b/core/lib/Drupal/Core/Form/FormValidator.php index 10678e3..9701ddd 100644 --- a/core/lib/Drupal/Core/Form/FormValidator.php +++ b/core/lib/Drupal/Core/Form/FormValidator.php @@ -133,7 +133,7 @@ public function setInvalidTokenError(FormStateInterface $form_state) { $url = $this->requestStack->getCurrentRequest()->getRequestUri(); // Setting this error will cause the form to fail validation. - $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then reload this page.', array('@link' => $url))); + $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then reload this page.', array(':link' => $url))); } /** diff --git a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php index 5634000..5d62735 100644 --- a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php +++ b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php @@ -137,7 +137,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // successfully.) $post_params = $this->getRequest()->request->all(); if (empty($post_params) && (!drupal_verify_install_file($this->root . '/' . $settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file($this->root . '/' . $settings_dir, FILE_NOT_WRITABLE, 'dir'))) { - drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the online handbook.', array('%dir' => $settings_dir, '%file' => $settings_file, '@handbook_url' => 'https://www.drupal.org/server-permissions')), 'warning'); + drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the online handbook.', array('%dir' => $settings_dir, '%file' => $settings_file, ':handbook_url' => 'https://www.drupal.org/server-permissions')), 'warning'); } $form['#attached']['library'][] = 'system/drupal.system'; @@ -227,7 +227,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 2 => $this->t('Receive email notifications'), ), '#default_value' => array(1, 2), - '#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to Drupal.org.', array('@drupal' => 'https://www.drupal.org')), + '#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to Drupal.org.', array(':drupal' => 'https://www.drupal.org')), '#weight' => 15, ); $form['update_notifications']['update_status_module'][2] = array( diff --git a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php index 733c449..e29d3ff 100644 --- a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php +++ b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php @@ -31,7 +31,7 @@ * However, for links enclosed in translatable text you should use t() and * embed the HTML anchor tag directly in the translated string. For example: * @code - * $text = t('Visit the content types page', array('@url' => \Drupal::url('entity.node_type.collection'))); + * $text = t('Visit the content types page', array(':url' => \Drupal::url('entity.node_type.collection'))); * @endcode * This keeps the context of the link title ('settings' in the example) for * translators. diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install index 2b755e1..d65d0ce 100644 --- a/core/modules/aggregator/aggregator.install +++ b/core/modules/aggregator/aggregator.install @@ -18,7 +18,7 @@ function aggregator_requirements($phase) { ); if (!$has_curl) { $requirements['curl']['severity'] = REQUIREMENT_ERROR; - $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP cURL library is not available.', array('@curl_url' => 'http://php.net/manual/curl.setup.php')); + $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP cURL library is not available.', array(':curl_url' => 'http://php.net/manual/curl.setup.php')); } return $requirements; } diff --git a/core/modules/aggregator/src/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php index 00a43ce..b083156 100644 --- a/core/modules/aggregator/src/Controller/AggregatorController.php +++ b/core/modules/aggregator/src/Controller/AggregatorController.php @@ -168,7 +168,7 @@ public function adminOverview() { '#type' => 'table', '#header' => $header, '#rows' => $rows, - '#empty' => $this->t('No feeds available. Add feed.', array('@link' => $this->url('aggregator.feed_add'))), + '#empty' => $this->t('No feeds available. Add feed.', array(':link' => $this->url('aggregator.feed_add'))), ); return $build; diff --git a/core/modules/aggregator/src/Form/OpmlFeedAdd.php b/core/modules/aggregator/src/Form/OpmlFeedAdd.php index 357d0dc..e8fe944 100644 --- a/core/modules/aggregator/src/Form/OpmlFeedAdd.php +++ b/core/modules/aggregator/src/Form/OpmlFeedAdd.php @@ -87,7 +87,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => $this->t('Update interval'), '#default_value' => 3600, '#options' => $period, - '#description' => $this->t('The length of time between feed updates. Requires a correctly configured cron maintenance task.', array('@cron' => $this->url('system.status'))), + '#description' => $this->t('The length of time between feed updates. Requires a correctly configured cron maintenance task.', array(':cron' => $this->url('system.status'))), ); $form['actions'] = array('#type' => 'actions'); diff --git a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php index a42c39a..774adde 100644 --- a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php +++ b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php @@ -154,7 +154,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta '#title' => t('Discard items older than'), '#default_value' => $config->get('items.expire'), '#options' => $period, - '#description' => t('Requires a correctly configured cron maintenance task.', array('@cron' => $this->url('system.status'))), + '#description' => t('Requires a correctly configured cron maintenance task.', array(':cron' => $this->url('system.status'))), ); $lengths = array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000); diff --git a/core/modules/color/color.module b/core/modules/color/color.module index a8fe26b..77628c8 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -410,7 +410,7 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) { $memory_limit = ini_get('memory_limit'); $size = Bytes::toInt($memory_limit); if (!Environment::checkMemoryLimit($usage + $required, $memory_limit)) { - drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $size), '@url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error'); + drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $size), ':url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error'); return; } } diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php index d331a2b..0d02466 100644 --- a/core/modules/comment/src/CommentManager.php +++ b/core/modules/comment/src/CommentManager.php @@ -175,14 +175,14 @@ public function forbiddenMessage(EntityInterface $entity, $field_name) { if ($this->userConfig->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY) { // Users can register themselves. - return $this->t('Log in or register to post comments', array( + return $this->t('Log in or register to post comments', array( ':login' => $this->urlGenerator->generateFromRoute('user.login', array(), array('query' => $destination)), ':register' => $this->urlGenerator->generateFromRoute('user.register', array(), array('query' => $destination)), )); } else { // Only admins can add new users, no public registration. - return $this->t('Log in to post comments', array( + return $this->t('Log in to post comments', array( ':login' => $this->urlGenerator->generateFromRoute('user.login', array(), array('query' => $destination)), )); } diff --git a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php index c9e23e9..d1ecd10 100644 --- a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php +++ b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php @@ -187,7 +187,7 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state '#title' => t('Comment type'), '#options' => $options, '#required' => TRUE, - '#description' => $this->t('Select the Comment type to use for this comment field. Manage the comment types from the administration overview page.', array('@url' => $this->url('entity.comment_type.collection'))), + '#description' => $this->t('Select the Comment type to use for this comment field. Manage the comment types from the administration overview page.', array(:@url' => $this->url('entity.comment_type.collection'))), '#default_value' => $this->getSetting('comment_type'), '#disabled' => $has_data, ); diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationController.php b/core/modules/config_translation/src/Controller/ConfigTranslationController.php index 2dc7603..025603f 100644 --- a/core/modules/config_translation/src/Controller/ConfigTranslationController.php +++ b/core/modules/config_translation/src/Controller/ConfigTranslationController.php @@ -129,7 +129,7 @@ public function itemPage(Request $request, RouteMatchInterface $route_match, $pl $languages = $this->languageManager->getLanguages(); if (count($languages) == 1) { - drupal_set_message($this->t('In order to translate configuration, the website must have at least two languages.', array('@url' => $this->url('entity.configurable_language.collection'))), 'warning'); + drupal_set_message($this->t('In order to translate configuration, the website must have at least two languages.', array(':url' => $this->url('entity.configurable_language.collection'))), 'warning'); } $original_langcode = $mapper->getLangcode(); if (!isset($languages[$original_langcode])) { diff --git a/core/modules/config_translation/src/FormElement/DateFormat.php b/core/modules/config_translation/src/FormElement/DateFormat.php index db291f7..63b9eb1 100644 --- a/core/modules/config_translation/src/FormElement/DateFormat.php +++ b/core/modules/config_translation/src/FormElement/DateFormat.php @@ -20,7 +20,7 @@ class DateFormat extends FormElementBase { public function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) { /** @var \Drupal\Core\Datetime\DateFormatter $date_formatter */ $date_formatter = \Drupal::service('date.formatter'); - $description = $this->t('A user-defined date format. See the PHP manual for available options.', array('@url' => 'http://php.net/manual/function.date.php')); + $description = $this->t('A user-defined date format. See the PHP manual for available options.', array(':url' => 'http://php.net/manual/function.date.php')); $format = $this->t('Displayed as %date_format', array('%date_format' => $date_formatter->format(REQUEST_TIME, 'custom', $translation_config))); return [ diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php index 1abd33c..a8eaf6c 100644 --- a/core/modules/contact/src/Controller/ContactController.php +++ b/core/modules/contact/src/Controller/ContactController.php @@ -69,7 +69,7 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) { // If there are no forms, do not display the form. if (empty($contact_form)) { if ($this->currentUser()->hasPermission('administer contact forms')) { - drupal_set_message($this->t('The contact form has not been configured. Add one or more forms .', array( + drupal_set_message($this->t('The contact form has not been configured. Add one or more forms .', array( ':add' => $this->url('contact.form_add'))), 'error'); return array(); } diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 8449c9d..906964c 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -376,7 +376,7 @@ function content_translation_form_field_config_edit_form_alter(array &$form, For $toggle_url = \Drupal::url('language.content_settings_page', array(), array( 'query' => \Drupal::destination()->getAsArray(), )); - $form['translatable']['#description'] = t('To configure translation for this field, enable language support for this type.', array( + $form['translatable']['#description'] = t('To configure translation for this field, enable language support for this type.', array( ':language-settings-url' => $toggle_url, )); } diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php index 9b3669e..185c8cc 100644 --- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php +++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php @@ -84,7 +84,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) { $form['date_format'] = array( '#type' => 'textfield', '#title' => $this->t('Date/time format'), - '#description' => $this->t('See the documentation for PHP date formats.', ['@url' => 'http://php.net/manual/function.date.php']), + '#description' => $this->t('See the documentation for PHP date formats.', [':url' => 'http://php.net/manual/function.date.php']), '#default_value' => $this->getSetting('date_format'), ); diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 91c6038..2490f6d 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -101,7 +101,7 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo '#title' => t('Database log messages to keep'), '#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'), '#options' => array(0 => t('All')) + array_combine($row_limits, $row_limits), - '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', array('@cron' => \Drupal::url('system.status'))) + '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', array(':cron' => \Drupal::url('system.status'))) ); $form['#submit'][] = 'dblog_logging_settings_submit'; diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php index cdd56cc..7d0dba7 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php +++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php @@ -170,7 +170,7 @@ public function testFieldAdminHandler() { 'settings[handler]' => 'views', ); $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]'); - $this->assertRaw(t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( + $this->assertRaw(t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( ':create' => \Drupal::url('views_ui.add'), ':existing' => \Drupal::url('entity.view.collection'), ))); diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php index e807073..5605007 100644 --- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php +++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php @@ -153,7 +153,7 @@ public function form(array $form, FormStateInterface $form_state) { ); if (empty($field_definitions) && empty($extra_fields) && $route_info = FieldUI::getOverviewRouteInfo($this->entity->getTargetEntityTypeId(), $this->entity->getTargetBundle())) { - drupal_set_message($this->t('There are no fields yet added. You can add new fields on the Manage fields page.', array('@link' => $route_info->toString())), 'warning'); + drupal_set_message($this->t('There are no fields yet added. You can add new fields on the Manage fields page.', array(':link' => $route_info->toString())), 'warning'); return $form; } @@ -530,7 +530,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $display_mode_label = $display_modes[$mode]['label']; $url = $this->getOverviewUrl($mode); - drupal_set_message($this->t('The %display_mode mode now uses custom display settings. You might want to configure them.', ['%display_mode' => $display_mode_label, '@url' => $url->toString()])); + drupal_set_message($this->t('The %display_mode mode now uses custom display settings. You might want to configure them.', ['%display_mode' => $display_mode_label, ':url' => $url->toString()])); } $statuses[$mode] = !empty($value); } diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php index 9ed319f..a22f512 100644 --- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php +++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php @@ -388,7 +388,7 @@ function testNoFieldsDisplayOverview() { ))->save(); $this->drupalGet('admin/structure/types/manage/no_fields/display'); - $this->assertRaw(t('There are no fields yet added. You can add new fields on the Manage fields page.', array('@link' => \Drupal::url('entity.node.field_ui_fields', array('node_type' => 'no_fields'))))); + $this->assertRaw(t('There are no fields yet added. You can add new fields on the Manage fields page.', array(':link' => \Drupal::url('entity.node.field_ui_fields', array('node_type' => 'no_fields'))))); } /** diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 6188006..5030237 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -42,7 +42,7 @@ function filter_help($route_name, RouteMatchInterface $route_match) { return $output; case 'filter.admin_overview': - $output = '

' . t('Text formats define the HTML tags, code, and other formatting that can be used when entering text. Improper text format configuration is a security risk. Learn more on the Filter module help page.', array('@filterhelp' => \Drupal::url('help.page', array('name' => 'filter')))) . '

'; + $output = '

' . t('Text formats define the HTML tags, code, and other formatting that can be used when entering text. Improper text format configuration is a security risk. Learn more on the Filter module help page.', array(':filterhelp' => \Drupal::url('help.page', array('name' => 'filter')))) . '

'; $output .= '

' . t('Text formats are presented on content editing pages in the order defined on this page. The first format available to a user will be selected by default.') . '

'; return $output; diff --git a/core/modules/filter/src/FilterPermissions.php b/core/modules/filter/src/FilterPermissions.php index 1055fde..4f556fb 100644 --- a/core/modules/filter/src/FilterPermissions.php +++ b/core/modules/filter/src/FilterPermissions.php @@ -58,7 +58,7 @@ public function permissions() { foreach ($formats as $format) { if ($permission = $format->getPermissionName()) { $permissions[$permission] = [ - 'title' => $this->t('Use the @label text format', ['@url' => $format->url(), '@label' => $format->label()]), + 'title' => $this->t('Use the @label text format', [':url' => $format->url(), ':label' => $format->label()]), 'description' => [ '#prefix' => '', '#markup' => $this->t('Warning: This permission may have security implications depending on how the text format is configured.'), diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php index 4708cc6..b9015c2 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php +++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php @@ -100,7 +100,7 @@ public function tips($long = FALSE) { } $output .= '

' . $this->t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '

'; - $output .= '

' . $this->t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '

'; + $output .= '

' . $this->t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array(':html-specifications' => 'http://www.w3.org/TR/html/')) . '

'; $tips = array( 'a' => array($this->t('Anchors are used to make links to other pages.'), '' . Html::escape(\Drupal::config('system.site')->get('name')) . ''), 'br' => array($this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with
line break')), @@ -175,7 +175,7 @@ public function tips($long = FALSE) { $output .= drupal_render($table); $output .= '

' . $this->t('Most unusual characters can be directly entered without any problems.') . '

'; - $output .= '

' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '

'; + $output .= '

' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array(':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '

'; $entities = array( array($this->t('Ampersand'), '&'), diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index dae7fb5..4d3cce3 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -87,7 +87,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { unset($form['actions']['reset_alphabetical']); // Use the existing taxonomy overview submit handler. - $form['terms']['#empty'] = $this->t('No containers or forums available. Add container or Add forum.', array( + $form['terms']['#empty'] = $this->t('No containers or forums available. Add container or Add forum.', array( ':container' => $this->url('forum.add_container'), ':forum' => $this->url('forum.add_forum') )); diff --git a/core/modules/forum/src/ForumUninstallValidator.php b/core/modules/forum/src/ForumUninstallValidator.php index 9c6220d..9bfb4a3 100644 --- a/core/modules/forum/src/ForumUninstallValidator.php +++ b/core/modules/forum/src/ForumUninstallValidator.php @@ -76,7 +76,7 @@ public function validate($module) { $vocabulary = $this->getForumVocabulary(); if ($this->hasTermsForVocabulary($vocabulary)) { if ($vocabulary->access('view')) { - $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms', [ + $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms', [ '%vocabulary' => $vocabulary->label(), ':url' => $vocabulary->url('overview-form'), ]); diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php index dbccf77..55225a7 100644 --- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php +++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php @@ -212,7 +212,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) { '#weight' => 4.1, '#field_prefix' => '
', '#field_suffix' => '
', - '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of EXIF data in the image.', array('@url' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')), + '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of EXIF data in the image.', array(':url' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')), ); $element['max_resolution']['x'] = array( '#type' => 'number', diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 4729316..4b4dd70 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -56,8 +56,8 @@ function language_help($route_name, RouteMatchInterface $route_match) { return $output; case 'entity.configurable_language.collection': - $output = '

' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array('@detection' => \Drupal::url('language.negotiation'))) . '

'; - $output .= '

' . t('The site default language can also be set. It is not recommended to change the default language on a working site. Configure the Selected language setting on the detection and selection page to change the fallback language for language selection.', array('@language-detection' => \Drupal::url('language.negotiation'))) . '

'; + $output = '

' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array(':detection' => \Drupal::url('language.negotiation'))) . '

'; + $output .= '

' . t('The site default language can also be set. It is not recommended to change the default language on a working site. Configure the Selected language setting on the detection and selection page to change the fallback language for language selection.', array(':language-detection' => \Drupal::url('language.negotiation'))) . '

'; return $output; case 'language.add': diff --git a/core/modules/language/src/Element/LanguageConfiguration.php b/core/modules/language/src/Element/LanguageConfiguration.php index fc5263e..ae538ea 100644 --- a/core/modules/language/src/Element/LanguageConfiguration.php +++ b/core/modules/language/src/Element/LanguageConfiguration.php @@ -47,7 +47,7 @@ public static function processLanguageConfiguration(&$element, FormStateInterfac '#type' => 'select', '#title' => t('Default language'), '#options' => $options + static::getDefaultOptions(), - '#description' => t('Explanation of the language options is found on the languages list page.', array('@languages_list_page' => \Drupal::url('entity.configurable_language.collection'))), + '#description' => t('Explanation of the language options is found on the languages list page.', array(':languages_list_page' => \Drupal::url('entity.configurable_language.collection'))), '#default_value' => ($default_config != NULL) ? $default_config->getDefaultLangcode() : LanguageInterface::LANGCODE_SITE_DEFAULT, ); diff --git a/core/modules/language/src/Form/LanguageAddForm.php b/core/modules/language/src/Form/LanguageAddForm.php index b33c907..63a4c57 100644 --- a/core/modules/language/src/Form/LanguageAddForm.php +++ b/core/modules/language/src/Form/LanguageAddForm.php @@ -96,7 +96,7 @@ public function save(array $form, FormStateInterface $form_state) { if ($this->moduleHandler->moduleExists('block')) { // Tell the user they have the option to add a language switcher block // to their theme so they can switch between the languages. - drupal_set_message($this->t('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the block administration page.', array('@block-admin' => $this->url('block.admin_display')))); + drupal_set_message($this->t('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the block administration page.', array(':block-admin' => $this->url('block.admin_display')))); } $form_state->setRedirectUrl($this->entity->urlInfo('collection')); } diff --git a/core/modules/language/src/Form/LanguageFormBase.php b/core/modules/language/src/Form/LanguageFormBase.php index bbafe0e..c6359f3 100644 --- a/core/modules/language/src/Form/LanguageFormBase.php +++ b/core/modules/language/src/Form/LanguageFormBase.php @@ -70,7 +70,7 @@ public function commonForm(array &$form) { '#required' => TRUE, '#default_value' => '', '#disabled' => FALSE, - '#description' => $this->t('Use language codes as defined by the W3C for interoperability. Examples: "en", "en-gb" and "zh-hant".', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')), + '#description' => $this->t('Use language codes as defined by the W3C for interoperability. Examples: "en", "en-gb" and "zh-hant".', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')), ); } $form['label'] = array( @@ -101,7 +101,7 @@ public function commonForm(array &$form) { public function validateCommon(array $form, FormStateInterface $form_state) { // Ensure sane field values for langcode and name. if (!isset($form['langcode_view']) && !preg_match('@^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$@', $form_state->getValue('langcode'))) { - $form_state->setErrorByName('langcode', $this->t('%field must be a valid language tag as defined by the W3C.', array( + $form_state->setErrorByName('langcode', $this->t('%field must be a valid language tag as defined by the W3C.', array( '%field' => $form['langcode']['#title'], '@url' => 'http://www.w3.org/International/articles/language-tags/', ))); diff --git a/core/modules/language/src/Form/NegotiationBrowserForm.php b/core/modules/language/src/Form/NegotiationBrowserForm.php index 5fa186a..9a5f0a1 100644 --- a/core/modules/language/src/Form/NegotiationBrowserForm.php +++ b/core/modules/language/src/Form/NegotiationBrowserForm.php @@ -123,7 +123,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['new_mapping']['browser_langcode'] = array( '#type' => 'textfield', '#title' => $this->t('Browser language code'), - '#description' => $this->t('Use language codes as defined by the W3C for interoperability. Examples: "en", "en-gb" and "zh-hant".', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')), + '#description' => $this->t('Use language codes as defined by the W3C for interoperability. Examples: "en", "en-gb" and "zh-hant".', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')), '#size' => 20, ); $form['new_mapping']['drupal_langcode'] = array( diff --git a/core/modules/language/src/Form/NegotiationUrlForm.php b/core/modules/language/src/Form/NegotiationUrlForm.php index 588df30..781d80b 100644 --- a/core/modules/language/src/Form/NegotiationUrlForm.php +++ b/core/modules/language/src/Form/NegotiationUrlForm.php @@ -153,7 +153,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { if (!($default_langcode == $langcode) && $form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_PATH_PREFIX) { // Throw a form error if the prefix is blank for a non-default language, // although it is required for selected negotiation type. - $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix may only be left blank for the selected detection fallback language.', [ + $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix may only be left blank for the selected detection fallback language.', [ ':url' => $this->getUrlGenerator()->generate('language.negotiation_selected'), ])); } diff --git a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php index 1a093c2..cff2dfd 100644 --- a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php +++ b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php @@ -55,7 +55,7 @@ public function testLanguageConfiguration() { ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language')); - $this->assertRaw(t('%field must be a valid language tag as defined by the W3C.', array( + $this->assertRaw(t('%field must be a valid language tag as defined by the W3C.', array( '%field' => t('Language code'), ':url' => 'http://www.w3.org/International/articles/language-tags/', ))); diff --git a/core/modules/locale/src/Form/LocaleSettingsForm.php b/core/modules/locale/src/Form/LocaleSettingsForm.php index a875800..4a81baf 100644 --- a/core/modules/locale/src/Form/LocaleSettingsForm.php +++ b/core/modules/locale/src/Form/LocaleSettingsForm.php @@ -43,14 +43,14 @@ public function buildForm(array $form, FormStateInterface $form_state) { '7' => $this->t('Weekly'), '30' => $this->t('Monthly'), ), - '#description' => $this->t('Select how frequently you want to check for new interface translations for your currently installed modules and themes. Check updates now.', array('@url' => $this->url('locale.check_translation'))), + '#description' => $this->t('Select how frequently you want to check for new interface translations for your currently installed modules and themes. Check updates now.', array(':url' => $this->url('locale.check_translation'))), ); if ($directory = $config->get('translation.path')) { - $description = $this->t('Translation files are stored locally in the %path directory. You can change this directory on the File system configuration page.', array('%path' => $directory, '@url' => $this->url('system.file_system_settings'))); + $description = $this->t('Translation files are stored locally in the %path directory. You can change this directory on the File system configuration page.', array('%path' => $directory, ':url' => $this->url('system.file_system_settings'))); } else { - $description = $this->t('Translation files will not be stored locally. Change the Interface translation directory on the File system configuration page.', array('@url' => $this->url('system.file_system_settings'))); + $description = $this->t('Translation files will not be stored locally. Change the Interface translation directory on the File system configuration page.', array(':url' => $this->url('system.file_system_settings'))); } $form['#translation_directory'] = $directory; $form['use_source'] = array( @@ -95,7 +95,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); if (empty($form['#translation_directory']) && $form_state->getValue('use_source') == LOCALE_TRANSLATION_USE_SOURCE_LOCAL) { - $form_state->setErrorByName('use_source', $this->t('You have selected local translation source, but no Interface translation directory was configured.', array('@url' => $this->url('system.file_system_settings')))); + $form_state->setErrorByName('use_source', $this->t('You have selected local translation source, but no Interface translation directory was configured.', array(':url' => $this->url('system.file_system_settings')))); } } diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php index f71ec52..1f13af7 100644 --- a/core/modules/locale/src/Form/TranslationStatusForm.php +++ b/core/modules/locale/src/Form/TranslationStatusForm.php @@ -133,7 +133,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ); if (!$languages) { - $empty = $this->t('No translatable languages available. Add a language first.', array( + $empty = $this->t('No translatable languages available. Add a language first.', array( ':add_language' => $this->url('entity.configurable_language.collection'), )); } @@ -141,7 +141,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $empty = $this->t('All translations up to date.'); } else { - $empty = $this->t('No translation status available. Check manually.', array( + $empty = $this->t('No translation status available. Check manually.', array( ':check' => $this->url('locale.check_translation'), )); } diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php index 1c13517..4e43e50 100644 --- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php +++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php @@ -90,7 +90,7 @@ public function testStandalonePoFile() { // The import should have created 1 string and rejected 2. $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.'); - $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); + $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); $this->assertRaw($skip_message, 'Unsafe strings were skipped.'); // Repeat the process with a user that can access site reports, and this @@ -102,7 +102,7 @@ public function testStandalonePoFile() { 'langcode' => 'fr', )); - $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); + $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); $this->assertRaw($skip_message, 'Unsafe strings were skipped.'); // Check empty files import with a user that cannot access site reports.. @@ -122,7 +122,7 @@ public function testStandalonePoFile() { 'langcode' => 'fr', )); // The import should have created 0 string and rejected 0. - $this->assertRaw(t('One translation file could not be imported. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))), 'The empty translation file import reported no translations imported.'); + $this->assertRaw(t('One translation file could not be imported. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))), 'The empty translation file import reported no translations imported.'); // Try importing a .po file which doesn't exist. $name = $this->randomMachineName(16); diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php index ad49550..0bc3a07 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php +++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php @@ -45,7 +45,7 @@ public function testInterface() { $this->assertNoText(t('Translation update status'), 'No status message'); $this->drupalGet('admin/reports/translations'); - $this->assertRaw(t('No translatable languages available. Add a language first.', array('@add_language' => \Drupal::url('entity.configurable_language.collection'))), 'Language message'); + $this->assertRaw(t('No translatable languages available. Add a language first.', array(':add_language' => \Drupal::url('entity.configurable_language.collection'))), 'Language message'); // Add German language. $this->addLanguage('de'); @@ -70,7 +70,7 @@ public function testInterface() { // Check if updates are available for German. $this->drupalGet('admin/reports/status'); $this->assertText(t('Translation update status'), 'Status message'); - $this->assertRaw(t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), '@updates' => \Drupal::url('locale.translate_status'))), 'Updates available message'); + $this->assertRaw(t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Updates available message'); $this->drupalGet('admin/reports/translations'); $this->assertText(t('Updates for: @modules', array('@modules' => 'Locale test translate')), 'Translations available'); @@ -84,7 +84,7 @@ public function testInterface() { // Check if no updates were found. $this->drupalGet('admin/reports/status'); $this->assertText(t('Translation update status'), 'Status message'); - $this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), '@updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message'); + $this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message'); $this->drupalGet('admin/reports/translations'); $this->assertText(t('Missing translations for one project'), 'No translations found'); $this->assertText(SafeMarkup::format('@module (@version). @info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '@info' => t('No translation files are provided for development releases.'))), 'Release details'); diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php index 8b4f6e7..5fb6237 100644 --- a/core/modules/menu_ui/src/MenuForm.php +++ b/core/modules/menu_ui/src/MenuForm.php @@ -277,7 +277,7 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat ), ); - $form['links']['#empty'] = $this->t('There are no menu links yet. Add link.', [ + $form['links']['#empty'] = $this->t('There are no menu links yet. Add link.', [ ':url' => $this->url('entity.menu.add_link_form', ['menu' => $this->entity->id()], [ 'query' => ['destination' => $this->entity->url('edit-form')], ]), diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php index 6ae206c..77eb645 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php @@ -62,7 +62,7 @@ public function load() { ->values(array( 'sid' => '1', 'type' => 'node', - 'data' => ' a node 1 default examplecom another examplecom 99999999 monday january 19 2015 2215 monday january 19 2015 2215 prefix value120suffix value abc5xyz click here some more text 9 a comment permalink submitted by admin on mon 1192015 2218 this is a comment log in or register to post comments ', + 'data' => ' a node 1 default examplecom another examplecom 99999999 monday january 19 2015 2215 monday january 19 2015 2215 prefix value120suffix value abc5xyz click here some more text 9 a comment permalink submitted by admin on mon 1192015 2218 this is a comment log in or register to post comments ', 'reindex' => '0', ))->execute(); } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 7c371d6..4dafcd5 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -73,7 +73,7 @@ function node_help($route_name, RouteMatchInterface $route_match) { $message = t('The content access permissions need to be rebuilt.'); } else { - $message = t('The content access permissions need to be rebuilt. Rebuild permissions.', array('@node_access_rebuild' => \Drupal::url('node.configure_rebuild_confirm'))); + $message = t('The content access permissions need to be rebuilt. Rebuild permissions.', array(':node_access_rebuild' => \Drupal::url('node.configure_rebuild_confirm'))); } drupal_set_message($message, 'error'); } diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php index ddefa51..eef7a8f 100644 --- a/core/modules/node/src/NodeTypeListBuilder.php +++ b/core/modules/node/src/NodeTypeListBuilder.php @@ -60,7 +60,7 @@ public function getDefaultOperations(EntityInterface $entity) { */ public function render() { $build = parent::render(); - $build['table']['#empty'] = $this->t('No content types available. Add content type.', [ + $build['table']['#empty'] = $this->t('No content types available. Add content type.', [ ':link' => Url::fromRoute('node.type_add')->toString() ]); return $build; diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php index 97f6738..e07fe9b 100644 --- a/core/modules/node/src/Tests/NodeTypeTest.php +++ b/core/modules/node/src/Tests/NodeTypeTest.php @@ -219,7 +219,7 @@ public function testNodeTypeNoContentType() { // Navigate to content type administration screen $this->drupalGet('admin/structure/types'); - $this->assertRaw(t('No content types available. Add content type.', [ + $this->assertRaw(t('No content types available. Add content type.', [ ':link' => Url::fromRoute('node.type_add')->toString() ]), 'Empty text when there are no content types in the system is correct.'); } diff --git a/core/modules/path/src/Controller/PathController.php b/core/modules/path/src/Controller/PathController.php index 4ee4d0d..5caaebc 100644 --- a/core/modules/path/src/Controller/PathController.php +++ b/core/modules/path/src/Controller/PathController.php @@ -128,7 +128,7 @@ public function adminOverview(Request $request) { '#type' => 'table', '#header' => $header, '#rows' => $rows, - '#empty' => $this->t('No URL aliases available. Add URL alias.', array('@link' => $this->url('path.admin_add'))), + '#empty' => $this->t('No URL aliases available. Add URL alias.', array(':link' => $this->url('path.admin_add'))), ); $build['path_pager'] = array('#type' => 'pager'); diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php index b25c499..3c4c4c5 100644 --- a/core/modules/search/src/SearchPageListBuilder.php +++ b/core/modules/search/src/SearchPageListBuilder.php @@ -210,7 +210,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => $this->t('Number of items to index per cron run'), '#default_value' => $search_settings->get('index.cron_limit'), '#options' => $items, - '#description' => $this->t('The maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', array('@cron' => \Drupal::url('system.status'))), + '#description' => $this->t('The maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', array(':cron' => \Drupal::url('system.status'))), ); // Indexing settings: $form['indexing_settings'] = array( diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index be83839..46990d6 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -38,7 +38,7 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) { case 'entity.shortcut_set.edit_form': $user = \Drupal::currentUser(); if ($user->hasPermission('access shortcuts') && $user->hasPermission('switch shortcut sets')) { - $output = '

' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array('@shortcut-link' => \Drupal::url('shortcut.set_switch', array('user' => $user->id())))) . '

'; + $output = '

' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array(':shortcut-link' => \Drupal::url('shortcut.set_switch', array('user' => $user->id())))) . '

'; return $output; } } diff --git a/core/modules/shortcut/src/Form/SetCustomize.php b/core/modules/shortcut/src/Form/SetCustomize.php index 4f84888..7279f6d 100644 --- a/core/modules/shortcut/src/Form/SetCustomize.php +++ b/core/modules/shortcut/src/Form/SetCustomize.php @@ -38,7 +38,7 @@ public function form(array $form, FormStateInterface $form_state) { $form['shortcuts']['links'] = array( '#type' => 'table', '#header' => array(t('Name'), t('Weight'), t('Operations')), - '#empty' => $this->t('No shortcuts available. Add a shortcut', array('@link' => $this->url('shortcut.link_add', array('shortcut_set' => $this->entity->id())))), + '#empty' => $this->t('No shortcuts available. Add a shortcut', array(':link' => $this->url('shortcut.link_add', array('shortcut_set' => $this->entity->id())))), '#attributes' => array('id' => 'shortcuts'), '#tabledrag' => array( array( diff --git a/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/core/modules/shortcut/src/Form/SwitchShortcutSet.php index 9bc34ca..16e02b7 100644 --- a/core/modules/shortcut/src/Form/SwitchShortcutSet.php +++ b/core/modules/shortcut/src/Form/SwitchShortcutSet.php @@ -192,7 +192,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { if ($account_is_user) { // Only administrators can create new shortcut sets, so we know they have // access to switch back. - drupal_set_message($this->t('You are now using the new %set_name shortcut set. You can edit it from this page or switch back to a different one.', $replacements)); + drupal_set_message($this->t('You are now using the new %set_name shortcut set. You can edit it from this page or switch back to a different one.', $replacements)); } else { drupal_set_message($this->t('%user is now using a new shortcut set called %set_name. You can edit it from this page.', $replacements)); diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index 61e89a2..4caa206 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -222,7 +222,7 @@ protected function info(Request $request) { ); $info[] = $this->t("Back up your code. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism."); - $info[] = $this->t('Put your site into maintenance mode.', array( + $info[] = $this->t('Put your site into maintenance mode.', array( ':url' => Url::fromRoute('system.site_maintenance_mode')->toString(TRUE)->getGeneratedUrl(), )); $info[] = $this->t('Back up your database. This process will change your database values and in case of emergency you may need to revert to a backup.'); @@ -401,7 +401,7 @@ protected function results(Request $request) { // Report end result. $dblog_exists = $this->moduleHandler->moduleExists('dblog'); if ($dblog_exists && $this->account->hasPermission('access site reports')) { - $log_message = $this->t('All errors have been logged.', array( + $log_message = $this->t('All errors have been logged.', array( ':url' => Url::fromRoute('dblog.overview')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl(), )); } @@ -410,7 +410,7 @@ protected function results(Request $request) { } if (!empty($_SESSION['update_success'])) { - $message = '

' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your site. Otherwise, you may need to update your database manually.', array('@url' => Url::fromRoute('')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl())) . ' ' . $log_message . '

'; + $message = '

' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your site. Otherwise, you may need to update your database manually.', array(':url' => Url::fromRoute('')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl())) . ' ' . $log_message . '

'; } else { $last = reset($_SESSION['updates_remaining']); @@ -528,7 +528,7 @@ public function requirements($severity, array $requirements, Request $request) { $build['status_report'] = array( '#theme' => 'status_report', '#requirements' => $requirements, - '#suffix' => $this->t('Check the messages and try again.', array('@url' => $try_again_url)) + '#suffix' => $this->t('Check the messages and try again.', array(':url' => $try_again_url)) ); $build['#title'] = $this->t('Requirements problem'); diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php index 729d780..6c10194 100644 --- a/core/modules/system/src/Controller/SystemController.php +++ b/core/modules/system/src/Controller/SystemController.php @@ -118,7 +118,7 @@ public static function create(ContainerInterface $container) { public function overview($link_id) { // Check for status report errors. if ($this->systemManager->checkRequirements() && $this->currentUser()->hasPermission('administer site configuration')) { - drupal_set_message($this->t('One or more problems were detected with your Drupal installation. Check the status report for more information.', array('@status' => $this->url('system.status'))), 'error'); + drupal_set_message($this->t('One or more problems were detected with your Drupal installation. Check the status report for more information.', array(':status' => $this->url('system.status'))), 'error'); } // Load all menu links below it. $parameters = new MenuTreeParameters(); diff --git a/core/modules/system/src/Controller/SystemInfoController.php b/core/modules/system/src/Controller/SystemInfoController.php index a09618c..17961b6 100644 --- a/core/modules/system/src/Controller/SystemInfoController.php +++ b/core/modules/system/src/Controller/SystemInfoController.php @@ -67,7 +67,7 @@ public function php() { $output = ob_get_clean(); } else { - $output = t('The phpinfo() function has been disabled for security reasons. For more information, visit Enabling and disabling phpinfo() handbook page.', array('@phpinfo' => 'https://www.drupal.org/node/243993')); + $output = t('The phpinfo() function has been disabled for security reasons. For more information, visit Enabling and disabling phpinfo() handbook page.', array(':phpinfo' => 'https://www.drupal.org/node/243993')); } return new Response($output); } diff --git a/core/modules/system/src/Form/CronForm.php b/core/modules/system/src/Form/CronForm.php index c57ceae..c81f2c1 100644 --- a/core/modules/system/src/Form/CronForm.php +++ b/core/modules/system/src/Form/CronForm.php @@ -119,7 +119,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['cron']['cron_safe_threshold'] = array( '#type' => 'select', '#title' => t('Run cron every'), - '#description' => t('More information about setting up scheduled tasks can be found by reading the cron tutorial on drupal.org.', array('@url' => 'https://www.drupal.org/cron')), + '#description' => t('More information about setting up scheduled tasks can be found by reading the cron tutorial on drupal.org.', array(':url' => 'https://www.drupal.org/cron')), '#default_value' => $config->get('threshold.autorun'), '#options' => array(0 => t('Never')) + array_map(array($this->dateFormatter, 'formatInterval'), array_combine($options, $options)), ); diff --git a/core/modules/system/src/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php index bf78cc4..2cfccb1 100644 --- a/core/modules/system/src/Form/DateFormatFormBase.php +++ b/core/modules/system/src/Form/DateFormatFormBase.php @@ -104,7 +104,7 @@ public function form(array $form, FormStateInterface $form_state) { '#type' => 'textfield', '#title' => t('Format string'), '#maxlength' => 100, - '#description' => $this->t('A user-defined date format. See the PHP manual for available options.', array('@url' => 'http://php.net/manual/function.date.php')), + '#description' => $this->t('A user-defined date format. See the PHP manual for available options.', array(':url' => 'http://php.net/manual/function.date.php')), '#required' => TRUE, '#attributes' => [ 'data-drupal-date-formatter' => 'source', diff --git a/core/modules/system/src/Form/SiteMaintenanceModeForm.php b/core/modules/system/src/Form/SiteMaintenanceModeForm.php index cde1f57..180805e 100644 --- a/core/modules/system/src/Form/SiteMaintenanceModeForm.php +++ b/core/modules/system/src/Form/SiteMaintenanceModeForm.php @@ -70,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'checkbox', '#title' => t('Put site into maintenance mode'), '#default_value' => $this->state->get('system.maintenance_mode'), - '#description' => t('Visitors will only see the maintenance mode message. Only users with the "Access site in maintenance mode" permission will be able to access the site. Authorized users can log in directly via the user login page.', array('@permissions-url' => $this->url('user.admin_permissions'), '@user-login' => $this->url('user.login'))), + '#description' => t('Visitors will only see the maintenance mode message. Only users with the "Access site in maintenance mode" permission will be able to access the site. Authorized users can log in directly via the user login page.', array(':permissions-url' => $this->url('user.admin_permissions'), ':user-login' => $this->url('user.login'))), ); $form['maintenance_mode_message'] = array( '#type' => 'textarea', diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php index a4f8df7..9f3a7d6 100644 --- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php @@ -89,7 +89,7 @@ public function blockForm($form, FormStateInterface $form_state) { if ($url_system_theme_settings->access() && $url_system_theme_settings_theme->access()) { // Provide links to the Appearance Settings and Theme Settings pages // if the user has access to administer themes. - $site_logo_description = $this->t('Defined on the Appearance Settings or Theme Settings page.', array( + $site_logo_description = $this->t('Defined on the Appearance Settings or Theme Settings page.', array( ':appearance' => $url_system_theme_settings->toString(), ':theme' => $url_system_theme_settings_theme->toString(), )); @@ -106,8 +106,8 @@ public function blockForm($form, FormStateInterface $form_state) { // Provide link to Site Information page if the user has access to // administer site configuration. - $site_name_description = $this->t('Defined on the Site Information page.', array('@information' => $site_information_url)); - $site_slogan_description = $this->t('Defined on the Site Information page.', array('@information' => $site_information_url)); + $site_name_description = $this->t('Defined on the Site Information page.', array(':information' => $site_information_url)); + $site_slogan_description = $this->t('Defined on the Site Information page.', array(':information' => $site_information_url)); } else { // Explain that the user does not have access to the Site Information diff --git a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php index c768e21..9cd9fc2 100644 --- a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php @@ -25,7 +25,7 @@ class SystemPoweredByBlock extends BlockBase { * {@inheritdoc} */ public function build() { - return array('#markup' => '' . $this->t('Powered by Drupal', array('@poweredby' => 'https://www.drupal.org')) . ''); + return array('#markup' => '' . $this->t('Powered by Drupal', array(':poweredby' => 'https://www.drupal.org')) . ''); } /** diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php index d607303..95d647b 100644 --- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php @@ -377,7 +377,7 @@ public function getRequirements() { // Check for filter and rotate support. if (!function_exists('imagefilter') || !function_exists('imagerotate')) { $requirements['version']['severity'] = REQUIREMENT_WARNING; - $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See the PHP manual.', array('@url' => 'http://www.php.net/manual/book.image.php')); + $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See the PHP manual.', array(':url' => 'http://www.php.net/manual/book.image.php')); } return $requirements; diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php index 54ab8b7..9f6ce8d 100644 --- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php +++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php @@ -54,7 +54,7 @@ protected function testSiteMaintenance() { ); $this->drupalPostForm('admin/config/development/maintenance', $edit, t('Save configuration')); - $admin_message = t('Operating in maintenance mode. Go online.', array('@url' => \Drupal::url('system.site_maintenance_mode'))); + $admin_message = t('Operating in maintenance mode. Go online.', array(':url' => \Drupal::url('system.site_maintenance_mode'))); $user_message = t('Operating in maintenance mode.'); $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => $this->config('system.site')->get('name'))); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index a8cc12d..5a0f070 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -106,7 +106,7 @@ function system_help($route_name, RouteMatchInterface $route_match) { case 'system.themes_page': $output = '

' . t('Set and configure the default theme for your website. Alternative themes are available.', array('!themes' => 'https://www.drupal.org/project/themes')) . '

'; if (\Drupal::moduleHandler()->moduleExists('block')) { - $output .= '

' . t('You can place blocks for each theme on the block layout page.', array('@blocks' => \Drupal::url('block.admin_display'))) . '

'; + $output .= '

' . t('You can place blocks for each theme on the block layout page.', array(':blocks' => \Drupal::url('block.admin_display'))) . '

'; } return $output; @@ -755,7 +755,7 @@ function system_user_login(UserInterface $account) { $config = \Drupal::config('system.date'); // If the user has a NULL time zone, notify them to set a time zone. if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) { - drupal_set_message(t('Configure your account time zone setting.', array('@user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); + drupal_set_message(t('Configure your account time zone setting.', array(':user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); } } diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php index 556e79b..c48bb57 100644 --- a/core/modules/taxonomy/src/Form/OverviewTerms.php +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php @@ -207,7 +207,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular $form['terms'] = array( '#type' => 'table', '#header' => array($this->t('Name'), $this->t('Weight'), $this->t('Operations')), - '#empty' => $this->t('No terms available. Add term.', array('@link' => $this->url('entity.taxonomy_term.add_form', array('taxonomy_vocabulary' => $taxonomy_vocabulary->id())))), + '#empty' => $this->t('No terms available. Add term.', array(':link' => $this->url('entity.taxonomy_term.add_form', array('taxonomy_vocabulary' => $taxonomy_vocabulary->id())))), '#attributes' => array( 'id' => 'taxonomy', ), diff --git a/core/modules/taxonomy/src/VocabularyListBuilder.php b/core/modules/taxonomy/src/VocabularyListBuilder.php index 88f2594..618c75d 100644 --- a/core/modules/taxonomy/src/VocabularyListBuilder.php +++ b/core/modules/taxonomy/src/VocabularyListBuilder.php @@ -83,7 +83,7 @@ public function render() { unset($this->weightKey); } $build = parent::render(); - $build['table']['#empty'] = t('No vocabularies available. Add vocabulary.', array('@link' => \Drupal::url('entity.taxonomy_vocabulary.add_form'))); + $build['table']['#empty'] = t('No vocabularies available. Add vocabulary.', array(':link' => \Drupal::url('entity.taxonomy_vocabulary.add_form'))); return $build; } diff --git a/core/modules/telephone/src/Tests/TelephoneItemTest.php b/core/modules/telephone/src/Tests/TelephoneItemTest.php index 42b7973..c328449 100644 --- a/core/modules/telephone/src/Tests/TelephoneItemTest.php +++ b/core/modules/telephone/src/Tests/TelephoneItemTest.php @@ -61,7 +61,7 @@ public function testTestItem() { $this->assertEqual($entity->field_test[0]->value, $value); // Verify changing the field value. - $new_value = '+41' . rand(1000000, 9999999); + $new_value = '+41' . rand(1000000, 9999999); $entity->field_test->value = $new_value; $this->assertEqual($entity->field_test->value, $new_value); diff --git a/core/modules/update/src/Form/UpdateManagerInstall.php b/core/modules/update/src/Form/UpdateManagerInstall.php index 0250864..842531d 100644 --- a/core/modules/update/src/Form/UpdateManagerInstall.php +++ b/core/modules/update/src/Form/UpdateManagerInstall.php @@ -86,7 +86,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['help_text'] = array( '#prefix' => '

', - '#markup' => $this->t('You can find modules and themes on drupal.org. The following file extensions are supported: %extensions.', array( + '#markup' => $this->t('You can find modules and themes on drupal.org. The following file extensions are supported: %extensions.', array( ':module_url' => 'https://www.drupal.org/project/modules', ':theme_url' => 'https://www.drupal.org/project/themes', ':drupal_org_url' => 'https://www.drupal.org', diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php index 8ac54c1..49a844d 100644 --- a/core/modules/update/src/Form/UpdateReady.php +++ b/core/modules/update/src/Form/UpdateReady.php @@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['backup'] = array( '#prefix' => '', - '#markup' => $this->t('Back up your database and site before you continue. Learn how.', array('@backup_url' => 'https://www.drupal.org/node/22281')), + '#markup' => $this->t('Back up your database and site before you continue. Learn how.', array(':backup_url' => 'https://www.drupal.org/node/22281')), '#suffix' => '', ); diff --git a/core/modules/update/src/UpdateSettingsForm.php b/core/modules/update/src/UpdateSettingsForm.php index 9c40e73..2b08298 100644 --- a/core/modules/update/src/UpdateSettingsForm.php +++ b/core/modules/update/src/UpdateSettingsForm.php @@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 'all' => t('All newer versions'), 'security' => t('Only security updates'), ), - '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the status report page, and will also display an error message on administration pages if there is a security update.', array('@status_report' => $this->url('system.status'))) + '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the status report page, and will also display an error message on administration pages if there is a security update.', array(':status_report' => $this->url('system.status'))) ); return parent::buildForm($form, $form_state); diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 6f94d21..7109ddc 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -286,7 +286,7 @@ function update_storage_clear_submit($form, FormStateInterface $form_state) { */ function _update_no_data() { $destination = \Drupal::destination()->getAsArray(); - return t('No update information available. Run cron or check manually.', array( + return t('No update information available. Run cron or check manually.', array( ':run_cron' => \Drupal::url('system.run_cron', [], ['query' => $destination]), ':check_manually' => \Drupal::url('update.manual_status', [], ['query' => $destination]), )); @@ -525,10 +525,10 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) { case UPDATE_NOT_FETCHED: case UPDATE_FETCH_PENDING: if ($msg_type == 'core') { - $text = t('There was a problem checking available updates for Drupal.', array('@update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for Drupal.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); } else { - $text = t('There was a problem checking available updates for your modules or themes.', array('@update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for your modules or themes.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); } break; } @@ -596,7 +596,7 @@ function update_verify_update_archive($project, $archive_file, $directory) { && file_exists("$directory/$project/core/modules/system/system.module") ) { return array( - 'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array('@upgrade-guide' => 'https://www.drupal.org/upgrade')), + 'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array(':upgrade-guide' => 'https://www.drupal.org/upgrade')), ); } diff --git a/core/modules/user/src/AccountSettingsForm.php b/core/modules/user/src/AccountSettingsForm.php index 41ec240..4795853 100644 --- a/core/modules/user/src/AccountSettingsForm.php +++ b/core/modules/user/src/AccountSettingsForm.php @@ -174,7 +174,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'radios', '#title' => $this->t('When cancelling a user account'), '#default_value' => $config->get('cancel_method'), - '#description' => $this->t('Users with the %select-cancel-method or %administer-users permissions can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), '@permissions-url' => $this->url('user.admin_permissions'))), + '#description' => $this->t('Users with the %select-cancel-method or %administer-users permissions can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), ':permissions-url' => $this->url('user.admin_permissions'))), ); $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods(); foreach (Element::children($form['registration_cancellation']['user_cancel_method']) as $key) { diff --git a/core/modules/user/src/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php index 27f9519..214db2d 100644 --- a/core/modules/user/src/Controller/UserController.php +++ b/core/modules/user/src/Controller/UserController.php @@ -98,7 +98,7 @@ public function resetPass($uid, $timestamp, $hash) { // A different user is already logged in on the computer. else { if ($reset_link_user = $this->userStorage->load($uid)) { - drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', + drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', array('%other_user' => $account->getUsername(), '%resetting_user' => $reset_link_user->getUsername(), ':logout' => $this->url('user.logout'))), 'warning'); } else { diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php index 1c7a342..a5eabf4 100644 --- a/core/modules/user/src/Form/UserLoginForm.php +++ b/core/modules/user/src/Form/UserLoginForm.php @@ -224,15 +224,15 @@ public function validateFinal(array &$form, FormStateInterface $form_state) { if ($flood_control_triggered = $form_state->get('flood_control_triggered')) { if ($flood_control_triggered == 'user') { - $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array('@url' => $this->url('user.pass')))); + $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => $this->url('user.pass')))); } else { // We did not find a uid, so the limit is IP-based. - $form_state->setErrorByName('name', $this->t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array('@url' => $this->url('user.pass')))); + $form_state->setErrorByName('name', $this->t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => $this->url('user.pass')))); } } else { - $form_state->setErrorByName('name', $this->t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => $this->url('user.pass', [], array('query' => array('name' => $form_state->getValue('name'))))))); + $form_state->setErrorByName('name', $this->t('Sorry, unrecognized username or password. Have you forgotten your password?', array(':password' => $this->url('user.pass', [], array('query' => array('name' => $form_state->getValue('name'))))))); $accounts = $this->userStorage->loadByProperties(array('name' => $form_state->getValue('name'))); if (!empty($accounts)) { $this->logger('user')->notice('Login attempt failed for %user.', array('%user' => $form_state->getValue('name'))); diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index 53dad45..f53e080 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -116,7 +116,7 @@ public function save(array $form, FormStateInterface $form_state) { // New administrative account without notification. if ($admin && !$notify) { - drupal_set_message($this->t('Created a new user account for %name. No email has been sent.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('Created a new user account for %name. No email has been sent.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } // No email verification required; log in user immediately. elseif (!$admin && !\Drupal::config('user.settings')->get('verify_mail') && $account->isActive()) { @@ -128,13 +128,13 @@ public function save(array $form, FormStateInterface $form_state) { // No administrator approval required. elseif ($account->isActive() || $notify) { if (!$account->getEmail() && $notify) { - drupal_set_message($this->t('The new user %name was created without an email address, so no welcome message was sent.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('The new user %name was created without an email address, so no welcome message was sent.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } else { $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; if (_user_mail_notify($op, $account)) { if ($notify) { - drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user %name.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user %name.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } else { drupal_set_message($this->t('A welcome message with further instructions has been sent to your email address.')); diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php index 8a31137..ca6fa57 100644 --- a/core/modules/user/src/Tests/UserLoginTest.php +++ b/core/modules/user/src/Tests/UserLoginTest.php @@ -169,11 +169,11 @@ function assertFailedLogin($account, $flood_trigger = NULL) { $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, 'Password value attribute is blank.'); if (isset($flood_trigger)) { if ($flood_trigger == 'user') { - $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array('@url' => \Drupal::url('user.pass')))); + $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); } else { // No uid, so the limit is IP-based. - $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array('@url' => \Drupal::url('user.pass')))); + $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); } } else { diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php index f5bd131..e7e5764 100644 --- a/core/modules/user/src/Tests/UserPasswordResetTest.php +++ b/core/modules/user/src/Tests/UserPasswordResetTest.php @@ -220,7 +220,7 @@ public function testUserResetPasswordTextboxFilled() { 'pass' => $this->randomMachineName(), ); $this->drupalPostForm('user/login', $edit, t('Log in')); - $this->assertRaw(t('Sorry, unrecognized username or password. Have you forgotten your password?', + $this->assertRaw(t('Sorry, unrecognized username or password. Have you forgotten your password?', array(':password' => \Drupal::url('user.pass', [], array('query' => array('name' => $edit['name'])))))); unset($edit['pass']); $this->drupalGet('user/password', array('query' => array('name' => $edit['name']))); diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index c2d2db1..81fd1b6 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -136,7 +136,7 @@ function hook_user_login($account) { $config = \Drupal::config('system.date'); // If the user has a NULL time zone, notify them to set a time zone. if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) { - drupal_set_message(t('Configure your account time zone setting.', array('@user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); + drupal_set_message(t('Configure your account time zone setting.', array(':user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); } } diff --git a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php index d79e4eb..154d051 100644 --- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php @@ -159,7 +159,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ); if ($this->view->storage->access('edit') && \Drupal::moduleHandler()->moduleExists('views_ui')) { - $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array('@url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label())); + $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array(':url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label())); } else { $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore.'); diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php index c59a55c..b6b0fcc 100644 --- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php +++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php @@ -82,7 +82,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta else { if ($this->currentUser->hasPermission('administer views') && $this->moduleHandler->moduleExists('views_ui')) { $form['view']['no_view_help'] = array( - '#markup' => '

' . $this->t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( + '#markup' => '

' . $this->t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( ':create' => Url::fromRoute('views_ui.add')->toString(), ':existing' => Url::fromRoute('entity.view.collection')->toString(), )) . '

', diff --git a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php index ac3aeff..4188a8e 100644 --- a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php +++ b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php @@ -61,7 +61,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $id = $view->storage->id(); $label = $view->storage->label(); if ($this->moduleHandler->moduleExists('views_ui')) { - $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array('@url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label)); + $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array(':url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label)); } else { $message = $this->t('This link is provided by the Views module from view %label.', array('%label' => $label)); diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php index 08e4467..578cbcc 100644 --- a/core/modules/views/src/Plugin/views/display/Block.php +++ b/core/modules/views/src/Plugin/views/display/Block.php @@ -196,7 +196,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['block_category'] = array( '#type' => 'textfield', '#autocomplete_route_name' => 'block.category_autocomplete', - '#description' => $this->t('The category this block will appear under on the blocks placement page.', array('@href' => \Drupal::url('block.admin_display'))), + '#description' => $this->t('The category this block will appear under on the blocks placement page.', array(':href' => \Drupal::url('block.admin_display'))), '#default_value' => $this->getOption('block_category'), ); break; diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index bfdd1a0..f6a35c7 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -716,7 +716,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Text'), '#type' => 'textarea', '#default_value' => $this->options['alter']['text'], - '#description' => $this->t('The text to display for this field. You may include HTML or Twig. You may enter data from this view as per the "Replacement patterns" below.', array('@url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())), + '#description' => $this->t('The text to display for this field. You may include HTML or Twig. You may enter data from this view as per the "Replacement patterns" below.', array(':url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())), '#states' => array( 'visible' => array( ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE), diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 1b335de..aee0147 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -146,7 +146,7 @@ public function form(array $form, FormStateInterface $form_state) { $form['locked'] = array( '#type' => 'container', '#attributes' => array('class' => array('view-locked', 'messages', 'messages--warning')), - '#children' => $this->t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to break this lock.', $lock_message_substitutions), + '#children' => $this->t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to break this lock.', $lock_message_substitutions), '#weight' => -10, ); } diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 5dba4fe..929f67d 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -20,15 +20,15 @@ function views_ui_help($route_name, RouteMatchInterface $route_match) { case 'help.page.views_ui': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Views UI module provides an interface for managing views for the Views module. For more information, see the online documentation for the Views UI module.', array('@views' => \Drupal::url('help.page', array('name' => 'views')), '@handbook' => 'https://www.drupal.org/documentation/modules/views_ui')) . '

'; + $output .= '

' . t('The Views UI module provides an interface for managing views for the Views module. For more information, see the online documentation for the Views UI module.', array(':views' => \Drupal::url('help.page', array('name' => 'views')), ':handbook' => 'https://www.drupal.org/documentation/modules/views_ui')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Creating and managing views.') . '
'; - $output .= '
' . t('Views can be created from the Views list page by using the "Add new view" action. Existing views can be managed from the Views list page by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', array('@list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
'; + $output .= '
' . t('Views can be created from the Views list page by using the "Add new view" action. Existing views can be managed from the Views list page by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
'; $output .= '
' . t('Enabling and disabling views.') . '
'; - $output .= '
' . t('Views can be enabled or disabled from the Views list page. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', array('@list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
'; + $output .= '
' . t('Views can be enabled or disabled from the Views list page. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
'; $output .= '
' . t('Exporting and importing views.') . '
'; - $output .= '
' . t('Views can be exported and imported as configuration files by using the Configuration Manager module.', array('@config' => (\Drupal::moduleHandler()->moduleExists('config')) ? \Drupal::url('help.page', array('name' => 'config')) : '#')) . '
'; + $output .= '
' . t('Views can be exported and imported as configuration files by using the Configuration Manager module.', array(':config' => (\Drupal::moduleHandler()->moduleExists('config')) ? \Drupal::url('help.page', array('name' => 'config')) : '#')) . '
'; $output .= '
' . t('Theming views.') . '
'; $output .= '
' . t('The template files used by views can be overridden from a custom theme. When editing a view, you can see the templates that are used and alternatives for overriding them by clicking on the "Templates" link, found in the Advanced > Other section under "Output".') . '
'; $output .= '
'; diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php index d923f9a..eff6316 100644 --- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php @@ -149,4 +149,4 @@ function drupal_valid_test_ua($new_prefix = NULL) { return FALSE; } } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php index df81262..7bbf6da 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php @@ -17,4 +17,4 @@ protected function _getCacheDriver() { return new ApcCache(); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php index a6c3097..9e54a89 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php @@ -23,4 +23,4 @@ protected function isSharedStorage() { return false; } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php index 46d78c1..b9892b2 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php @@ -91,4 +91,4 @@ protected function isSharedStorage() { return false; } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php index 40d5a69..729c89a 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php @@ -44,4 +44,4 @@ protected function _getCacheDriver() $driver->setCouchbase($this->couchbase); return $driver; } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php index cb363df..1d6760f 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php @@ -17,4 +17,4 @@ protected function _getCacheDriver() { return new WincacheCache(); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php index 6259848..f05eed9 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php @@ -17,4 +17,4 @@ protected function _getCacheDriver() { return new XcacheCache(); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php index cd66e15..0d2b4ed 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php @@ -25,4 +25,4 @@ protected function _getCacheDriver() { return new ZendDataCache(); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php b/core/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php index e8323d2..e5ce27a 100644 --- a/core/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php +++ b/core/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php @@ -7,4 +7,4 @@ */ abstract class DoctrineTestCase extends \PHPUnit_Framework_TestCase { -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php index 8554654..1042036 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php @@ -3,4 +3,4 @@ class ClassLoaderTest_ClassA { -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php index 5afcbeb..16ffc00 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassB.class.php @@ -3,4 +3,4 @@ class ClassLoaderTest_ClassB { -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php index 0548118..abc5437 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassC.class.php @@ -3,4 +3,4 @@ class ClassLoaderTest_ClassC { -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/EventManagerTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/EventManagerTest.php index 2b11b20..e186fff 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/EventManagerTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/EventManagerTest.php @@ -85,4 +85,4 @@ public function getSubscribedEvents() { return array('preFoo', 'postFoo'); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ManagerRegistryTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ManagerRegistryTest.php index 7c93290..5f884df 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ManagerRegistryTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ManagerRegistryTest.php @@ -94,4 +94,4 @@ public function getAliasNamespace($alias) { return __NAMESPACE__; } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php index 020c242..a46cc6d 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php @@ -139,4 +139,4 @@ public function loadMetadataForClass($className, ClassMetadata $metadata) { } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/PHPDriverTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/PHPDriverTest.php index 8fc4d80..ad9405f 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/PHPDriverTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/PHPDriverTest.php @@ -15,4 +15,4 @@ public function testLoadMetadata() $driver = new PHPDriver(array(__DIR__ . "/_files")); $driver->loadMetadataForClass('TestEntity', $metadata); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/StaticPHPDriverTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/StaticPHPDriverTest.php index 9f1c568..ed3be2f 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/StaticPHPDriverTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/StaticPHPDriverTest.php @@ -32,4 +32,4 @@ static public function loadMetadata($metadata) { $metadata->getFieldNames(); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/_files/TestEntity.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/_files/TestEntity.php index d0e9976..b1d3654 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/_files/TestEntity.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/Mapping/_files/TestEntity.php @@ -1,3 +1,3 @@ getFieldNames(); \ No newline at end of file +$metadata->getFieldNames(); diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ObjectManagerDecoratorTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ObjectManagerDecoratorTest.php index 768b4d3..12e52b8 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ObjectManagerDecoratorTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Persistence/ObjectManagerDecoratorTest.php @@ -57,4 +57,4 @@ public function testAllMethodCallsAreDelegatedToTheWrappedInstance($method, arra $this->assertSame('INNER VALUE FROM ' . $method, call_user_func_array(array($this->decorated, $method), $parameters)); } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php index c97ac79..334bb20 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Proxy/ProxyLogicTest.php @@ -749,4 +749,4 @@ protected function getSuggestedInitializerImplementation() } }; } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/RuntimePublicReflectionPropertyTest.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/RuntimePublicReflectionPropertyTest.php index 779892f..9055b87 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/RuntimePublicReflectionPropertyTest.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/RuntimePublicReflectionPropertyTest.php @@ -189,4 +189,4 @@ public function __setCloner(\Closure $cloner = null) public function __getCloner() { } -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/common/tests/Doctrine/Tests/DoctrineTestCase.php b/core/vendor/doctrine/common/tests/Doctrine/Tests/DoctrineTestCase.php index e8323d2..e5ce27a 100644 --- a/core/vendor/doctrine/common/tests/Doctrine/Tests/DoctrineTestCase.php +++ b/core/vendor/doctrine/common/tests/Doctrine/Tests/DoctrineTestCase.php @@ -7,4 +7,4 @@ */ abstract class DoctrineTestCase extends \PHPUnit_Framework_TestCase { -} \ No newline at end of file +} diff --git a/core/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php b/core/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php index e8323d2..e5ce27a 100644 --- a/core/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php +++ b/core/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php @@ -7,4 +7,4 @@ */ abstract class DoctrineTestCase extends \PHPUnit_Framework_TestCase { -} \ No newline at end of file +} diff --git a/core/vendor/masterminds/html5/sami.php b/core/vendor/masterminds/html5/sami.php index d0dd80b..cf483d9 100644 --- a/core/vendor/masterminds/html5/sami.php +++ b/core/vendor/masterminds/html5/sami.php @@ -7,4 +7,4 @@ 'build_dir' => __DIR__.'/build/apidoc', 'cache_dir' => __DIR__.'/build/sami-cache', 'default_opened_level' => 1, -)); \ No newline at end of file +)); diff --git a/core/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php b/core/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php index ccad229..87f8706 100644 --- a/core/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php +++ b/core/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php @@ -681,4 +681,4 @@ protected function isParent($tagname) { return $this->current->tagName == $tagname; } -} \ No newline at end of file +} diff --git a/core/vendor/masterminds/html5/test/HTML5/Parser/UTF8UtilsTest.php b/core/vendor/masterminds/html5/test/HTML5/Parser/UTF8UtilsTest.php index 0e8555a..213d939 100644 --- a/core/vendor/masterminds/html5/test/HTML5/Parser/UTF8UtilsTest.php +++ b/core/vendor/masterminds/html5/test/HTML5/Parser/UTF8UtilsTest.php @@ -23,4 +23,4 @@ public function testCheckForIllegalCodepoints() { $errors = UTF8Utils::checkForIllegalCodepoints($data); $this->assertContains('null-character', $errors); } -} \ No newline at end of file +} diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php index e9bc215..b12c0d8 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php @@ -33,4 +33,4 @@ public function isDot() return true; } } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php index b86ad8c..60788ca 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php @@ -84,4 +84,4 @@ public function spaceLeft($usedSpace) return $spaceLeft; } } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php index de649a8..606fe5e 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php @@ -68,4 +68,4 @@ public function write($data); * @return bool */ public function truncate($size); -} \ No newline at end of file +} diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php index 58bd214..2c805dd 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php @@ -94,4 +94,4 @@ public function truncate($size) return true; } -} \ No newline at end of file +} diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php index 5ec4352..f60746f 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php @@ -416,4 +416,4 @@ public function url() return vfsStream::url($this->path()); } } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php index e27a581..0e84b86 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php @@ -59,4 +59,4 @@ public function hasChildren(); */ public function getChildren(); } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php index 83943dc..5827b71 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php @@ -91,4 +91,4 @@ public function valid() return (false !== current($this->children)); } } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php index e17c835..e77db2d 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php @@ -264,4 +264,4 @@ public function isDot() return false; } } -?> \ No newline at end of file +?> diff --git a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php index aa79d64..5e9295c 100644 --- a/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php +++ b/core/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php @@ -17,4 +17,4 @@ class vfsStreamException extends \Exception { // intentionally empty } -?> \ No newline at end of file +?> diff --git a/core/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php b/core/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php index cb1d0f0..b65d4f9 100644 --- a/core/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php +++ b/core/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php @@ -73,4 +73,4 @@ public function definedMethod() class MagicalApiExtended extends MagicalApi { -} \ No newline at end of file +} diff --git a/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php index 9133278..a73f384 100644 --- a/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php +++ b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php @@ -443,7 +443,7 @@ public function testSkipsIfRequiresHigherVersionOfPHP() $this->assertEquals(1, $result->skippedCount()); $this->assertEquals( - 'PHP 9999999 (or later) is required.', + 'PHP 9999999 (or later) is required.', $test->getStatusMessage() ); } diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php index 0cb1b65..0148506 100644 --- a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php @@ -5,4 +5,4 @@ public function testOne() { print '*'; } -} \ No newline at end of file +} diff --git a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php index 1ea947b..b0eaaa5 100644 --- a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php +++ b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php @@ -211,7 +211,7 @@ public function missingRequirementsProvider() array('testNine', array('Function testFunc is required.')), array('testTen', array('Extension testExt is required.')), array('testAlwaysSkip', array('PHPUnit 1111111 (or later) is required.')), - array('testAlwaysSkip2', array('PHP 9999999 (or later) is required.')), + array('testAlwaysSkip2', array('PHP href=": (or later) is required.')), array('testAlwaysSkip3', array('Operating system matching /DOESNOTEXIST/i is required.')), array('testAllPossibleRequirements', array( 'PHP 99-dev (or later) is required.', diff --git a/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php index 5b20695..d462ad1 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php @@ -125,7 +125,7 @@ public function testAlwaysSkip() } /** - * @requires PHP 9999999 + * @requires PHP 9999999 */ public function testAlwaysSkip2() { diff --git a/core/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/core/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php index a932815..38ed5f1 100644 --- a/core/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php +++ b/core/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php @@ -113,4 +113,4 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues() class DummyTest { -} \ No newline at end of file +} diff --git a/core/vendor/sebastian/comparator/src/MockObjectComparator.php b/core/vendor/sebastian/comparator/src/MockObjectComparator.php index a16903c..375954c 100644 --- a/core/vendor/sebastian/comparator/src/MockObjectComparator.php +++ b/core/vendor/sebastian/comparator/src/MockObjectComparator.php @@ -42,4 +42,4 @@ protected function toArray($object) return $array; } -} \ No newline at end of file +}