Merge branch 'release-4.0.0-alpha.2'

Author: jim-parry

admin/previous-gitignore

@@ -0,0 +1,41 @@
+CodeIgniter-4.0.0-alpha.1 launches today, after a lengthy build-up :)
+
+Huge shoutout to Lonnie Ezell for all of his hard work getting the vision
+and the core implementation in place!
+
+This is an early pre-release of 4.0.0. It is not suitable for production!
+
+There are several possible downloads, that you can see on the 
+[release page](https://github.com/bcit-ci/CodeIgniter4/releases/tag/v4.0.0-alpha.1) 
+
+- the runnable versions as a 
+[zip](https://github.com/bcit-ci/CodeIgniter4/releases/download/v4.0.0-alpha.1/CodeIgniter-4.0.0-alpha.1.zip) or a 
+[tarball](https://github.com/bcit-ci/CodeIgniter4/releases/download/v4.0.0-alpha.1/CodeIgniter-4.0.0-alpha.1.tar.gz)/
+- the developer versions of the framework (with contributor components) as
+a [zip](https://github.com/bcit-ci/CodeIgniter4/archive/v4.0.0-alpha.1.zip) or a 
+[tarball](https://github.com/bcit-ci/CodeIgniter4/archive/v4.0.0-alpha.1.tar.gz)/
+- and finally the [epub](https://github.com/bcit-ci/CodeIgniter4/releases/download/v4.0.0-alpha.1/CodeIgniter-4.0.0-alpha.1.epub) version of the user guide for this release.
+
+The release has all the major features in place, but there are still gaps
+and issues. See ...
+
+- [Bugs in the 4.0.0-alpha.1](https://github.com/bcit-ci/CodeIgniter4/issues?q=is%3Aopen+is%3Aissue+milestone%3A4.0.0-alpha)
+- [Things that we definitely want to see fixed before first proper release](https://github.com/bcit-ci/CodeIgniter4/issues?q=is%3Aopen+is%3Aissue+milestone%3A4.0.0)
+- [Features we would like to see in the initial proper release](), if possible, else the next update to it
+- [Features that we are consciously deferring to later](https://github.com/bcit-ci/CodeIgniter4/issues?q=is%3Aopen+is%3Aissue+milestone%3A4.1.0)
+
+What we need now is feedback from the community ...
+
+- What doesn't work well (raise a post in [CodeIgniter 4 Development](https://forum.codeigniter.com/forum-27.html))  
+If you have found a bug, then by all means create a new issue on the repo.
+- What you think is missing (raise a post in [CodeIgniter 4 Feature Requests](https://forum.codeigniter.com/forum-29.html))  
+We will soon start the [candidate new feature](https://forum.codeigniter.com/forum-33.html) posts, 
+for those items in the feature requests forum that appear to have traction
+- Problems that you are having using the release (raise a post in [CodeIgniter 4 Support](https://forum.codeigniter.com/forum-30.html))  
+Do NOT create repo issues with support questions - we are using github for bug and work package tracking
+
+Do NOT post support questions or feature requests in response to this thread - those
+will be deleted. We are trying to make the best of the
+limited resousrces that we have!
+
+Thank you, and ENJOY!

admin/release-notes.md

@@ -46,6 +46,10 @@ The `release` bash script does the first six workflow steps,
 and the `post-release` script does the other three between
 the manual steps.
 
+For now, everything past the release branch build will be done
+nanually, until the condidence level is high enough to
+automate some/all of those steps.
+
 ## Assumptions
 
 You (a maintainer) have forked the main CodeIgniter4 repo,
@@ -92,3 +96,9 @@ Once the release branch has been vetted, and you have
 completed the manual steps, clean up with:
 
     `admin/post_release version [qualifier]`
+
+## Release notes
+
+On launch of a new release, a release notes post should be made in the
+announcements subforum. The planned text for it (so it can be previewed
+by admins) is in `admin/release_notes`.

admin/release.md

@@ -73,7 +73,7 @@
 
 // We get a performance increase by specifying the default
 // route since we don't have to scan directories.
-$routes->add('/', 'Home::index');
+$routes->get('/', 'Home::index');
 
 /**
  * --------------------------------------------------------------------

application/Config/Routes.php

@@ -1,51 +1,45 @@
-<?php namespace App\Filters;
+<?php
+
+namespace App\Filters;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use CodeIgniter\Honeypot\Exceptions\HoneypotException;
+use CodeIgniter\Honeypot\Honeypot;
 
-class Honeypot implements FilterInterface 
+class Honeypot implements FilterInterface
 {
 
-    /**
-	 * Checks if Honeypot field is empty, if so
-     * then the requester is a bot,show a blank
-     * page
+	/**
+	 * Checks if Honeypot field is empty; if not
+	 * then the requester is a bot
 	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
+	 * @param CodeIgniter\HTTP\RequestInterface $request
 	 *
 	 * @return mixed
 	 */
+	public function before(RequestInterface $request)
+	{
+		$honeypot = new Honeypot(new \Config\Honeypot());
+		if ($honeypot->hasContent($request))
+		{
+			throw HoneypotException::isBot();
+		}
+	}
 
-    public function before (RequestInterface $request) 
-    {
-
-        // Checks honeypot field if value was entered then show blank if so.
-    
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        if($honeypot->hasContent($request))
-        {
-            throw HoneypotException::isBot();
-        }
-        
-    }
-
-    /**
-	 * Checks if Honeypot field is empty, if so
-     * then the requester is a bot,show a blank
-     * page
+	/**
+	 * Attach a honypot to the current response.
 	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-	 * @param ResponseInterface|\CodeIgniter\HTTP\Response $response
+	 * @param CodeIgniter\HTTP\RequestInterface $request
+	 * @param CodeIgniter\HTTP\ResponseInterface $response
 	 * @return mixed
 	 */
+	public function after(RequestInterface $request, ResponseInterface $response)
+	{
+		$honeypot = new Honeypot(new \Config\Honeypot());
+		$honeypot->attachHoneypot($response);
+	}
 
-    public function after (RequestInterface $request, ResponseInterface $response) 
-    {
-        
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        $honeypot->attachHoneypot($response);
-    }
 }

application/Filters/Honeypot.php

@@ -3,6 +3,6 @@
 
 use CodeIgniter\CLI\CLI;
 
-CLI::error('ERROR: '.$heading);
+CLI::error('ERROR: ' . $code);
 CLI::write($message);
 CLI::newLine();

application/Views/errors/cli/error_404.php

@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 
 # Sets the environment that CodeIgniter runs under.
- SetEnv CI_ENVIRONMENT development
+# SetEnv CI_ENVIRONMENT development
 
 # ----------------------------------------------------------------------
 # UTF-8 encoding

contributing/index.rst renamed to contributing/README.rst

@@ -1,5 +1,13 @@
 <?php
 
+// Valid PHP Version?
+$minPHPVersion = '7.1';
+if (phpversion() < $minPHPVersion)
+{
+	die("You PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: ". phpversion());
+}
+unset($minPHPVersion);
+
 // Path to the front controller (this file)
 define('FCPATH', __DIR__.DIRECTORY_SEPARATOR);
 
@@ -32,6 +40,6 @@
  * LAUNCH THE APPLICATION
  *---------------------------------------------------------------
  * Now that everything is setup, it's time to actually fire
- * up the engines and make this app do it's thang.
+ * up the engines and make this app do its thang.
  */
 $app->run();

public/.htaccess

@@ -40,7 +40,7 @@ $public = trim($paths->publicDirectory, '/');
 define('FCPATH', realpath($public).DIRECTORY_SEPARATOR);
 
 // Ensure the current directory is pointing to the front controller's directory
-chdir('public');
+chdir($public);
 
 $app = require rtrim($paths->systemDirectory,'/ ').'/bootstrap.php';