diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index f38af8a..c33ffb6 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -133,29 +133,31 @@ function system_requirements($phase) {
     }
   }
 
-  // Test PHP version and show link to phpinfo() if it's available
-  $phpversion = $phpversion_label = phpversion();
+  // Test PHP version and show link to phpinfo() if it's available.
+  $phpversion = phpversion();
+  $requirements['php'] = [
+    'title' => t('PHP'),
+    'value' => $phpversion,
+    'severity' => REQUIREMENT_INFO,
+  ];
   if (function_exists('phpinfo')) {
-    // $phpversion is safe and output of l() is safe, so this value is safe.
     if ($phase === 'runtime') {
-      $phpversion_label = SafeMarkup::set($phpversion . ' (' . \Drupal::l(t('more information'), new Url('system.php')) . ')');
+      $requirements['php']['description'][] = [
+        '#markup' => t('For more information, view the <a href="@link">phpinfo</a>.', ['@link' => (new Url('system.php'))->toString()]),
+      ];
     }
-    $requirements['php'] = array(
-      'title' => t('PHP'),
-      'value' => $phpversion_label,
-    );
   }
   else {
-    $requirements['php'] = array(
-      'title' => t('PHP'),
-      'value' => $phpversion_label,
-      'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'https://www.drupal.org/node/243993')),
-      'severity' => REQUIREMENT_INFO,
-    );
+    $requirements['php']['description'][] = [
+      '#markup' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', ['@phpinfo' => 'https://www.drupal.org/node/243993']),
+    ];
   }
 
   if (version_compare($phpversion, DRUPAL_MINIMUM_PHP) < 0) {
-    $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
+    $requirements['php']['description'][] = [
+      '#prefix' => '<br />',
+      '#markup' => t('Your PHP installation is too old. Drupal requires at least PHP %version.', ['%version' => DRUPAL_MINIMUM_PHP]),
+    ];
     $requirements['php']['severity'] = REQUIREMENT_ERROR;
     // If PHP is old, it's not safe to continue with the requirements check.
     return $requirements;
@@ -164,12 +166,11 @@ function system_requirements($phase) {
   // Suggest to update to at least 5.5.21 or 5.6.5 for disabling multiple
   // statements.
   if (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) {
-    $requirements['php'] = array(
-      'title' => t('PHP (multiple statement disabling)'),
-      'value' => $phpversion_label,
-      'description' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'),
-      'severity' => REQUIREMENT_INFO,
-    );
+    $requirements['php']['title'] = t('PHP (multiple statement disabling)');
+    $requirements['php']['description'][] = [
+      '#prefix' => '<br />',
+      '#markup' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'),
+    ];
   }
 
   // Test for PHP extensions.