Release 4.0.0-rc.4

app/Config/App.php

@@ -21,7 +21,7 @@ class App extends BaseConfig
 	| environments.
 	|
 	*/
-	public $baseURL = 'http://localhost:8080';
+	public $baseURL = 'http://localhost:8080/';
 
 	/*
 	|--------------------------------------------------------------------------

app/Config/Autoload.php

@@ -50,9 +50,9 @@ public function __construct()
 		 *   `];
 		 */
 		$psr4 = [
-			'Config'      => APPPATH . 'Config',
-			APP_NAMESPACE => APPPATH,                // For custom namespace
 			'App'         => APPPATH,                // To ensure filters, etc still found,
+			APP_NAMESPACE => APPPATH,                // For custom namespace
+			'Config'      => APPPATH . 'Config',
 		];
 
 		/**

app/Config/Database.php

@@ -62,9 +62,9 @@ class Database extends \CodeIgniter\Database\Config
 		'hostname' => '127.0.0.1',
 		'username' => '',
 		'password' => '',
-		'database' => '',
-		'DBDriver' => '',
-		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE.
+		'database' => ':memory:',
+		'DBDriver' => 'SQLite3',
+		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
 		'pConnect' => false,
 		'DBDebug'  => (ENVIRONMENT !== 'production'),
 		'cacheOn'  => false,

app/Config/Email.php

@@ -1,7 +1,9 @@
 <?php
 namespace Config;
 
-class Email
+use CodeIgniter\Config\BaseConfig;
+
+class Email extends BaseConfig
 {
 
 	/**
@@ -14,6 +16,11 @@ class Email
 	 */
 	public $fromName;
 
+	/**
+	 * @var string
+	 */
+	public $recipients;
+
 	/**
 	 * The "user agent"
 	 *

app/Config/Logger.php

@@ -38,9 +38,8 @@ class Logger extends BaseConfig
 	|--------------------------------------------------------------------------
 	| Error Logging Directory Path
 	|--------------------------------------------------------------------------
-	|
-	|
-	|
+	| By default, logs are written to WRITEPATH . 'logs/'
+	| Specify a different destination here, if desired.
 	*/
 	public $path = '';
 
@@ -102,19 +101,13 @@ class Logger extends BaseConfig
 			],
 
 			/*
-			 * Leave this BLANK unless you would like to set something other than the default
-			 * writeable/logs/ directory. Use a full getServer path with trailing slash.
-			 */
-			'path'            => WRITEPATH . 'logs/',
-
-			/*
-			 * The default filename extension for log files. The default 'php' allows for
-			 * protecting the log files via basic scripting, when they are to be stored
-			 * under a publicly accessible directory.
+			 * The default filename extension for log files.
+			 * An extension of 'php' allows for protecting the log files via basic
+			 * scripting, when they are to be stored under a publicly accessible directory.
 			 *
-			 * Note: Leaving it blank will default to 'php'.
+			 * Note: Leaving it blank will default to 'log'.
 			 */
-			'fileExtension'   => 'php',
+			'fileExtension'   => '',
 
 			/*
 			 * The file system permissions to be applied on newly created log files.

app/Config/Routes.php

@@ -1,22 +1,5 @@
 <?php namespace Config;
 
-/**
- * --------------------------------------------------------------------
- * URI Routing
- * --------------------------------------------------------------------
- * This file lets you re-map URI requests to specific controller functions.
- *
- * Typically there is a one-to-one relationship between a URL string
- * and its corresponding controller class/method. The segments in a
- * URL normally follow this pattern:
- *
- *    example.com/class/method/id
- *
- * In some instances, however, you may want to remap this relationship
- * so that a different class/function is called than the one
- * corresponding to the URL.
- */
-
 // Create a new instance of our RouteCollection class.
 $routes = Services::routes(true);
 
@@ -31,31 +14,6 @@
  * --------------------------------------------------------------------
  * Router Setup
  * --------------------------------------------------------------------
- * The RouteCollection object allows you to modify the way that the
- * Router works, by acting as a holder for it's configuration settings.
- * The following methods can be called on the object to modify
- * the default operations.
- *
- *    $routes->defaultNamespace()
- *
- * Modifies the namespace that is added to a controller if it doesn't
- * already have one. By default this is the global namespace (\).
- *
- *    $routes->defaultController()
- *
- * Changes the name of the class used as a controller when the route
- * points to a folder instead of a class.
- *
- *    $routes->defaultMethod()
- *
- * Assigns the method inside the controller that is ran when the
- * Router is unable to determine the appropriate method to run.
- *
- *    $routes->setAutoRoute()
- *
- * Determines whether the Router will attempt to match URIs to
- * Controllers when no specific route has been defined. If false,
- * only routes that have been defined here will be available.
  */
 $routes->setDefaultNamespace('App\Controllers');
 $routes->setDefaultController('Home');

contributing.md

@@ -3,77 +3,90 @@
 
 ## Contributions
 
-We expect all contributions to conform to our style guide, be commented (inside the PHP source files), 
-be documented (in the user guide), and unit tested (in the test folder). 
+We expect all contributions to conform to our [style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.rst), be commented (inside the PHP source files), 
+be documented (in the [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)). 
 There is a [Contributing to CodeIgniter](./contributing/README.rst) section in the repository which describes the contribution process; this page is an overview.
 
+The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
 ## Issues
 
-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:
+Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please make sure that:
 
