summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml9
-rw-r--r--application/config/user_agents.php5
-rw-r--r--system/core/Loader.php2
-rw-r--r--system/core/Log.php2
-rw-r--r--system/core/Output.php2
-rw-r--r--system/core/compat/standard.php2
-rw-r--r--system/helpers/form_helper.php2
-rw-r--r--system/libraries/Cache/drivers/Cache_apc.php2
-rw-r--r--system/libraries/Session/Session.php2
-rw-r--r--system/libraries/Upload.php2
-rw-r--r--tests/mocks/database/drivers/mysql.php1
-rw-r--r--tests/mocks/database/drivers/mysqli.php1
-rw-r--r--tests/mocks/database/drivers/pdo.php1
-rw-r--r--tests/mocks/database/drivers/postgre.php1
-rw-r--r--tests/mocks/database/drivers/sqlite.php1
-rw-r--r--user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.icobin0 -> 1150 bytes
-rw-r--r--user_guide_src/source/helpers/inflector_helper.rst2
-rw-r--r--user_guide_src/source/helpers/typography_helper.rst4
-rw-r--r--user_guide_src/source/helpers/url_helper.rst10
-rw-r--r--user_guide_src/source/tutorial/create_news_items.rst2
20 files changed, 22 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml
index 5a7eb11b9..1e0ee65db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
language: php
php:
- - 5.2
- - 5.3.3
- 5.4
- 5.5
- 5.6
@@ -21,7 +19,7 @@ env:
sudo: false
before_script:
- - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear channel-discover pear.bovigo.org && pear install bovigo/vfsStream-beta; else composer install --dev --no-progress; fi"
+ - sh -c "composer install --dev --no-progress"
- sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
@@ -30,7 +28,6 @@ script: phpunit -d zend.enable_gc=0 -d date.timezone=UTC --coverage-text --confi
matrix:
allow_failures:
- - php: 5.2
- php: hhvm
exclude:
- php: hhvm
@@ -39,10 +36,6 @@ matrix:
env: DB=pdo/pgsql
- php: 7
env: DB=mysql
- - php: 5.2
- env: DB=sqlite
- - php: 5.2
- env: DB=pdo/sqlite
branches:
only:
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 721ec08d3..1359bbea9 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -208,5 +208,8 @@ $robots = array(
'CRAZYWEBCRAWLER' => 'Crazy Webcrawler',
'adsbot-google' => 'AdsBot Google',
'feedfetcher-google' => 'Feedfetcher Google',
- 'curious george' => 'Curious George'
+ 'curious george' => 'Curious George',
+ 'ia_archiver' => 'Alexa Crawler',
+ 'MJ12bot' => 'Majestic-12',
+ 'Uptimebot' => 'Uptimebot'
);
diff --git a/system/core/Loader.php b/system/core/Loader.php
index c742ae71a..d2c350816 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1106,7 +1106,7 @@ class CI_Loader {
* @used-by CI_Loader::_ci_load_library()
* @uses CI_Loader::_ci_init_library()
*
- * @param string $library Library name to load
+ * @param string $library_name Library name to load
* @param string $file_path Path to the library filename, relative to libraries/
* @param mixed $params Optional parameters to pass to the class constructor
* @param string $object_name Optional object name to assign to
diff --git a/system/core/Log.php b/system/core/Log.php
index 1abdaa00e..986121526 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -237,7 +237,7 @@ class CI_Log {
*
* @param string $level The error level
* @param string $date Formatted date string
- * @param string $msg The log message
+ * @param string $message The log message
* @return string Formatted log line with a new line character '\n' at the end
*/
protected function _format_line($level, $date, $message)
diff --git a/system/core/Output.php b/system/core/Output.php
index 6e0b4e724..98db212a0 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -285,7 +285,7 @@ class CI_Output {
/**
* Get Header
*
- * @param string $header_name
+ * @param string $header
* @return string
*/
public function get_header($header)
diff --git a/system/core/compat/standard.php b/system/core/compat/standard.php
index 47d47aeff..c54cab951 100644
--- a/system/core/compat/standard.php
+++ b/system/core/compat/standard.php
@@ -62,7 +62,7 @@ if ( ! function_exists('array_column'))
* array_column()
*
* @link http://php.net/array_column
- * @param string $array
+ * @param array $array
* @param mixed $column_key
* @param mixed $index_key
* @return array
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 3e1039525..8825ecc2c 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -568,7 +568,7 @@ if ( ! function_exists('form_label'))
*
* @param string The text to appear onscreen
* @param string The id the label applies to
- * @param string Additional attributes
+ * @param array Additional attributes
* @return string
*/
function form_label($label_text = '', $id = '', $attributes = array())
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index 07ea8f474..fb8df03a7 100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
@@ -97,7 +97,7 @@ class CI_Cache_apc extends CI_Driver {
*
* @param string $id Cache ID
* @param mixed $data Data to store
- * @param int $ttol Length of time (in seconds) to cache the data
+ * @param int $ttl Length of time (in seconds) to cache the data
* @param bool $raw Whether to store the raw value
* @return bool TRUE on success, FALSE on failure
*/
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index c9d2e8adc..dde84a775 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -729,7 +729,7 @@ class CI_Session {
*
* Legacy CI_Session compatibility method
*
- * @param mixed $data Session data key(s)
+ * @param mixed $key Session data key(s)
* @return void
*/
public function unset_userdata($key)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index f2418378b..fa365058c 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -286,7 +286,7 @@ class CI_Upload {
/**
* Constructor
*
- * @param array $props
+ * @param array $config
* @return void
*/
public function __construct($config = array())
diff --git a/tests/mocks/database/drivers/mysql.php b/tests/mocks/database/drivers/mysql.php
index e0c1fb06c..b7718ebaf 100644
--- a/tests/mocks/database/drivers/mysql.php
+++ b/tests/mocks/database/drivers/mysql.php
@@ -5,7 +5,6 @@ class Mock_Database_Drivers_Mysql extends Mock_Database_DB_Driver {
/**
* Instantiate the database driver
*
- * @param string DB Driver class name
* @param array DB configuration to set
* @return void
*/
diff --git a/tests/mocks/database/drivers/mysqli.php b/tests/mocks/database/drivers/mysqli.php
index 73c35b609..f747aad46 100644
--- a/tests/mocks/database/drivers/mysqli.php
+++ b/tests/mocks/database/drivers/mysqli.php
@@ -5,7 +5,6 @@ class Mock_Database_Drivers_Mysqli extends Mock_Database_DB_Driver {
/**
* Instantiate the database driver
*
- * @param string DB Driver class name
* @param array DB configuration to set
* @return void
*/
diff --git a/tests/mocks/database/drivers/pdo.php b/tests/mocks/database/drivers/pdo.php
index 17768eed7..af1958aea 100644
--- a/tests/mocks/database/drivers/pdo.php
+++ b/tests/mocks/database/drivers/pdo.php
@@ -5,7 +5,6 @@ class Mock_Database_Drivers_PDO extends Mock_Database_DB_Driver {
/**
* Instantiate the database driver
*
- * @param string DB Driver class name
* @param array DB configuration to set
* @return void
*/
diff --git a/tests/mocks/database/drivers/postgre.php b/tests/mocks/database/drivers/postgre.php
index 5a45115fa..8c91e54a9 100644
--- a/tests/mocks/database/drivers/postgre.php
+++ b/tests/mocks/database/drivers/postgre.php
@@ -5,7 +5,6 @@ class Mock_Database_Drivers_Postgre extends Mock_Database_DB_Driver {
/**
* Instantiate the database driver
*
- * @param string DB Driver class name
* @param array DB configuration to set
* @return void
*/
diff --git a/tests/mocks/database/drivers/sqlite.php b/tests/mocks/database/drivers/sqlite.php
index 512467520..b2aec28e6 100644
--- a/tests/mocks/database/drivers/sqlite.php
+++ b/tests/mocks/database/drivers/sqlite.php
@@ -5,7 +5,6 @@ class Mock_Database_Drivers_Sqlite extends Mock_Database_DB_Driver {
/**
* Instantiate the database driver
*
- * @param string DB Driver class name
* @param array DB configuration to set
* @return void
*/
diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico b/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico
new file mode 100644
index 000000000..c4246f8bf
--- /dev/null
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico
Binary files differ
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index ed1e2b30f..17dab57bf 100644
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -38,7 +38,7 @@ The following functions are available:
.. php:function:: plural($str)
:param string $str: Input string
- :returns: A plular word
+ :returns: A plural word
:rtype: string
Changes a singular word to plural. Example::
diff --git a/user_guide_src/source/helpers/typography_helper.rst b/user_guide_src/source/helpers/typography_helper.rst
index 7eb4fceec..89730b03d 100644
--- a/user_guide_src/source/helpers/typography_helper.rst
+++ b/user_guide_src/source/helpers/typography_helper.rst
@@ -35,7 +35,7 @@ The following functions are available:
Formats text so that it is semantically and typographically correct
HTML.
- This function is an alias for ``CI_Typography::auto_typography``.
+ This function is an alias for ``CI_Typography::auto_typography()``.
For more info, please see the :doc:`Typography Library
<../libraries/typography>` documentation.
@@ -45,7 +45,7 @@ The following functions are available:
.. note:: Typographic formatting can be processor intensive, particularly if
you have a lot of content being formatted. If you choose to use this
- function you may want to consider `caching <../general/caching>` your
+ function you may want to consider :doc:`caching <../general/caching>` your
pages.
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 64deae240..435a21df4 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -18,11 +18,11 @@ This helper is loaded using the following code::
$this->load->helper('url');
-The following functions are available:
-
Available Functions
===================
+The following functions are available:
+
.. php:function:: site_url([$uri = ''[, $protocol = NULL]])
:param string $uri: URI string
@@ -277,7 +277,7 @@ Available Functions
:param string $str: Input string
:param string $separator: Word separator
- :param string $lowercase: Whether to transform the output string to lower-case
+ :param bool $lowercase: Whether to transform the output string to lower-case
:returns: URL-formatted string
:rtype: string
@@ -360,7 +360,7 @@ Available Functions
is outputted to the browser since it utilizes server headers.
.. note:: For very fine grained control over headers, you should use the
- `Output Library </libraries/output>` ``set_header()`` method.
+ :doc:`Output Library </libraries/output>` ``set_header()`` method.
.. note:: To IIS users: if you hide the `Server` HTTP header, the *auto*
method won't detect IIS, in that case it is advised you explicitly
@@ -370,4 +370,4 @@ Available Functions
will *automatically* be selected when the page is currently accessed
via POST and HTTP/1.1 is used.
- .. important:: This function will terminate script execution. \ No newline at end of file
+ .. important:: This function will terminate script execution.
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index e10eebd3b..cde52fde8 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -76,7 +76,7 @@ validation <../libraries/form_validation>` library to do this.
The code above adds a lot of functionality. The first few lines load the
form helper and the form validation library. After that, rules for the
-form validation are set. The ``set\_rules()`` method takes three arguments;
+form validation are set. The ``set_rules()`` method takes three arguments;
the name of the input field, the name to be used in error messages, and
the rule. In this case the title and text fields are required.
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-10-02 07:54:44 +0200