From d2d21e83028e9a49ffb9d79281c59408e16cf544 Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Sat, 4 Jul 2015 12:54:51 -0700 Subject: Fixed typos --- application/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 94e5d28a9..d76769209 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -325,7 +325,7 @@ $config['encryption_key'] = ''; | | 'sess_save_path' | -| The location to save sessions to, driver dependant. +| The location to save sessions to, driver dependent. | | For the 'files' driver, it's a path to a writable directory. | WARNING: Only absolute paths are supported! @@ -388,7 +388,7 @@ $config['cookie_httponly'] = FALSE; |-------------------------------------------------------------------------- | | Determines whether to standardize newline characters in input data, -| meaning to replace \r\n, \r, \n occurences with the PHP_EOL value. +| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value. | | This is particularly useful for portability between UNIX-based OSes, | (usually \n) and Windows (\r\n). -- cgit v1.2.3-24-g4f1b From adf7636fb82a01ea4c9acf3322715a9e653e37fe Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Sat, 4 Jul 2015 13:04:35 -0700 Subject: Standardized new lines --- application/config/autoload.php | 13 ------------- application/config/config.php | 3 --- application/config/constants.php | 1 - application/config/database.php | 1 - application/config/mimes.php | 1 - application/config/smileys.php | 1 - application/config/user_agents.php | 1 - 7 files changed, 21 deletions(-) diff --git a/application/config/autoload.php b/application/config/autoload.php index 72f855c8b..3f0bd24f2 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -39,10 +39,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared'); | */ - $autoload['packages'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Libraries @@ -59,10 +57,8 @@ $autoload['packages'] = array(); | | $autoload['libraries'] = array('user_agent' => 'ua'); */ - $autoload['libraries'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Drivers @@ -75,10 +71,8 @@ $autoload['libraries'] = array(); | | $autoload['drivers'] = array('cache'); */ - $autoload['drivers'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Helper Files @@ -87,10 +81,8 @@ $autoload['drivers'] = array(); | | $autoload['helper'] = array('url', 'file'); */ - $autoload['helper'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Config files @@ -103,10 +95,8 @@ $autoload['helper'] = array(); | config files. Otherwise, leave it blank. | */ - $autoload['config'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Language files @@ -119,10 +109,8 @@ $autoload['config'] = array(); | "codeigniter_lang.php" would be referenced as array('codeigniter'); | */ - $autoload['language'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Models @@ -136,5 +124,4 @@ $autoload['language'] = array(); | | $autoload['model'] = array('first_model' => 'first'); */ - $autoload['model'] = array(); diff --git a/application/config/config.php b/application/config/config.php index d76769209..86ca312b7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -58,7 +58,6 @@ $config['uri_protocol'] = 'REQUEST_URI'; | | http://codeigniter.com/user_guide/general/urls.html */ - $config['url_suffix'] = ''; /* @@ -155,7 +154,6 @@ $config['composer_autoload'] = FALSE; */ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; - /* |-------------------------------------------------------------------------- | Enable Query Strings @@ -478,7 +476,6 @@ $config['time_reference'] = 'local'; */ $config['rewrite_short_tags'] = FALSE; - /* |-------------------------------------------------------------------------- | Reverse Proxy IPs diff --git a/application/config/constants.php b/application/config/constants.php index 01096c74a..48283e223 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -27,7 +27,6 @@ define('DIR_WRITE_MODE', 0755); | These modes are used when working with fopen()/popen() | */ - define('FOPEN_READ', 'rb'); define('FOPEN_READ_WRITE', 'r+b'); define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care diff --git a/application/config/database.php b/application/config/database.php index fc3a5e5b6..84aab9169 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -58,7 +58,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | The $query_builder variables lets you determine whether or not to load | the query builder class. */ - $active_group = 'default'; $query_builder = TRUE; diff --git a/application/config/mimes.php b/application/config/mimes.php index f9b74bfb2..d0e1516ff 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -9,7 +9,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | Upload class to help identify allowed file types. | */ - return array( 'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', diff --git a/application/config/smileys.php b/application/config/smileys.php index 1428d68bc..1eeba4776 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -13,7 +13,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | http://codeigniter.com/user_guide/helpers/smiley_helper.html | */ - $smileys = array( // smiley image name width height alt diff --git a/application/config/user_agents.php b/application/config/user_agents.php index fd8ed48cd..1129dbacd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -10,7 +10,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | mobile device data. The array keys are used to identify the device | and the array values are used to set the actual name of the item. */ - $platforms = array( 'windows nt 10.0' => 'Windows 10', 'windows nt 6.3' => 'Windows 8.1', -- cgit v1.2.3-24-g4f1b From 63b0c26d9d7e6b064145f629ecae5bda5f43fec6 Mon Sep 17 00:00:00 2001 From: ftwbzhao Date: Sun, 5 Jul 2015 22:07:58 +0800 Subject: supported key_prefix on `increment` and `decrement` --- system/libraries/Cache/Cache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php index 06403b6e9..0c87a5628 100644 --- a/system/libraries/Cache/Cache.php +++ b/system/libraries/Cache/Cache.php @@ -178,7 +178,7 @@ class CI_Cache extends CI_Driver_Library { */ public function increment($id, $offset = 1) { - return $this->{$this->_adapter}->increment($id, $offset); + return $this->{$this->_adapter}->increment($this->key_prefix.$id, $offset); } // ------------------------------------------------------------------------ @@ -192,7 +192,7 @@ class CI_Cache extends CI_Driver_Library { */ public function decrement($id, $offset = 1) { - return $this->{$this->_adapter}->decrement($id, $offset); + return $this->{$this->_adapter}->decrement($this->key_prefix.$id, $offset); } // ------------------------------------------------------------------------ -- cgit v1.2.3-24-g4f1b From a5ea5066e4463a3857d6add2c5e2bc6833d1cbc0 Mon Sep 17 00:00:00 2001 From: ftwbzhao Date: Mon, 6 Jul 2015 13:18:11 +0800 Subject: Added "is_resource" into the list of unit tests capable of being run. --- system/libraries/Unit_test.php | 2 +- user_guide_src/source/libraries/unit_testing.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index 7b744adc6..60b046ba0 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -152,7 +152,7 @@ class CI_Unit_test { return FALSE; } - if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE)) + if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null', 'is_resource'), TRUE)) { $expected = str_replace('is_double', 'is_float', $expected); $result = $expected($test); diff --git a/user_guide_src/source/libraries/unit_testing.rst b/user_guide_src/source/libraries/unit_testing.rst index 026781cb7..57934cba3 100644 --- a/user_guide_src/source/libraries/unit_testing.rst +++ b/user_guide_src/source/libraries/unit_testing.rst @@ -76,6 +76,7 @@ result. Here is a list of allowed comparison types: - is_double - is_array - is_null +- is_resource Generating Reports ================== -- cgit v1.2.3-24-g4f1b From 15c42483c744da24525ae87be4654483657cb2ed Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 6 Jul 2015 11:19:30 +0300 Subject: [ci skip] Add missing changelog entries for PRs #3955, #3957 --- user_guide_src/source/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index edbcf2f6a..432d65e00 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -23,6 +23,8 @@ Release Date: Not Released - Errors "no_file_selected", "file_partial", "stopped_by_extension", "no_file_types", "invalid_filetype", "bad_filename" are now logged at the 'debug' level. - Errors "file_exceeds_limit", "file_exceeds_form_limit", "invalid_filesize", "invalid_dimensions" are now logged at the 'info' level. + - Added 'is_resource' to the available expectations in :doc:`Unit Testing Library `. + Bug fixes for 3.0.1 ------------------- @@ -46,6 +48,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3913) - :doc:`Cache Library ` didn't work with the direct ``$this->cache->$driver_name->method()`` syntax with Redis and Memcache(d). - Fixed a bug (#3932) - :doc:`Query Builder ` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or". - Fixed a bug in :doc:`Query Builder ` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``. +- Fixed a bug (#3955) - :doc:`Cache Library ` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting. Version 3.0.0 ============= -- cgit v1.2.3-24-g4f1b From c79a62c5c43c75a3dbc0af77433694340b235047 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 6 Jul 2015 11:21:20 +0300 Subject: [ci skip] Update config/migration.php comments Close #3951 --- application/config/migration.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/config/migration.php b/application/config/migration.php index 083bf287c..4b585a65c 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,12 +21,12 @@ $config['migration_enabled'] = FALSE; | Migration file names may be based on a sequential identifier or on | a timestamp. Options are: | -| 'sequential' = Default migration naming (001_add_blog.php) +| 'sequential' = Sequential migration naming (001_add_blog.php) | 'timestamp' = Timestamp migration naming (20121031104401_add_blog.php) | Use timestamp format YYYYMMDDHHIISS. | -| If this configuration value is missing the Migration library defaults -| to 'sequential' for backward compatibility. +| Note: If this configuration value is missing the Migration library +| defaults to 'sequential' for backward compatibility with CI2. | */ $config['migration_type'] = 'timestamp'; -- cgit v1.2.3-24-g4f1b