Merge branch 'develop' into enhance/testing

Author: jim-parry

application/Config/Paths.php

@@ -75,4 +75,16 @@ class Paths
 	 * with your host's needs.
 	 */
 	public $publicDirectory = 'public';
+
+	/*
+	 * ---------------------------------------------------------------
+	 * VIEW DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * 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
+	 * is used when no value is provided to `Services::renderer()`.
+	 */
+	public $viewDirectory = 'application/Views';
 }

application/Views/welcome_message.php

@@ -124,7 +124,7 @@
 				</pre>
 
 				<p>If you are exploring CodeIgniter for the very first time, you
-					should start by reading the (in progress)
+					should start by reading the
 					<a href="https://bcit-ci.github.io/CodeIgniter4">User Guide</a>.</p>
 
 			</div>

system/Autoloader/FileLocator.php

@@ -43,8 +43,7 @@
  * Allows loading non-class files in a namespaced manner.
  * Works with Helpers, Views, etc.
  *
- * @todo sanitize filenames prior to checking them...
- *
+  *
  * @package CodeIgniter
  */
 class FileLocator
@@ -133,7 +132,6 @@ public function locateFile(string $file, string $folder = null, string $ext = 'p
 		// IF we have a folder name, then the calling function
 		// expects this file to be within that folder, like 'Views',
 		// or 'libraries'.
-		// @todo Allow it to check with and without the nested folder.
 		if ( ! empty($folder) && strpos($filename, $folder) === false)
 		{
 			$filename = $folder . '/' . $filename;

system/CLI/CommandRunner.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\CLI;
+<?php
+namespace CodeIgniter\CLI;
 
 /**
  * CodeIgniter
@@ -39,6 +40,7 @@
 
 class CommandRunner extends Controller
 {
+
 	/**
 	 * Stores the info about found Commands.
 	 *
@@ -73,7 +75,6 @@ public function _remap($method, ...$params)
 
 	//--------------------------------------------------------------------
 
-
 	/**
 	 * @param array $params
 	 *
@@ -143,12 +144,18 @@ protected function createCommandList()
 		foreach ($files as $file)
 		{
 			$className = service('locator')->findQualifiedNameFromPath($file);
-
 			if (empty($className) || ! class_exists($className))
 			{
 				continue;
 			}
 
+			$class = new \ReflectionClass($className);
+
+			if ( ! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class))
+			{
+				continue;
+			}
+
 			$class = new $className($this->logger, $this);
 
 			// Store it!

system/CodeIgniter.php

@@ -60,7 +60,7 @@ class CodeIgniter
 	/**
 	 * The current version of CodeIgniter Framework
 	 */
-	const CI_VERSION = '4.0.0-alpha.1';
+	const CI_VERSION = '4.0.0-alpha.2';
 
 	/**
 	 * App startup time.
@@ -274,10 +274,11 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 		$filters = Services::filters();
 
 		// If any filters were specified within the routes file,
-		// we need to ensure it's active for the current request (before only)
+		// we need to ensure it's active for the current request
 		if (! is_null($routeFilter))
 		{
 			$filters->enableFilter($routeFilter, 'before');
+            $filters->enableFilter($routeFilter, 'after');
 		}
 
 		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->uri->getPath();

system/Config/Services.php

@@ -482,7 +482,7 @@ public static function parser($viewPath = APPPATH.'Views/', $config = null, bool
 	 *
 	 * @return \CodeIgniter\View\View
 	 */
-	public static function renderer($viewPath = APPPATH.'Views/', $config = null, bool $getShared = true)
+	public static function renderer($viewPath = null, $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
@@ -494,6 +494,13 @@ public static function renderer($viewPath = APPPATH.'Views/', $config = null, bo
 			$config = new \Config\View();
 		}
 
+		if (is_null($viewPath))
+		{
+			$paths = config('Paths');
+
+			$viewPath = $paths->viewDirectory;
+		}
+
 		return new \CodeIgniter\View\View($config, $viewPath, self::locator(true), CI_DEBUG, self::logger(true));
 	}
 

system/Database/Database.php

@@ -99,7 +99,7 @@ public function load(array $params = [], string $alias)
 	 */
 	public function loadForge(ConnectionInterface $db)
 	{
-		$className = strpos($db->DBDriver, '\\') === false ? '\CodeIgniter\Database\\' . $db->DBDriver . '\\Forge' : $db->DBDriver . '\\Connection';
+		$className = strpos($db->DBDriver, '\\') === false ? '\CodeIgniter\Database\\' . $db->DBDriver . '\\Forge' : $db->DBDriver . '\\Forge';
 
 		// Make sure a connection exists
 		if ( ! $db->connID)

system/Debug/Toolbar/Views/toolbar.css

@@ -26,6 +26,7 @@
 #debug-bar {
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 16px;
+	font-weight: 400;
 	line-height: 36px;
 	background: #fff;
 	position: fixed;
@@ -93,7 +94,7 @@
 #debug-bar h1 {
 	font-size: 16px;
 	line-height: 36px;
-	font-weight: 300;
+	font-weight: 500;
 	margin: 0 16px 0 0;
 	padding: 0;
 	text-align: left;
@@ -118,7 +119,7 @@
 
 #debug-bar h2 {
 	font-size: 16px;
-	font-weight: 300;
+	font-weight: 500;
 	margin: 0;
 	padding: 0;
 }
@@ -214,6 +215,7 @@
 	padding: 0 10px;
 	color: inherit;
 	text-decoration: none;
+	letter-spacing: normal;
 }
 
 #debug-bar .ci-label.active {
@@ -246,7 +248,7 @@
 
 #debug-bar table {
 	margin: 0 0 10px 20px;
-	font-size: 13px;
+	font-size: 0.9rem;
 	border-collapse: collapse;
 	width: 100%;
 }
