Merge pull request #1 from codeigniter4/develop

Update code

Author: bangbangda

admin/framework/composer.json

@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "codeigniter4/codeigniter4-standard": "^1.0",
-        "mikey179/vfsStream": "1.6.*",
+        "mikey179/vfsstream": "1.6.*",
         "phpunit/phpunit": "^7.0",
         "squizlabs/php_codesniffer": "^3.3"
     },

admin/release-appstarter

@@ -12,7 +12,7 @@ git checkout $branch
 echo -e "${BOLD}Build the framework distributable${NORMAL}"
 
 echo -e "${BOLD}Copy the main files/folders...${NORMAL}"
-releasable='app public writable README.md contributing.md env license.txt spark'
+releasable='app public writable README.md contributing.md env license.txt spark tests/_support'
 for fff in $releasable ; do
     if [ -d "$fff" ] ; then
         rm -rf $fff

admin/release-framework

@@ -12,7 +12,7 @@ git checkout $branch
 echo -e "${BOLD}Build the framework distributable${NORMAL}"
 
 echo -e "${BOLD}Copy the main files/folders...${NORMAL}"
-releasable='app docs public system writable contributing.md env license.txt spark'
+releasable='app docs public system writable contributing.md env license.txt spark tests/_support'
 for fff in $releasable ; do
     if [ -d "$fff" ] ; then
         rm -rf $fff

admin/starter/composer.json

@@ -9,7 +9,7 @@
         "codeigniter4/framework": "^4@alpha"
     },
     "require-dev": {
-        "mikey179/vfsStream": "1.6.*",
+        "mikey179/vfsstream": "1.6.*",
         "phpunit/phpunit": "^7.0"
     },
     "scripts": {

admin/starter/phpunit.xml.dist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="tests/_support/_bootstrap.php"
+        backupGlobals="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        stopOnError="false"
+        stopOnFailure="false"
+        stopOnIncomplete="false"
+        stopOnSkipped="false">
+    <testsuites>
+        <testsuite name="app">
+            <directory>./tests</directory>
+            <exclude>./tests/system</exclude>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./system</directory>
+            <exclude>
+                <directory>./system</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
+</phpunit>

app/Views/welcome_message.php

@@ -12,8 +12,9 @@
 				height: 200px;
 				width: 155px;
 				display: inline-block;
-				opacity: 0.08;
+				opacity: 0.12;
 				position: absolute;
+				z-index: 0;
 				top: 2rem;
 				left: 50%;
 				margin-left: -73px;
@@ -32,6 +33,8 @@
 				margin-top: 145px;
 				margin-bottom: 0;
 				color: #222;
+				position: relative;
+				z-index: 1;
 			}
 			.wrap {
 				max-width: 1024px;
@@ -81,15 +84,11 @@
 
 		<div class="wrap">
 
-			<h1>Welcome to CodeIgniter</h1>
-
-			<p class="version">version <?= CodeIgniter\CodeIgniter::CI_VERSION ?></p>
-
 			<div class="logo">
 				<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 					 width="155.000000px" height="200.000000px" viewBox="0 0 155.000000 200.000000"
 					 preserveAspectRatio="xMidYMid meet">
-				<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none">
+				<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)" fill="#ee2600" stroke="none">
 				<path d="M737 1963 c22 -79 -7 -185 -78 -290 -18 -26 -107 -122 -197 -213
 					  -239 -240 -336 -371 -403 -544 -79 -206 -78 -408 5 -582 64 -134 212 -264 361
 					  -314 l60 -20 -30 22 c-210 152 -229 387 -48 588 25 27 48 50 51 50 4 0 7 -27
@@ -104,6 +103,10 @@
 				</svg>
 			</div>
 
+			<h1>Welcome to CodeIgniter</h1>
+
+			<p class="version">version <?= CodeIgniter\CodeIgniter::CI_VERSION ?></p>
+
 			<div class="guide">
 				<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
 

composer.json

@@ -15,7 +15,7 @@
     },
     "require-dev": {
         "codeigniter4/codeigniter4-standard": "^1.0",
-        "mikey179/vfsStream": "1.6.*",
+        "mikey179/vfsstream": "1.6.*",
         "phpunit/phpunit": "^7.0",
         "squizlabs/php_codesniffer": "^3.3"
     },

env

@@ -10,6 +10,12 @@
 # at the beginning of the line.
 #--------------------------------------------------------------------
 
