summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-12-14 14:15:03 +0100
committerAndrey Andreev <narf@devilix.net>2016-12-14 14:15:03 +0100
commit26313bddee1fb67af10141671a47bbe703a025fd (patch)
treeafbb330b4761c331cfbaa4ccf1a31f15af1198d1 /user_guide_src/source/general
parent88303fd3af7e1347fb2ceeb80a4a898980f98677 (diff)
[ci skip] More doc changes related to PHP 5.4.8 requirement
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/common_functions.rst6
-rw-r--r--user_guide_src/source/general/compatibility_functions.rst1
-rw-r--r--user_guide_src/source/general/requirements.rst4
-rw-r--r--user_guide_src/source/general/styleguide.rst4
4 files changed, 7 insertions, 8 deletions
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 6d6744cf7..602a6c763 100644
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -24,9 +24,9 @@ loading any libraries or helpers.
Example::
- if (is_php('5.3'))
+ if (is_php('5.5'))
{
- $str = quoted_printable_encode($str);
+ echo json_last_error_msg();
}
Returns boolean TRUE if the installed version of PHP is equal to or
@@ -185,4 +185,4 @@ loading any libraries or helpers.
.. note:: This function was introduced because Suhosin terminated
script execution, but this turned out to be a bug. A fix
has been available for some time (version 0.9.34), but is
- unfortunately not released yet. \ No newline at end of file
+ unfortunately not released yet.
diff --git a/user_guide_src/source/general/compatibility_functions.rst b/user_guide_src/source/general/compatibility_functions.rst
index 584968663..71559d0be 100644
--- a/user_guide_src/source/general/compatibility_functions.rst
+++ b/user_guide_src/source/general/compatibility_functions.rst
@@ -32,7 +32,6 @@ that is otherwise available only since PHP 5.5.
Dependencies
============
-- PHP 5.3.7
- ``CRYPT_BLOWFISH`` support for ``crypt()``
Constants
diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst
index f2729f3d5..2e24d6d03 100644
--- a/user_guide_src/source/general/requirements.rst
+++ b/user_guide_src/source/general/requirements.rst
@@ -4,7 +4,7 @@ Server Requirements
`PHP <http://php.net/>`_ version 5.6 or newer is recommended.
-It should work on 5.3.7 as well, but we strongly advise you NOT to run
+It should work on 5.4.8 as well, but we strongly advise you NOT to run
such old versions of PHP, because of potential security and performance
issues, as well as missing features.
@@ -18,4 +18,4 @@ Currently supported databases are:
- SQLite via the *sqlite* (version 2), *sqlite3* (version 3) and *pdo* drivers
- CUBRID via the *cubrid* and *pdo* drivers
- Interbase/Firebird via the *ibase* and *pdo* drivers
- - ODBC via the *odbc* and *pdo* drivers (you should know that ODBC is actually an abstraction layer) \ No newline at end of file
+ - ODBC via the *odbc* and *pdo* drivers (you should know that ODBC is actually an abstraction layer)
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
index 9b4a84e14..5f25a5ae4 100644
--- a/user_guide_src/source/general/styleguide.rst
+++ b/user_guide_src/source/general/styleguide.rst
@@ -346,7 +346,7 @@ Compatibility
=============
CodeIgniter recommends PHP 5.6 or newer to be used, but it should be
-compatible with PHP 5.3.7. Your code must either be compatible with this
+compatible with PHP 5.4.8. 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.
@@ -633,4 +633,4 @@ Whenever appropriate, provide function argument defaults, which helps
prevent PHP errors with mistaken calls and provides common fallback
values which can save a few lines of code. Example::
- function foo($bar = '', $baz = FALSE) \ No newline at end of file
+ function foo($bar = '', $baz = FALSE)