Merge pull request #1 from bcit-ci/develop

Update From Branch

Author: JakeAi

README.md

@@ -63,7 +63,7 @@ if you want to take the lead for one of them.
 
 We are not looking for out-of-scope contributions, only those that would be considered part of our controlled evolution!
 
-Please read the *Contributing to CodeIgniter* section in the user guide
+Please read the [*Contributing to CodeIgniter*](https://github.com/bcit-ci/CodeIgniter4/blob/develop/contributing.md) section in the user guide
 
 ## Server Requirements
 PHP version 7.0.15 or higher is required, with the following extensions installed: 

application/Config/App.php

@@ -292,7 +292,6 @@ class App extends BaseConfig
 	| and can be of any length, though the more random the characters
 	| the better.
 	|
-	| If you use the Model class' hashedID methods, this must be filled out.
 	*/
 	public $salt = '';
 

application/Config/Events.php

@@ -30,4 +30,7 @@
 if (ENVIRONMENT != 'production')
 {
 	Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+
+	// Handles the display of the toolbar itself. MUST remain here for toolbar to be displayed.
+	Events::on('pre_system', 'CodeIgniter\Debug\Toolbar::eventHandler');
 }

application/Config/Mimes.php

@@ -280,7 +280,7 @@ class Mimes
 	/**
 	 * Attempts to determine the best mime type for the given file extension.
 	 *
-	 * @param string $ext
+	 * @param string $extension
 	 *
 	 * @return string|null The mime type found, or none if unable to determine.
 	 */

application/Config/View.php

@@ -10,7 +10,7 @@ class View extends \CodeIgniter\Config\View
 	 * calls so that it is available to all views. If that is the case,
 	 * set $saveData to true.
 	 */
-	public $saveData = false;
+	public $saveData = true;
 
 	/**
 	 * Parser Filters map a filter name with any PHP callable. When the

application/Filters/DebugToolbar.php

@@ -41,16 +41,39 @@ public function after(RequestInterface $request, ResponseInterface $response)
 
 			$toolbar = Services::toolbar(new App());
 			$stats   = $app->getPerformanceStats();
-
-			return $response->appendBody(
-				$toolbar->run(
-					$stats['startTime'],
-					$stats['totalTime'],
-					$stats['startMemory'],
-					$request,
-					$response
-				)
+			$output  = $toolbar->run(
+				$stats['startTime'],
+				$stats['totalTime'],
+				$stats['startMemory'],
+				$request,
+				$response
 			);
+
+			helper(['filesystem', 'url']);
+
+			// Updated to time() so we can get history
+			$time = time();
+
+			if (! is_dir(WRITEPATH.'debugbar'))
+			{
+				mkdir(WRITEPATH.'debugbar', 0777);
+			}
+
+			write_file(WRITEPATH .'debugbar/'.'debugbar_' . $time, $output, 'w+');
+
+			$script = PHP_EOL
+				. '<script type="text/javascript" id="debugbar_loader" '
+				. 'data-time="' . $time . '" '
+				. 'src="' . rtrim(site_url(), '/') . '?debugbar"></script>'
+				. PHP_EOL;
+
+			if (strpos($response->getBody(), '</body>') !== false)
+			{
+				return $response->setBody(str_replace('</body>', $script . '</body>',
+					$response->getBody()));
+			}
+
+			return $response->appendBody($script);
 		}
 	}
 

rewrite.php

@@ -8,6 +8,10 @@
  * functionality so the site will operate as normal.
  */
 
+// If we're serving the site locally, then we need
+// to let the application know that we're in development mode
+$_SERVER['CI_ENVIRONMENT'] = 'development';
+
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
 $path = __DIR__.'/public/'.ltrim($uri,'/');
@@ -21,9 +25,4 @@
 
 // Otherwise, we'll load the index file and let
 // the framework handle the request from here.
-
-// If we're serving the site locally, then we need
-// to let the application know that we're in development mode
-$_SERVER['CI_ENVIRONMENT'] = 'development';
-
 require_once __DIR__.'/public/index.php';

system/API/ResponseTrait.php

@@ -140,7 +140,7 @@ public function fail($messages, int $status = 400, string $code = null, string $
 	{
 		if ( ! is_array($messages))
 		{
-			$messages = [$messages];
+			$messages = ['error' => $messages];
 		}
 
 		$response = [
@@ -198,7 +198,7 @@ public function respondDeleted($data = null, string $message = '')
 	 *
 	 * @return mixed
 	 */
-	public function failUnauthorized(string $description, string $code = null, string $message = '')
+	public function failUnauthorized(string $description = 'Unauthorized', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['unauthorized'], $code, $message);
 	}
@@ -215,7 +215,7 @@ public function failUnauthorized(string $description, string $code = null, strin
 	 *
 	 * @return mixed
 	 */
-	public function failForbidden(string $description, string $code = null, string $message = '')
+	public function failForbidden(string $description = 'Forbidden', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['forbidden'], $code, $message);
 	}
@@ -231,7 +231,7 @@ public function failForbidden(string $description, string $code = null, string $
 	 *
 	 * @return mixed
 	 */
-	public function failNotFound(string $description, string $code = null, string $message = '')
+	public function failNotFound(string $description = 'Not Found', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
 	}
@@ -247,7 +247,7 @@ public function failNotFound(string $description, string $code = null, string $m
 	 *
 	 * @return mixed
 	 */
-	public function failValidationError(string $description, string $code = null, string $message = '')
+	public function failValidationError(string $description = 'Bad Request', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['invalid_data'], $code, $message);
 	}
@@ -263,7 +263,7 @@ public function failValidationError(string $description, string $code = null, st
 	 *
 	 * @return mixed
 	 */
-	public function failResourceExists(string $description, string $code = null, string $message = '')
+	public function failResourceExists(string $description = 'Conflict', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['resource_exists'], $code, $message);
 	}
@@ -281,7 +281,7 @@ public function failResourceExists(string $description, string $code = null, str
 	 *
 	 * @return mixed
 	 */
-	public function failResourceGone(string $description, string $code = null, string $message = '')
+	public function failResourceGone(string $description = 'Gone', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['resource_gone'], $code, $message);
 	}
@@ -297,7 +297,7 @@ public function failResourceGone(string $description, string $code = null, strin
 	 *
 	 * @return mixed
 	 */
-	public function failTooManyRequests(string $description, string $code = null, string $message = '')
+	public function failTooManyRequests(string $description = 'Too Many Requests', string $code = null, string $message = '')
 	{
 		return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
 	}
@@ -313,7 +313,7 @@ public function failTooManyRequests(string $description, string $code = null, st
 	 *
 	 * @return Response The value of the Response's send() method.
 	 */
-	public function failServerError(string $description, string $code = null, string $message = ''): Response
+	public function failServerError(string $description = 'Internal Server Error', string $code = null, string $message = ''): Response
 	{
 		return $this->fail($description, $this->codes['server_error'], $code, $message);
 	}