Release 4.0.0-alpha.5

Author: jim-parry

README.md

@@ -1,6 +1,7 @@
 # CodeIgniter 4 Framework
 
 ## What is CodeIgniter?
+
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible, and secure. 
 More information can be found at the [official site](http://codeigniter.com).
 
@@ -29,6 +30,7 @@ framework are exposed.
 The user guide updating and deployment is a bit awkward at the moment, but we are working on it!
 
 ## Repository Management
+
 We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
@@ -51,12 +53,14 @@ Remember that some components that were part of CodeIgniter 3 are being moved
 to optional packages, with their own repository.
 
 ## Contributing
+
 We welcome contributions from the community.
 
 Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing.md) section in the development repository.
 
 ## Server Requirements
-PHP version 7.1 or higher is required, with the following extensions installed: 
+
+PHP version 7.2 or higher is required, with the following extensions installed: 
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library

app/Config/Autoload.php

@@ -36,7 +36,7 @@ public function __construct()
 		 * to their location on the file system. These are used by the
 		 * Autoloader to locate files the first time they have been instantiated.
 		 *
-		 * The '/application' and '/system' directories are already mapped for
+		 * The '/app' and '/system' directories are already mapped for
 		 * you. You may change the name of the 'App' namespace if you wish,
 		 * but this should be done prior to creating any namespaced classes,
 		 * else you will need to modify all of those classes for this to work.

app/Config/Email.php

@@ -7,9 +7,9 @@ class Filters extends BaseConfig
 	// Makes reading things below nicer,
 	// and simpler to change out script that's used.
 	public $aliases = [
-		'csrf'     => \App\Filters\CSRF::class,
-		'toolbar'  => \App\Filters\DebugToolbar::class,
-		'honeypot' => \App\Filters\Honeypot::class,
+		'csrf'     => \CodeIgniter\Filters\CSRF::class,
+		'toolbar'  => \CodeIgniter\Filters\DebugToolbar::class,
+		'honeypot' => \CodeIgniter\Filters\Honeypot::class,
 	];
 
 	// Always applied before every request

app/Config/Filters.php

@@ -14,6 +14,16 @@ class Modules
 	 */
 	public $enabled = true;
 
+	/*
+	 |--------------------------------------------------------------------------
+	 | Auto-Discovery Within Composer Packages Enabled?
+	 |--------------------------------------------------------------------------
+	 |
+	 | If true, then auto-discovery will happen across all namespaces loaded
+	 | by Composer, as well as the namespaces configured locally.
+	 */
+	public $discoverInComposer = true;
+
 	/*
 	|--------------------------------------------------------------------------
 	| Auto-discover Rules

app/Config/Modules.php

@@ -2,7 +2,7 @@
 
 /**
  * Holds the paths that are used by the system to
- * locate the main directories, application, system, etc.
+ * locate the main directories, app, system, etc.
  * Modifying these allows you to re-structure your application,
  * share a system folder between multiple applications, and more.
  *
@@ -35,7 +35,7 @@ class Paths
 	 *
 	 * NO TRAILING SLASH!
 	 */
-	public $appDirectory = __DIR__ . '/../../app';
+	public $appDirectory = __DIR__ . '/..';
 
 	/*
 	 * ---------------------------------------------------------------
@@ -45,7 +45,7 @@ class Paths
 	 * This variable must contain the name of your "writable" directory.
 	 * The writable directory allows you to group all directories that
 	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the application and/or
+	 * for maximum security, keeping it out of the app and/or
 	 * system directories.
 	 */
 	public $writableDirectory = __DIR__ . '/../../writable';
@@ -58,7 +58,7 @@ class Paths
 	 * This variable must contain the name of your "tests" directory.
 	 * The writable directory allows you to group all directories that
 	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the application and/or
+	 * for maximum security, keeping it out of the app and/or
 	 * system directories.
 	 */
 	public $testsDirectory = __DIR__ . '/../../tests';
@@ -70,8 +70,8 @@ class Paths
 	 *
 	 * This variable must contain the name of the directory that
 	 * contains the view files used by your application. By
-	 * default this is in `application/Views`. This value
+	 * default this is in `app/Views`. This value
 	 * is used when no value is provided to `Services::renderer()`.
 	 */
-	public $viewDirectory = __DIR__ . '/../../app/Views';
+	public $viewDirectory = __DIR__ . '/../Views';
 }

app/Config/Paths.php

@@ -30,20 +30,4 @@ class Services extends CoreServices
 	//
 	//        return new \CodeIgniter\Example();
 	//    }
-
-	public static function honeypot(BaseConfig $config = null, $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('honeypot', $config);
-		}
-
-		if (is_null($config))
-		{
-			$config = new \Config\Honeypot();
-		}
-
-		return new \CodeIgniter\Honeypot\Honeypot($config);
-	}
-
 }

app/Config/Services.php

@@ -26,6 +26,43 @@ class Toolbar extends BaseConfig
 		\CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
 		\CodeIgniter\Debug\Toolbar\Collectors\Events::class,
 	];
+
+	/*
+	|--------------------------------------------------------------------------
+	| Max History
+	|--------------------------------------------------------------------------
+	| The Toolbar allows you to view recent requests that have been made to
+	| the application while the toolbar is active. This allows you to quickly
+	| view and compare multiple requests.
+	|
+	| $maxHistory sets a limit on the number of past requests that are stored,
+	| helping to conserve file space used to store them. You can set it to
+	| 0 (zero) to not have any history stored, or -1 for unlimited history.
+	|
+	*/
 	public $maxHistory = 20;
-	public $viewsPath  = SYSTEMPATH . 'Debug/Toolbar/Views/';
+
+	/*
+	|--------------------------------------------------------------------------
+	| Toolbar Views Path
+	|--------------------------------------------------------------------------
+	| The full path to the the views that are used by the toolbar.
+	| MUST have a trailing slash.
+	|
+	*/
+	public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
+
+	/*
+	|--------------------------------------------------------------------------
+	| Max Queries
+	|--------------------------------------------------------------------------
+	| If the Database Collector is enabled, it will log every query that the
+	| the system generates so they can be displayed on the toolbar's timeline
+	| and in the query log. This can lead to memory issues in some instances
+	| with hundreds of queries.
+	|
+	| $maxQueries defines the maximum amount of queries that will be stored.
+	|
+	*/
+	public $maxQueries = 100;
 }