Merge remote-tracking branch 'upstream/develop' into 4.4

 Conflicts:
	tests/system/CodeIgniterTest.php
	tests/system/Commands/RoutesTest.php
	tests/system/CommonFunctionsTest.php
	tests/system/Config/FactoriesTest.php
	tests/system/Database/Live/ForgeTest.php
	tests/system/Database/ModelFactoryTest.php
	tests/system/Entity/EntityTest.php
	tests/system/Filters/FiltersTest.php
	tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
	tests/system/HTTP/CURLRequestTest.php
	tests/system/HTTP/DownloadResponseTest.php
	tests/system/HTTP/Files/FileCollectionTest.php
	tests/system/HTTP/ResponseTest.php
	tests/system/HTTP/URITest.php
	tests/system/Router/AutoRouterImprovedTest.php
	tests/system/Router/Controllers/Index.php
	tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
	tests/system/Security/SecurityCSRFSessionTest.php
	tests/system/Security/SecurityTest.php
	tests/system/Test/FeatureTestTraitTest.php

Author: kenjis

phpstan-baseline.php

@@ -1,16 +1,6 @@
 <?php declare(strict_types = 1);
 
 $ignoreErrors = [];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:discoverComposerNamespaces\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:register\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClass\'\\} given\\.$#',
 	'count' => 1,

system/Autoloader/Autoloader.php

@@ -148,6 +148,8 @@ private function loadComposerInfo(Modules $modules): void
 
     /**
      * Register the loader with the SPL autoloader stack.
+     *
+     * @return void
      */
     public function register()
     {
@@ -445,6 +447,8 @@ private function loadComposerClassmap(ClassLoader $composer): void
      * Locates autoload information from Composer, if available.
      *
      * @deprecated No longer used.
+     *
+     * @return void
      */
     protected function discoverComposerNamespaces()
     {

tests/_support/Commands/AppInfo.php

@@ -23,12 +23,12 @@ class AppInfo extends BaseCommand
     protected $arguments   = ['draft' => 'unused'];
     protected $description = 'Displays basic application information.';
 
-    public function run(array $params)
+    public function run(array $params): void
     {
         CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
     }
 
-    public function bomb()
+    public function bomb(): void
     {
         try {
             CLI::color('test', 'white', 'Background');
@@ -37,7 +37,7 @@ public function bomb()
         }
     }
 
-    public function helpme()
+    public function helpme(): void
     {
         $this->call('help');
     }

tests/_support/Commands/InvalidCommand.php

@@ -27,7 +27,7 @@ public function __construct()
         throw new ReflectionException();
     }
 
-    public function run(array $params)
+    public function run(array $params): void
     {
         CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
     }

tests/_support/Commands/LanguageCommand.php

@@ -27,7 +27,7 @@ class LanguageCommand extends BaseCommand
         '--sort' => 'Turn on/off the sortImports flag.',
     ];
 
-    public function run(array $params)
+    public function run(array $params): void
     {
         $this->setHasClassName(false);
         $params[0] = 'Foobar';

tests/_support/Commands/ParamsReveal.php

@@ -21,7 +21,7 @@ class ParamsReveal extends BaseCommand
     protected $description = 'Reveal params';
     public static $args;
 
-    public function run(array $params)
+    public function run(array $params): void
     {
         static::$args = $params;
     }

tests/_support/Commands/Unsuffixable.php

@@ -65,7 +65,7 @@ class Unsuffixable extends BaseCommand
     /**
      * Actually execute a command.
      */
-    public function run(array $params)
+    public function run(array $params): void
     {
         $this->component = 'Command';
         $this->directory = 'Commands';

tests/_support/Controllers/Popcorn.php

@@ -33,7 +33,7 @@ public function pop()
         return $this->respond('Oops', 567, 'Surprise');
     }
 
-    public function popper()
+    public function popper(): void
     {
         throw new RuntimeException('Surprise', 500);
     }
@@ -61,12 +61,12 @@ public function index3()
         return $this->response->setJSON(['lang' => $this->request->getLocale()]);
     }
 
-    public function canyon()
+    public function canyon(): void
     {
         echo 'Hello-o-o ' . $this->request->getGet('foo');
     }
 
-    public function cat()
+    public function cat(): void
     {
     }
 

tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

@@ -15,7 +15,7 @@
 
 class Migration_Create_test_tables extends Migration
 {
-    public function up()
+    public function up(): void
     {
         // User Table
         $this->forge->addField([
@@ -160,7 +160,7 @@ public function up()
         }
     }
 
-    public function down()
+    public function down(): void
     {
         $this->forge->dropTable('user', true);
         $this->forge->dropTable('job', true);

tests/_support/Database/Seeds/AnotherSeeder.php

@@ -15,7 +15,7 @@
 
 class AnotherSeeder extends Seeder
 {
-    public function run()
+    public function run(): void
     {
         $row = [
             'name'    => 'Jerome Lohan',