-1. There is not already an open Issue
-2. The issue has already been fixed (check the develop branch, or look for closed Issues)
-3. Is it something really obvious that you can fix yourself?
+1. There is not already an open [Issue](https://github.com/codeigniter4/CodeIgniter4/issues)
+2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
+3. It's not something really obvious that you can fix yourself
 
-Reporting issues is helpful but an even [better approach](./contributing/workflow.rst) is to send a Pull Request, which is done by "Forking" the main repository and committing to your own copy. This will require you to use the version control system called Git.
+Reporting Issues is helpful, but an even [better approach](./contributing/workflow.rst) is to send a [Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by [Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
 
 ## Guidelines
 
-Before we look into how, here are the guidelines. If your Pull Requests fail
-to pass these guidelines it will be declined and you will need to re-submit
+Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
+to pass these guidelines, they will be declined, and you will need to re-submit
 when you’ve made the changes. This might sound a bit tough, but it is required
-for us to maintain quality of the code-base.
+for us to maintain quality of the codebase.
 
 ### PHP Style
 
 All code must meet the [Style Guide](./contributing/styleguide.rst).
-This makes certain that all code is the same format as the existing code and means it will be as readable as possible.
+This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
 
 ### Documentation
 
-If you change anything that requires a change to documentation then you will need to add it. New classes, methods, parameters, changing default values, etc are all things that will require a change to documentation. The change-log must also be updated for every change. Also PHPDoc blocks must be maintained.
+If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
 
 ### Compatibility
 
-CodeIgniter4 requires PHP 7.2.
+CodeIgniter4 requires [PHP 7.2](https://php.net/releases/7_2_0.php).
 
 ### Branching
 
-CodeIgniter4 uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all pull requests to be sent to the "develop" branch. This is
-where the next planned version will be developed. The "master" branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to "develop" and any sent to "master" will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork.
+CodeIgniter4 uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all 
+Pull Requests to be sent to the "develop" branch; this is where the next planned version will be developed. 
+The "master" branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an 
+emergency security patch) can be applied to the "master" branch to create a new version, without worrying 
+about other features holding it up. For this reason, all commits need to be made to the "develop" branch, 
+and any sent to the "master" branch will be closed automatically. If you have multiple changes to submit, 
+please place all changes into their own branch on your fork.
 
-One thing at a time: A pull request should only contain one change. That does not mean only one commit, but one change - however many commits it took. The reason for this is that if you change X and Y but send a pull request for both at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests.
+**One thing at a time:** A pull request should only contain one change. That does not mean only one commit, 
+but one change - however many commits it took. The reason for this is that if you change X and Y, 
+but send a pull request for both at the same time, we might really want X but disagree with Y, 
+meaning we cannot merge the request. Using the Git-Flow branching model you can create new 
+branches for both of these features and send two requests.
+
+A reminder: **please use separate branches for each of your PRs** - it will make it easier for you to keep changes separate from
+each other and from whatever else you are doing with your repository!
 
 ### Signing
 
-You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open source project. This is *not* just a "signed-off-by" commit, but instead a digitally signed one.
+You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open source project. This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
 
 ## How-to Guide
 
 The best way to contribute is to fork the CodeIgniter4 repository, and "clone" that 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 CodeIgniter4 repo
-3. Fork it (to your Github account)
-4. Clone your CodeIgniter repo: [email protected]:\<your-name>/CodeIgniter4.git
-5. Create a new branch in your project for each set of changes you want to make.
-6. Fix existing bugs on the Issue tracker after taking a look to see nobody else is working on them.
-7. Commit the changed files in your contribution branch
-8. Push your contribution branch to your fork
-9. Send a pull request [http://help.github.com/send-pull-requests/](http://help.github.com/send-pull-requests/)
+1. Set up Git ([Windows](https://git-scm.com/download/win), [Mac](https://git-scm.com/download/mac), & [Linux](https://git-scm.com/download/linux)).
+2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
+3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your Github account).
+4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `[email protected]:\<your-name>/CodeIgniter4.git`
+5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
+6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
+7. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
+8. [Push](https://help.github.com/en/articles/pushing-to-a-remote) your contribution branch to your fork.
+9. Send a [pull request](http://help.github.com/send-pull-requests/).
 
-The codebase maintainers 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.
+The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
 
-Once the maintainer handling your pull request is happy with it they will merge it into develop and your patch will be part of the next release.
+Once the maintainer handling your pull request is satisfied with it they will approve the pull request and merge it into the "develop" branch; your patch will now be part of the next release!
 
 ### Keeping your fork up-to-date
 
-Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for a URL of a Git repository. By default your fork will have a remote named "origin" which points to your fork, but you can add another remote named "codeigniter" which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote but you can pull from this develop branch to update your own.
+Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "codeigniter", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
 
-If you are using command-line you can do the following:
+If you are using the command-line, you can do the following to update your fork to the latest changes:
 
 1. `git remote add codeigniter git://github.com/codeigniter4/CodeIgniter4.git`
 2. `git pull codeigniter develop`
 3. `git push origin develop`
 
-Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
+Your fork is now up to date. This should be done regularly and, at the least, before you submit a pull request.

license.txt

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2014-2019 British Columbia Institute of Technology
-Copyright (c) 2019 CodeIgniter Foundation
+Copyright (c) 2019-2020 CodeIgniter Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

public/.htaccess

@@ -17,7 +17,8 @@ Options All -Indexes
 	# RewriteBase /
 
 	# Redirect Trailing Slashes...
-    RewriteRule ^(.*)/$ /$1 [L,R=301]
+	RewriteCond %{REQUEST_FILENAME} !-d
+    	RewriteRule ^(.*)/$ /$1 [L,R=301]
 
 	# Rewrite "www.example.com -> example.com"
 	RewriteCond %{HTTPS} !=on

tests/_support/Models/ValidModel.php

@@ -22,7 +22,7 @@ class ValidModel extends Model
 			'required',
 			'min_length[3]',
 		],
-		'token' => 'in_list[{id}]',
+		'token' => 'permit_empty|in_list[{id}]',
 	];
 
 	protected $validationMessages = [