RELEASE 3.0.3.14 (CodeIgniter 3.1.11).

Signed-off-by:Ivan Tcholakov <[email protected]>
ivantcholakov · Sep 30, 2019 · 5ff6792 · 5ff6792
1 parent 310731b
commit 5ff6792
Show file tree

Hide file tree

Showing 265 changed files with 2,991 additions and 1,968 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ https://github.com/ivantcholakov/codeigniter-restserver-test
 
 A temporary repository for testing https://github.com/chriskacerguis/codeigniter-restserver
 
-Version: 3.0.3.13
+Version: 3.0.3.14
 
 Requires PHP >= 5.3.7
 

diff --git a/application/composer.json b/application/composer.json
@@ -4,7 +4,7 @@
         "optimize-autoloader": true
     },
     "require": {
-        "codeigniter/framework": "3.1.10",
+        "codeigniter/framework": "3.1.11",
         "roave/security-advisories": "dev-master",
         "paragonie/random_compat": "^2.0.2",
         "guzzlehttp/guzzle": "~6.0",

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/config/database.php b/application/config/database.php
@@ -49,7 +49,7 @@
 |				'ssl_ca'     - Path to the certificate authority file
 |				'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
 |				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
+|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not
 |
 |	['compress'] Whether or not to use client compression (MySQL only)
 |	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections

diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
@@ -22,10 +22,10 @@
 	'/б/' => 'b',
 	'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
 	'/ç|ć|ĉ|ċ|č/' => 'c',
-	'/Д/' => 'D',
-	'/д/' => 'd',
-	'/Ð|Ď|Đ|Δ/' => 'Dj',
-	'/ð|ď|đ|δ/' => 'dj',
+	'/Д|Δ/' => 'D',
+	'/д|δ/' => 'd',
+	'/Ð|Ď|Đ/' => 'Dj',
+	'/ð|ď|đ/' => 'dj',
 	'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
 	'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
 	'/Ф/' => 'F',
@@ -38,6 +38,8 @@
 	'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
 	'/Ĵ/' => 'J',
 	'/ĵ/' => 'j',
+	'/Θ/' => 'TH',
+	'/θ/' => 'th',
 	'/Ķ|Κ|К/' => 'K',
 	'/ķ|κ|к/' => 'k',
 	'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
@@ -54,8 +56,8 @@
 	'/ŕ|ŗ|ř|ρ|р/' => 'r',
 	'/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
 	'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
-	'/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
-	'/ț|ţ|ť|ŧ|т/' => 't',
+	'/Ț|Ţ|Ť|Ŧ|Τ|Т/' => 'T',
+	'/ț|ţ|ť|ŧ|τ|т/' => 't',
 	'/Þ|þ/' => 'th',
 	'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
 	'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
@@ -65,6 +67,10 @@
 	'/в/' => 'v',
 	'/Ŵ/' => 'W',
 	'/ŵ/' => 'w',
+	'/Φ/' => 'F',
+	'/φ/' => 'f',
+	'/Χ/' => 'CH',
+	'/χ/' => 'ch',
 	'/Ź|Ż|Ž|Ζ|З/' => 'Z',
 	'/ź|ż|ž|ζ|з/' => 'z',
 	'/Æ|Ǽ/' => 'AE',
@@ -73,10 +79,15 @@
 	'/ĳ/' => 'ij',
 	'/Œ/' => 'OE',
 	'/ƒ/' => 'f',
+	'/Ξ/' => 'KS',
 	'/ξ/' => 'ks',
+	'/Π/' => 'P',
 	'/π/' => 'p',
+	'/Β/' => 'V',
 	'/β/' => 'v',
+	'/Μ/' => 'M',
 	'/μ/' => 'm',
+	'/Ψ/' => 'PS',
 	'/ψ/' => 'ps',
 	'/Ё/' => 'Yo',
 	'/ё/' => 'yo',

diff --git a/application/config/mimes.php b/application/config/mimes.php
@@ -140,7 +140,7 @@
 	'f4v'   =>	array('video/mp4', 'video/x-f4v'),
 	'flv'	=>	'video/x-flv',
 	'webm'	=>	'video/webm',
-	'aac'   =>	'audio/x-acc',
+	'aac'   =>	array('audio/x-aac', 'audio/aac'),
 	'm4u'   =>	'application/vnd.mpegurl',
 	'm3u'   =>	'text/plain',
 	'xspf'  =>	'application/xspf+xml',

diff --git a/application/config/user_agents.php b/application/config/user_agents.php
@@ -153,6 +153,7 @@
 	'wii'			=> 'Nintendo Wii',
 	'open web'		=> 'Open Web',
 	'openweb'		=> 'OpenWeb',
+	'meizu'                 => 'Meizu',
 
 	// Operating Systems
 	'android'		=> 'Android',

diff --git a/application/vendor/clue/stream-filter/CHANGELOG.md b/application/vendor/clue/stream-filter/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.4.1 (2019-04-09)
+
+*   Fix: Check if the function is declared before declaring it.
+    (#23 by @Niko9911)
+
+*   Improve test suite to also test against PHP 7.2 and
+    add test for base64 encoding and decoding filters.
+    (#22 by @arubacao and #25 by @Nyholm and @clue)
+
 ## 1.4.0 (2017-08-18)
 
 *   Feature / Fix: The `fun()` function does not pass filter parameter `null`

diff --git a/application/vendor/clue/stream-filter/README.md b/application/vendor/clue/stream-filter/README.md
@@ -27,13 +27,13 @@ These filters can be used to easily and efficiently perform various transformati
 * and much more.
 
 But let's face it:
-Its API is [*difficult to work with*](http://php.net/manual/en/php-user-filter.filter.php)
-and its documentation is [*subpar*](http://stackoverflow.com/questions/27103269/what-is-a-bucket-brigade).
+Its API is [*difficult to work with*](https://www.php.net/manual/en/php-user-filter.filter.php)
+and its documentation is [*subpar*](https://stackoverflow.com/questions/27103269/what-is-a-bucket-brigade).
 This combined means its powerful features are often neglected.
 
 This project aims to make these features more accessible to a broader audience.
 * **Lightweight, SOLID design** -
-  Provides a thin abstraction that is [*just good enough*](http://en.wikipedia.org/wiki/Principle_of_good_enough)
+  Provides a thin abstraction that is [*just good enough*](https://en.wikipedia.org/wiki/Principle_of_good_enough)
   and does not get in your way.
   Custom filters require trivial effort.
 * **Good test coverage** -
@@ -141,7 +141,7 @@ Filter\append($stream, function ($chunk) {
 ```
 
 > Note that once a filter has been added to stream, the stream can no longer be passed to
-> [`stream_select()`](http://php.net/manual/en/function.stream-select.php)
+> [`stream_select()`](https://www.php.net/manual/en/function.stream-select.php)
 > (and family).
 >
 > > Warning: stream_select(): cannot cast a filtered stream on this system in {file} on line {line}
@@ -178,7 +178,7 @@ For more details about its behavior, see also the [`append()`](#append) function
 The `fun($filter, $parameters = null)` function can be used to
 create a filter function which uses the given built-in `$filter`.
 
-PHP comes with a useful set of [built-in filters](http://php.net/manual/en/filters.php).
+PHP comes with a useful set of [built-in filters](https://www.php.net/manual/en/filters.php).
 Using `fun()` makes accessing these as easy as passing an input string to filter
 and getting the filtered output string.
 
@@ -191,7 +191,7 @@ assert('test' === $fun($fun('test'));
 
 Please note that not all filter functions may be available depending on installed
 PHP extensions and the PHP version in use.
-In particular, [HHVM](http://hhvm.com/) may not offer the same filter functions
+In particular, [HHVM](https://hhvm.com/) may not offer the same filter functions
 or parameters as Zend PHP.
 Accessing an unknown filter function will result in a `RuntimeException`:
 
@@ -218,7 +218,7 @@ assert('<b>hi</b>' === $ret);
 Under the hood, this function allocates a temporary memory stream, so it's
 recommended to clean up the filter function after use.
 Also, some filter functions (in particular the
-[zlib compression filters](http://php.net/manual/en/filters.compression.php))
+[zlib compression filters](https://www.php.net/manual/en/filters.compression.php))
 may use internal buffers and may emit a final data chunk on close.
 The filter function can be closed by invoking without any arguments:
 
@@ -263,10 +263,11 @@ Filter\remove($filter);
 The recommended way to install this library is [through Composer](https://getcomposer.org).
 [New to Composer?](https://getcomposer.org/doc/00-intro.md)
 
+This project follows [SemVer](https://semver.org/).
 This will install the latest supported version:
 
 ```bash
-$ composer require clue/stream-filter:^1.4
+$ composer require clue/stream-filter:^1.4.1
 ```
 
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
@@ -280,7 +281,7 @@ Older PHP versions may suffer from a number of inconsistencies documented above.
 ## Tests
 
 To run the test suite, you first need to clone this repo and then install all
-dependencies [through Composer](http://getcomposer.org):
+dependencies [through Composer](https://getcomposer.org):
 
 ```bash
 $ composer install
@@ -294,4 +295,7 @@ $ php vendor/bin/phpunit
 
 ## License
 
-MIT
+This project is released under the permissive [MIT license](LICENSE).
+
+> Did you know that I offer custom development services and issuing invoices for
+  sponsorships of releases and for contributions? Contact me (@clue) for details.
diff --git a/application/vendor/clue/stream-filter/composer.json b/application/vendor/clue/stream-filter/composer.json
@@ -18,6 +18,6 @@
     },
     "autoload": {
         "psr-4": { "Clue\\StreamFilter\\": "src/" },
-        "files": [ "src/functions.php" ]
+        "files": [ "src/functions_include.php" ]
     }
 }
diff --git a/application/vendor/clue/stream-filter/src/functions_include.php b/application/vendor/clue/stream-filter/src/functions_include.php
@@ -0,0 +1,5 @@
+<?php
+
+if (!function_exists('Clue\\StreamFilter\\append')) {
+    require __DIR__ . '/functions.php';
+}
diff --git a/application/vendor/clue/stream-filter/tests/FunTest.php b/application/vendor/clue/stream-filter/tests/FunTest.php
@@ -41,4 +41,21 @@ public function testFunInvalid()
     {
         Filter\fun('unknown');
     }
+
+    public function testFunInBase64()
+    {
+        $encode = Filter\fun('convert.base64-encode');
+        $decode = Filter\fun('convert.base64-decode');
+
+        $string = 'test';
+        $this->assertEquals(base64_encode($string), $encode($string) . $encode());
+        $this->assertEquals($string, $decode(base64_encode($string)));
+
+        $encode = Filter\fun('convert.base64-encode');
+        $decode = Filter\fun('convert.base64-decode');
+        $this->assertEquals($string, $decode($encode($string) . $encode()));
+
+        $encode = Filter\fun('convert.base64-encode');
+        $this->assertEquals(null, $encode());
+    }
 }
diff --git a/application/vendor/codeigniter/framework/application/config/foreign_chars.php b/application/vendor/codeigniter/framework/application/config/foreign_chars.php
@@ -22,10 +22,10 @@
 	'/б/' => 'b',
 	'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
 	'/ç|ć|ĉ|ċ|č/' => 'c',
-	'/Д/' => 'D',
-	'/д/' => 'd',
-	'/Ð|Ď|Đ|Δ/' => 'Dj',
-	'/ð|ď|đ|δ/' => 'dj',
+	'/Д|Δ/' => 'D',
+	'/д|δ/' => 'd',
+	'/Ð|Ď|Đ/' => 'Dj',
+	'/ð|ď|đ/' => 'dj',
 	'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
 	'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
 	'/Ф/' => 'F',
@@ -38,6 +38,8 @@
 	'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
 	'/Ĵ/' => 'J',
 	'/ĵ/' => 'j',
+	'/Θ/' => 'TH',
+	'/θ/' => 'th',
 	'/Ķ|Κ|К/' => 'K',
 	'/ķ|κ|к/' => 'k',
 	'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
@@ -54,8 +56,8 @@
 	'/ŕ|ŗ|ř|ρ|р/' => 'r',
 	'/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
 	'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
-	'/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
-	'/ț|ţ|ť|ŧ|т/' => 't',
+	'/Ț|Ţ|Ť|Ŧ|Τ|Т/' => 'T',
+	'/ț|ţ|ť|ŧ|τ|т/' => 't',
 	'/Þ|þ/' => 'th',
 	'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
 	'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
@@ -65,6 +67,10 @@
 	'/в/' => 'v',
 	'/Ŵ/' => 'W',
 	'/ŵ/' => 'w',
+	'/Φ/' => 'F',
+	'/φ/' => 'f',
+	'/Χ/' => 'CH',
+	'/χ/' => 'ch',
 	'/Ź|Ż|Ž|Ζ|З/' => 'Z',
 	'/ź|ż|ž|ζ|з/' => 'z',
 	'/Æ|Ǽ/' => 'AE',
@@ -73,10 +79,15 @@
 	'/ĳ/' => 'ij',
 	'/Œ/' => 'OE',
 	'/ƒ/' => 'f',
+	'/Ξ/' => 'KS',
 	'/ξ/' => 'ks',
+	'/Π/' => 'P',
 	'/π/' => 'p',
+	'/Β/' => 'V',
 	'/β/' => 'v',
+	'/Μ/' => 'M',
 	'/μ/' => 'm',
+	'/Ψ/' => 'PS',
 	'/ψ/' => 'ps',
 	'/Ё/' => 'Yo',
 	'/ё/' => 'yo',

diff --git a/application/vendor/codeigniter/framework/application/config/mimes.php b/application/vendor/codeigniter/framework/application/config/mimes.php
@@ -140,7 +140,7 @@
 	'f4v'   =>	array('video/mp4', 'video/x-f4v'),
 	'flv'	=>	'video/x-flv',
 	'webm'	=>	'video/webm',
-	'aac'   =>	'audio/x-acc',
+	'aac'   =>	array('audio/x-aac', 'audio/aac'),
 	'm4u'   =>	'application/vnd.mpegurl',
 	'm3u'   =>	'text/plain',
 	'xspf'  =>	'application/xspf+xml',

diff --git a/application/vendor/codeigniter/framework/application/config/user_agents.php b/application/vendor/codeigniter/framework/application/config/user_agents.php
@@ -151,6 +151,7 @@
 	'wii'			=> 'Nintendo Wii',
 	'open web'		=> 'Open Web',
 	'openweb'		=> 'OpenWeb',
+	'meizu'                 => 'Meizu',
 
 	// Operating Systems
 	'android'		=> 'Android',

diff --git a/application/vendor/codeigniter/framework/contributing.md b/application/vendor/codeigniter/framework/contributing.md
@@ -1,6 +1,5 @@
 # Contributing to CodeIgniter
 
-
 CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or [Pull Requests](http://help.github.com/send-pull-requests/) on the [CodeIgniter repository](https://github.com/bcit-ci/CodeIgniter) on GitHub.
 
 Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first:
@@ -59,7 +58,6 @@ If you are using [Tower](http://www.git-tower.com/) there is a "Sign-Off" checkb
 
 By signing your work in this manner, you certify to a "Developer's Certificate of Origin". The current version of this certificate is in the `DCO.txt` file in the root of this repository.
 
-
 ## How-to Guide
 
 There are two ways to make changes, the easy way and the hard way. Either way you will need to [create a GitHub account](https://github.com/signup/free).
@@ -68,15 +66,15 @@ Easy way GitHub allows in-line editing of files for making simple typo changes a
 
 Hard way The best way to contribute is to "clone" your fork of CodeIgniter to your development area. That sounds like some jargon, but "forking" on GitHub means "making a copy of that repo to your account" and "cloning" means "copying that code to your environment so you can work on it".
 
-1. Set up Git (Windows, Mac & Linux)
-2. Go to the CodeIgniter repo
-3. Fork it
-4. Clone your CodeIgniter repo: [email protected]:<your-name>/CodeIgniter.git
-5. Checkout the "develop" branch At this point you are ready to start making changes. 
+1. [Set up Git](https://help.github.com/en/articles/set-up-git) (Windows, Mac & Linux)
+2. Go to the [CodeIgniter repo](https://github.com/bcit-ci/CodeIgniter)
+3. [Fork it](https://help.github.com/en/articles/fork-a-repo)
+4. [Clone](https://help.github.com/en/articles/fetching-a-remote#clone) your forked CodeIgniter repo: [email protected]:<your-name>/CodeIgniter.git.
+5. Checkout the "develop" branch. At this point you are ready to start making changes.
 6. Fix existing bugs on the Issue tracker after taking a look to see nobody else is working on them.
-7. Commit the files
-8. Push your develop branch to your fork
-9. Send a pull request [http://help.github.com/send-pull-requests/](http://help.github.com/send-pull-requests/)
+7. [Commit](https://help.github.com/en/articles/adding-a-file-to-a-repository-using-the-command-line) the files
+8. [Push](https://help.github.com/en/articles/pushing-to-a-remote) your develop branch to your fork
+9. [Send a pull request](https://help.github.com/en/articles/creating-a-pull-request)
 
 The Reactor Engineers will now be alerted about the change and at least one of the team will respond. If your change fails to meet the guidelines it will be bounced, or feedback will be provided to help you improve it.
 

diff --git a/application/vendor/codeigniter/framework/system/core/CodeIgniter.php b/application/vendor/codeigniter/framework/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.10';
+	const CI_VERSION = '3.1.11';
 
 /*
  * ------------------------------------------------------

diff --git a/application/vendor/codeigniter/framework/system/core/Controller.php b/application/vendor/codeigniter/framework/system/core/Controller.php
@@ -58,6 +58,13 @@ class CI_Controller {
 	 */
 	private static $instance;
 
+	/**
+	 * CI_Loader
+	 *
+	 * @var	CI_Loader
+	 */
+	public $load;
+
 	/**
 	 * Class constructor
 	 *

diff --git a/application/vendor/codeigniter/framework/system/core/Log.php b/application/vendor/codeigniter/framework/system/core/Log.php
@@ -247,11 +247,11 @@ public function write_log($level, $msg)
 	 * @param	string	$level 	The error level
 	 * @param	string	$date 	Formatted date string
 	 * @param	string	$message 	The log message
-	 * @return	string	Formatted log line with a new line character '\n' at the end
+	 * @return	string	Formatted log line with a new line character at the end
 	 */
 	protected function _format_line($level, $date, $message)
 	{
-		return $level.' - '.$date.' --> '.$message."\n";
+		return $level.' - '.$date.' --> '.$message.PHP_EOL;
 	}
 
 	// --------------------------------------------------------------------