@@ -263,7 +265,7 @@
 
 #debug-bar td {
 	border: none;
-	padding: 2px 10px 2px 5px;
+	padding: 0 10px 0 5px;
 	margin: 0;
 }
 
@@ -272,7 +274,7 @@
 }
 
 #debug-bar tr td:first-child {
-	width: 20%;
+	max-width: 20%;
 }
 
 #debug-bar tr td:first-child.narrow {
@@ -315,9 +317,9 @@
 #debug-bar table.timeline .timer {
 	position: absolute;
 	display: inline-block;
-	padding: 3px;
-	bottom: 9px;
-	border-radius: 3px;
+	padding: 5px;
+	top: 40%;
+	border-radius: 4px;
 	background-color: #999;
 }
 

system/Router/RouteCollection.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Router;
+<?php
+namespace CodeIgniter\Router;
 
 /**
  * CodeIgniter
@@ -132,16 +133,16 @@ class RouteCollection implements RouteCollectionInterface
 	 * @var array
 	 */
 	protected $routes = [
-		'*'       => [],
-		'options' => [],
-		'get'     => [],
-		'head'    => [],
-		'post'    => [],
-		'put'     => [],
-		'delete'  => [],
-		'trace'   => [],
-		'connect' => [],
-		'cli'     => [],
+		'*'			 => [],
+		'options'	 => [],
+		'get'		 => [],
+		'head'		 => [],
+		'post'		 => [],
+		'put'		 => [],
+		'delete'	 => [],
+		'trace'		 => [],
+		'connect'	 => [],
+		'cli'		 => [],
 	];
 
 	/**
@@ -383,7 +384,8 @@ public function get404Override()
 	 */
 	protected function discoverRoutes()
 	{
-		if ($this->didDiscover) return;
+		if ($this->didDiscover)
+			return;
 
 		// We need this var in local scope
 		// so route files can access it.
@@ -520,8 +522,11 @@ public function getRoutes($verb = null): array
 		{
 			// Keep current verb's routes at the beginning so they're matched
 			// before any of the generic, "add" routes.
-			$collection = array_merge($this->routes[$verb], $this->routes['*']);
-
+			if (isset($this->routes['*']))
+			{
+				$extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
+				$collection = array_merge($this->routes[$verb], $extraRules);
+			}
 			foreach ($collection as $r)
 			{
 				$key = key($r['route']);
@@ -806,13 +811,13 @@ public function resource(string $name, array $options = null): RouteCollectionIn
 
 		$methods = isset($options['only']) ? is_string($options['only']) ? explode(',', $options['only']) : $options['only'] : ['index', 'show', 'create', 'update', 'delete', 'new', 'edit'];
 
-		if(isset($options['except']))
+		if (isset($options['except']))
 		{
 			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
 			$c = count($methods);
-			for($i = 0; $i < $c; $i++)
+			for ($i = 0; $i < $c; $i ++)
 			{
-				if(in_array($methods[$i], $options['except']))
+				if (in_array($methods[$i], $options['except']))
 				{
 					unset($methods[$i]);
 				}
@@ -822,16 +827,16 @@ public function resource(string $name, array $options = null): RouteCollectionIn
 		if (in_array('index', $methods))
 			$this->get($name, $new_name . '::index', $options);
 		if (in_array('new', $methods))
-			$this->get($name. '/new', $new_name . '::new', $options);
+			$this->get($name . '/new', $new_name . '::new', $options);
 		if (in_array('edit', $methods))
-			$this->get($name . '/' . $id. '/edit', $new_name . '::edit/$1', $options);
+			$this->get($name . '/' . $id . '/edit', $new_name . '::edit/$1', $options);
 		if (in_array('show', $methods))
 			$this->get($name . '/' . $id, $new_name . '::show/$1', $options);
 		if (in_array('create', $methods))
 			$this->post($name, $new_name . '::create', $options);
 		if (in_array('update', $methods))
 			$this->put($name . '/' . $id, $new_name . '::update/$1', $options);
-			$this->patch($name . '/' . $id, $new_name . '::update/$1', $options);
+		$this->patch($name . '/' . $id, $new_name . '::update/$1', $options);
 		if (in_array('delete', $methods))
 			$this->delete($name . '/' . $id, $new_name . '::delete/$1', $options);
 
@@ -1137,7 +1142,7 @@ public function isFiltered(string $search): bool
 	 */
 	public function getFilterForRoute(string $search): string
 	{
-		if (! $this->isFiltered($search))
+		if ( ! $this->isFiltered($search))
 		{
 			return '';
 		}
@@ -1211,10 +1216,10 @@ protected function create(string $verb, string $from, $to, array $options = null
 			$from = trim($from, '/');
 		}
 
-		$options = array_merge((array)$this->currentOptions, (array)$options);
+		$options = array_merge((array) $this->currentOptions, (array) $options);
 
 		// Hostname limiting?
-		if (! empty($options['hostname']))
+		if ( ! empty($options['hostname']))
 		{
 			// @todo determine if there's a way to whitelist hosts?
 			if (strtolower($_SERVER['HTTP_HOST']) != strtolower($options['hostname']))
@@ -1245,7 +1250,8 @@ protected function create(string $verb, string $from, $to, array $options = null
 			for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i ++ )
 			{
 				$to = preg_replace_callback(
-						'/\$X/', function ($m) use ($i) {
+						'/\$X/', function ($m) use ($i)
+				{
 					return '$' . $i;
 				}, $to, 1
 				);

tests/_support/Commands/AbstractInfo.php

@@ -0,0 +1,15 @@
+<?php
+namespace Tests\Support\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CodeIgniter;
+
+abstract class AbstractInfo extends BaseCommand
+{
+
+	protected $group = 'demo';
+	protected $name = 'app:pablo';
+	protected $description = 'Displays basic application information.';
+
+}