+#--------------------------------------------------------------------
+# ENVIRONMENT
+#--------------------------------------------------------------------
+
+# CI_ENVIRONMENT = production
+
 #--------------------------------------------------------------------
 # APP
 #--------------------------------------------------------------------

system/Cache/Handlers/WincacheHandler.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Cache\Handlers;
+<?php
+namespace CodeIgniter\Cache\Handlers;
 
 /**
  * CodeIgniter
@@ -38,6 +39,11 @@
 
 use CodeIgniter\Cache\CacheInterface;
 
+/**
+ * Cache handler for WinCache from Microsoft & IIS.
+ * Windows-only, so not testable on travis-ci.
+ * Unusable methods flagged for code coverage ignoring.
+ */
 class WincacheHandler implements CacheInterface
 {
 
@@ -59,6 +65,8 @@ public function __construct($config)
 
 	/**
 	 * Takes care of any handler-specific setup that must be done.
+	 *
+	 * @codeCoverageIgnore
 	 */
 	public function initialize()
 	{
@@ -70,6 +78,8 @@ public function initialize()
 	/**
 	 * Attempts to fetch an item from the cache store.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param string $key Cache item name
 	 *
 	 * @return mixed
@@ -90,6 +100,8 @@ public function get(string $key)
 	/**
 	 * Saves an item to the cache store.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param string  $key   Cache item name
 	 * @param mixed   $value The data to save
 	 * @param integer $ttl   Time To Live, in seconds (default 60)
@@ -108,6 +120,8 @@ public function save(string $key, $value, int $ttl = 60)
 	/**
 	 * Deletes a specific item from the cache store.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param string $key Cache item name
 	 *
 	 * @return mixed
@@ -124,8 +138,9 @@ public function delete(string $key)
 	/**
 	 * Performs atomic incrementation of a raw stored value.
 	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
+	 * @codeCoverageIgnore
+	 * @param              string  $key    Cache ID
+	 * @param              integer $offset Step/value to increase by
 	 *
 	 * @return mixed
 	 */
@@ -144,6 +159,8 @@ public function increment(string $key, int $offset = 1)
 	/**
 	 * Performs atomic decrementation of a raw stored value.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param string  $key    Cache ID
 	 * @param integer $offset Step/value to increase by
 	 *
@@ -164,6 +181,8 @@ public function decrement(string $key, int $offset = 1)
 	/**
 	 * Will delete all items in the entire cache.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @return mixed
 	 */
 	public function clean()
@@ -176,6 +195,8 @@ public function clean()
 	/**
 	 * Returns information on the entire cache.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * The information returned and the structure of the data
 	 * varies depending on the handler.
 	 *
@@ -191,7 +212,8 @@ public function getCacheInfo()
 	/**
 	 * Returns detailed information about the specific item in the cache.
 	 *
-	 * @param string $key Cache item name.
+	 * @codeCoverageIgnore
+	 * @param              string $key Cache item name.
 	 *
 	 * @return mixed
 	 */

system/CodeIgniter.php

@@ -61,7 +61,7 @@ class CodeIgniter
 	/**
 	 * The current version of CodeIgniter Framework
 	 */
-	const CI_VERSION = '4.0.0-alpha.5';
+	const CI_VERSION = '4.0.0-beta.1';
 
 	/**
 	 * App startup time.
@@ -199,7 +199,7 @@ public function initialize()
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
 	 * @param boolean                                      $returnResponse
 	 *
-	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 * @throws \Exception
 	 */
 	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
@@ -234,7 +234,7 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 		{
 			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
 		}
-		catch (Router\RedirectException $e)
+		catch (\CodeIgniter\Filters\Exceptions\FilterException $e)
 		{
 			$logger = Services::logger();
 			$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
@@ -533,7 +533,7 @@ protected function forceSecureAccess($duration = 31536000)
 	 *
 	 * @throws \Exception
 	 *
-	 * @return boolean
+	 * @return bool|\CodeIgniter\HTTP\ResponseInterface
 	 */
 	public function displayCache($config)
 	{
@@ -564,7 +564,9 @@ public function displayCache($config)
 			$this->response->setBody($output);
 
 			return $this->response;
-		};
+		}
+
+		return false;
 	}
 
 	//--------------------------------------------------------------------
@@ -574,7 +576,7 @@ public function displayCache($config)
 	 *
 	 * @param integer $time
 	 *
-	 * @return $this
+	 * @return void
 	 */
 	public static function cache(int $time)
 	{