diff --git a/core/.DS_Store b/core/.DS_Store new file mode 100644 index 0000000..90b7401 Binary files /dev/null and b/core/.DS_Store differ diff --git a/core/misc/.DS_Store b/core/misc/.DS_Store new file mode 100644 index 0000000..608a3e2 Binary files /dev/null and b/core/misc/.DS_Store differ diff --git a/core/misc/icons/.DS_Store b/core/misc/icons/.DS_Store new file mode 100644 index 0000000..a92e084 Binary files /dev/null and b/core/misc/icons/.DS_Store differ diff --git a/core/modules/system/src/SystemRequirements.php b/core/modules/system/src/SystemRequirements.php index ecaf0cf..bdc2685 100644 --- a/core/modules/system/src/SystemRequirements.php +++ b/core/modules/system/src/SystemRequirements.php @@ -13,6 +13,21 @@ class SystemRequirements { /** + * The minimum PHP version in the lower range + */ + public static $min_low = '5.5.21'; + + /** + * The maximum PHP version in the lower range + */ + public static $max_low = '5.6.0'; + + /** + * The minimum PHP version in the higher range + */ + public static $min_high = '5.6.5'; + + /** * Determines whether the passed in PHP version disallows multiple statements. * * @param string $phpversion @@ -22,8 +37,8 @@ class SystemRequirements { public static function phpVersionWithPdoDisallowMultipleStatements($phpversion) { // PDO::MYSQL_ATTR_MULTI_STATEMENTS was introduced in PHP versions 5.5.21 // and 5.6.5. - return (version_compare($phpversion, '5.5.21', '>=') && version_compare($phpversion, '5.6.0', '<')) - || version_compare($phpversion, '5.6.5', '>='); + return (version_compare($phpversion, self::$min_low, '>=') && version_compare($phpversion, self::$max_low, '<')) + || version_compare($phpversion, self::$min_high, '>='); } } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 62e5082..964aa37 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -86,10 +86,8 @@ function system_requirements($phase) { return $requirements; } elseif (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) { - // Suggest to update to at least 5.5.21 or 5.6.5 for disabling multiple - // statements. $requirements['php']['title'] = t('PHP (multiple statement disabling)'); - $requirements['php']['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.'); + $requirements['php']['description'] = t('PHP versions higher than %min_low or %min_high provide built-in SQL injection protection for mysql databases. It is recommended to update.', array('%min_low' => SystemRequirements::$min_low, '%min_high' => SystemRequirements::$min_high)); $requirements['php']['severity'] = REQUIREMENT_INFO; } elseif (version_compare($phpversion, DRUPAL_SUGGESTED_PHP) < 0) {