diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f7ee3312a9..591409954f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: - php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php-version: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout diff --git a/composer.json b/composer.json index cc733558013..618e580b0ee 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "vendor-dir": "core/vendor" }, "require": { - "php": ">=7.2.5", + "php": ">=7.4.0", "xpdo/xpdo": "~3.1.0", "league/flysystem": "^2.0", "league/flysystem-aws-s3-v3": "^2.0", diff --git a/core/src/Revolution/Processors/System/ConfigCheck.php b/core/src/Revolution/Processors/System/ConfigCheck.php index 498f5b76a04..e5fd2319828 100644 --- a/core/src/Revolution/Processors/System/ConfigCheck.php +++ b/core/src/Revolution/Processors/System/ConfigCheck.php @@ -140,7 +140,7 @@ public function checkRemoteAccess() public function checkSystem() { - $require = $this->modx->getOption('configcheck_min_phpversion', null, '7.2.5'); + $require = $this->modx->getOption('configcheck_min_phpversion', null, '7.4.0'); $compare = version_compare(PHP_VERSION, $require, '>='); if (!$compare) { diff --git a/core/src/Revolution/modX.php b/core/src/Revolution/modX.php index 10d4f513afd..08af9fd04ea 100644 --- a/core/src/Revolution/modX.php +++ b/core/src/Revolution/modX.php @@ -339,11 +339,7 @@ public static function sanitize(array &$target, array $patterns= [], $depth= 99, $iteration++; } } - if (version_compare(PHP_VERSION, '7.4.0', '<') && get_magic_quotes_gpc()) { - $target[$key]= stripslashes($value); - } else { - $target[$key]= $value; - } + $target[$key]= $value; } } return $target; diff --git a/manager/index.php b/manager/index.php index 6950055c27c..d85cb92bdac 100644 --- a/manager/index.php +++ b/manager/index.php @@ -25,9 +25,9 @@ } /* check for correct version of php */ -$php_ver_comp = version_compare(PHP_VERSION,'7.2.5', '>='); +$php_ver_comp = version_compare(PHP_VERSION,'7.4.0', '>='); if (!$php_ver_comp) { - die('Wrong php version! You\'re using PHP version "'.PHP_VERSION.'", and MODX Revolution only works on 7.2.5 or higher.'); + die('Wrong php version! You\'re using PHP version "'.PHP_VERSION.'", and MODX Revolution only works on 7.4.0 or higher.'); } /* set the document_root */ diff --git a/setup/includes/test/modinstalltest.class.php b/setup/includes/test/modinstalltest.class.php index d62c9b16b35..79b038c197f 100644 --- a/setup/includes/test/modinstalltest.class.php +++ b/setup/includes/test/modinstalltest.class.php @@ -66,8 +66,8 @@ protected function _checkPHPVersion() $this->title('php_version', $this->install->lexicon('test_php_version_start') . ' '); $phpVersion = phpversion(); - $recommended_version = "7.3"; - $required_version = "7.2.5"; + $recommended_version = "8.0.0"; + $required_version = "7.4.0"; $php_ver_comp = version_compare($phpVersion, $required_version, '>='); diff --git a/setup/provisioner/requirements.php b/setup/provisioner/requirements.php index e068a78fff0..5b9d5b0336e 100644 --- a/setup/provisioner/requirements.php +++ b/setup/provisioner/requirements.php @@ -9,7 +9,7 @@ * files found in the top-level directory of this distribution. */ -define('MODX_MINIMUM_REQUIRED_PHP_VERSION', '7.2.5'); +define('MODX_MINIMUM_REQUIRED_PHP_VERSION', '7.4.0'); define('MODX_REQUIRED_EXTENSIONS', [ "curl", "dom",