diff --git a/.travis.yml b/.travis.yml index 2f558e9b831b..cdda6078b5e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 7.1 - 7.2 - 7.3 - nightly diff --git a/README.md b/README.md index acf373938900..d450a1a9df3e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,8 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/ ## Server Requirements -PHP version 7.1 or higher is required, with the following extensions installed: +PHP version 7.2 or higher is required, with the following extensions installed: + - [intl](http://php.net/manual/en/intl.requirements.php) - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library diff --git a/admin/framework/README.md b/admin/framework/README.md index 69c33dbbd47d..8ab136038539 100644 --- a/admin/framework/README.md +++ b/admin/framework/README.md @@ -60,7 +60,7 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/ ## Server Requirements -PHP version 7.1 or higher is required, with the following extensions installed: +PHP version 7.2 or higher is required, with the following extensions installed: - [intl](http://php.net/manual/en/intl.requirements.php) - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 672c5f183c3b..a6844b5a0e0c 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -5,7 +5,7 @@ "homepage": "https://codeigniter.com", "license": "MIT", "require": { - "php": ">=7.1", + "php": ">=7.2", "ext-curl": "*", "ext-intl": "*", "kint-php/kint": "^2.1", diff --git a/admin/starter/README.md b/admin/starter/README.md index f71eacaf120e..9d1726d52f46 100644 --- a/admin/starter/README.md +++ b/admin/starter/README.md @@ -47,7 +47,7 @@ The user guide updating and deployment is a bit awkward at the moment, but we ar ## Server Requirements -PHP version 7.1 or higher is required, with the following extensions installed: +PHP version 7.2 or higher is required, with the following extensions installed: - [intl](http://php.net/manual/en/intl.requirements.php) - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library diff --git a/admin/starter/composer.json b/admin/starter/composer.json index b21f3cbbce13..f7ad344b7b5a 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -5,7 +5,7 @@ "homepage": "https://codeigniter.com", "license": "MIT", "require": { - "php": ">=7.1", + "php": ">=7.2", "codeigniter4/framework": "^4@alpha" }, "require-dev": { diff --git a/admin/userguide/composer.json b/admin/userguide/composer.json index 6eb7612d8a1f..62ed362a81f8 100644 --- a/admin/userguide/composer.json +++ b/admin/userguide/composer.json @@ -5,7 +5,7 @@ "homepage": "https://codeigniter.com", "license": "MIT", "require": { - "php": ">=7.1", + "php": ">=7.2", "codeigniter4/framework": "^4" }, "support": { diff --git a/composer.json b/composer.json index 4a75cdcc5e7b..22a82704cb4b 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage": "https://codeigniter.com", "license": "MIT", "require": { - "php": ">=7.1", + "php": ">=7.2", "ext-curl": "*", "ext-intl": "*", "ext-json": "*", diff --git a/contributing.md b/contributing.md index 8e236f0cc387..78593e2533d9 100644 --- a/contributing.md +++ b/contributing.md @@ -35,7 +35,7 @@ If you change anything that requires a change to documentation then you will nee ### Compatibility -CodeIgniter4 requires PHP 7.1. +CodeIgniter4 requires PHP 7.2. ### Branching diff --git a/contributing/guidelines.rst b/contributing/guidelines.rst index 4da3b7b0c291..2079d1b4c98c 100644 --- a/contributing/guidelines.rst +++ b/contributing/guidelines.rst @@ -74,7 +74,7 @@ be highlighted in the next release after it has been merged. PHP Compatibility ================= -CodeIgniter4 requires PHP 7.1. +CodeIgniter4 requires PHP 7.2. Backwards Compatibility ======================= diff --git a/public/index.php b/public/index.php index 4238f3c05c27..5b9e912f8270 100644 --- a/public/index.php +++ b/public/index.php @@ -1,7 +1,7 @@ getPrefixesPsr4(); diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php index e69e278cc793..9691e971d447 100644 --- a/system/Commands/Server/Serve.php +++ b/system/Commands/Server/Serve.php @@ -48,7 +48,7 @@ */ class Serve extends BaseCommand { - protected $minPHPVersion = '7.1'; + protected $minPHPVersion = '7.2'; protected $group = 'CodeIgniter'; protected $name = 'serve'; diff --git a/system/Entity.php b/system/Entity.php index 895db5d8fbf0..7470032e7f3a 100644 --- a/system/Entity.php +++ b/system/Entity.php @@ -268,15 +268,15 @@ public function __set(string $key, $value = null) } $isNullable = false; - $castTo = false; + $castTo = false; - if(array_key_exists($key, $this->_options['casts'])) + if (array_key_exists($key, $this->_options['casts'])) { - $isNullable = substr($this->_options['casts'][$key],0,1) === '?'; - $castTo = $isNullable ? substr($this->_options['casts'][$key], 1) : $this->_options['casts'][$key]; + $isNullable = substr($this->_options['casts'][$key], 0, 1) === '?'; + $castTo = $isNullable ? substr($this->_options['casts'][$key], 1) : $this->_options['casts'][$key]; } - if(!$isNullable || !is_null($value)) + if (! $isNullable || ! is_null($value)) { // Array casting requires that we serialize the value // when setting it so that it can easily be stored @@ -293,7 +293,6 @@ public function __set(string $key, $value = null) { $value = json_encode($value); } - } // if a set* method exists for this key, @@ -318,7 +317,6 @@ public function __set(string $key, $value = null) return $this; } - //-------------------------------------------------------------------- /** @@ -443,13 +441,13 @@ protected function mutateDate($value) protected function castAs($value, string $type) { - if(substr($type,0,1) === '?') + if (substr($type, 0, 1) === '?') { - if($value === null) + if ($value === null) { return null; } - $type = substr($type,1); + $type = substr($type, 1); } switch($type) diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php index bfeaba5abc4b..8002bc1f2c1d 100755 --- a/system/Helpers/html_helper.php +++ b/system/Helpers/html_helper.php @@ -161,7 +161,6 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string $src['alt'] = $attributes['alt'] ?? ''; } - $img = ' $v) @@ -185,7 +184,7 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string } // prevent passing "alt" to stringify_attributes - if(is_array($attributes) && isset($attributes['alt'])) + if (is_array($attributes) && isset($attributes['alt'])) { unset($attributes['alt']); } diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 2c9338ac1dc6..e333ae9b8319 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -30,7 +30,7 @@ subforum for an uptodate list! **Namespaces** -- CI4 is built for PHP7.1+, and everything in the framework is namespaced, except for the helpers. +- CI4 is built for PHP7.2+, and everything in the framework is namespaced, except for the helpers. **Application Structure** diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst index 246042f1cf2c..6769dfb6b774 100644 --- a/user_guide_src/source/intro/requirements.rst +++ b/user_guide_src/source/intro/requirements.rst @@ -2,9 +2,9 @@ Server Requirements ################### -`PHP `_ version 7.1 or newer is required, with the +`PHP `_ version 7.2 or newer is required, with the `*intl* extension `_ -installed. `Why 7.1 `_? +installed. The following PHP extensions should be enabled on your server: ``php-json``, ``php-mbstring``, ``php-mysqlnd``, `php-xml`` @@ -17,7 +17,7 @@ Currently supported databases are: - MySQL (5.1+) via the *MySQLi* driver - PostgreSQL via the *Postgre* driver - - SqLite3 via the *SQLite3* driver + - SQLite3 via the *SQLite3* driver Not all of the drivers have been converted/rewritten for CodeIgniter4. The list below shows the outstanding ones. diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst index 04cbf1addc5c..451f30d69b6d 100644 --- a/user_guide_src/source/testing/feature.rst +++ b/user_guide_src/source/testing/feature.rst @@ -328,7 +328,7 @@ Asserts that $fragment is found within the JSON response. It does not need to ma // Is true $this->assertJSONFragment(['config' => ['key-a']); -.. note:: This simply uses phpUnit's own `assertArraySubset() `_ +.. note:: This simply uses phpUnit's own `assertArraySubset() `_ method to do the comparison. **assertJSONExact($test)**