diff options
author | Andrey Andreev <narf@devilix.net> | 2015-11-16 15:24:53 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2015-11-16 15:24:53 +0100 |
commit | bb5184e9b84f5f3c56ae82bfded1cbc2d00cade1 (patch) | |
tree | d05c256c456198f9f0332fd361e6a9a2b4a162d4 | |
parent | 0f6e5bc4d356680bae470f05ccb9e115dd57422e (diff) | |
parent | 8f75f7fdd14acef06f591ce03163ef5937c3b612 (diff) |
Merge pull request #4236 from galdiolo/patch-11
[ci skip] Bump PHP version number to 5.5
-rw-r--r-- | contributing.md | 2 | ||||
-rw-r--r-- | readme.rst | 2 | ||||
-rw-r--r-- | user_guide_src/source/contributing/index.rst | 2 | ||||
-rw-r--r-- | user_guide_src/source/general/requirements.rst | 2 | ||||
-rw-r--r-- | user_guide_src/source/general/styleguide.rst | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/contributing.md b/contributing.md index 5a25698bf..f4d6705ed 100644 --- a/contributing.md +++ b/contributing.md @@ -29,7 +29,7 @@ If you change anything that requires a change to documentation then you will nee ### Compatibility -CodeIgniter recommends PHP 5.4 or newer to be used, but it should be +CodeIgniter recommends PHP 5.5 or newer to be used, but it should be compatible with PHP 5.2.4 so all code supplied must stick to this requirement. If PHP 5.3 (and above) functions or features are used then there must be a fallback for PHP 5.2.4. diff --git a/readme.rst b/readme.rst index 2e35d7223..64ace3a39 100644 --- a/readme.rst +++ b/readme.rst @@ -29,7 +29,7 @@ guide change log <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide Server Requirements ******************* -PHP version 5.4 or newer is recommended. +PHP version 5.5 or newer is recommended. It should work on 5.2.4 as well, but we strongly advise you NOT to run such old versions of PHP, because of potential security and performance diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index 5966070d1..ef6f4aab4 100644 --- a/user_guide_src/source/contributing/index.rst +++ b/user_guide_src/source/contributing/index.rst @@ -103,7 +103,7 @@ must also be updated for every change. Also PHPDoc blocks must be maintained. Compatibility ============= -CodeIgniter recommends PHP 5.4 or newer to be used, but it should be +CodeIgniter recommends PHP 5.5 or newer to be used, but it should be compatible with PHP 5.2.4 so all code supplied must stick to this requirement. If PHP 5.3 (and above) functions or features are used then there must be a fallback for PHP 5.2.4. diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst index f90cdd30d..7eea71745 100644 --- a/user_guide_src/source/general/requirements.rst +++ b/user_guide_src/source/general/requirements.rst @@ -2,7 +2,7 @@ Server Requirements ################### -`PHP <http://php.net/>`_ version 5.4 or newer is recommended. +`PHP <http://php.net/>`_ version 5.5 or newer is recommended. It should work on 5.2.4 as well, but we strongly advise you NOT to run such old versions of PHP, because of potential security and performance diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 7704a59c5..b21246b4f 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -345,7 +345,7 @@ inability for CodeIgniter to send proper headers. Compatibility ============= -CodeIgniter recommends PHP 5.4 or newer to be used, but it should be +CodeIgniter recommends PHP 5.5 or newer to be used, but it should be compatible with PHP 5.2.4. Your code must either be compatible with this requirement, provide a suitable fallback, or be an optional feature that dies quietly without affecting a user's application. |