Merge pull request #1 from bcit-ci/develop

Update latest version

Author: bangbangda

.gitignore

@@ -63,6 +63,10 @@ writable/uploads/*
 
 writable/debugbar/*
 
+application/Database/Migrations/2*
+
+php_errors.log
+
 #-------------------------
 # User Guide Temp Files
 #-------------------------
@@ -122,3 +126,4 @@ nb-configuration.xml
 .vscode/
 
 /results/
+/phpunit.xml

.travis.yml

@@ -8,7 +8,6 @@ php:
 matrix:
   fast_finish: true
   allow_failures:
-    - php: 7.2
     - php: nightly
 
 global:
@@ -43,4 +42,4 @@ before_script:
   - composer install --prefer-source
 
 after_success:
-  - travis_retry php tests/bin/coveralls.phar
+  - travis_retry php tests/bin/coveralls.phar -v

application/Config/App.php

@@ -270,6 +270,9 @@ class App extends BaseConfig
 	| and state of your application during that page display. By default it will
 	| NOT be displayed under production environments, and will only display if
 	| CI_DEBUG is true, since if it's not, there's not much to display anyway.
+	|
+	| toolbarMaxHistory = Number of history files, 0 for none or -1 for unlimited
+	|
 	*/
 	public $toolbarCollectors = [
 		'CodeIgniter\Debug\Toolbar\Collectors\Timers',
@@ -281,6 +284,7 @@ class App extends BaseConfig
 		'CodeIgniter\Debug\Toolbar\Collectors\Routes',
 		'CodeIgniter\Debug\Toolbar\Collectors\Events',
 	];
+	public $toolbarMaxHistory = 20;
 
 	/*
 	|--------------------------------------------------------------------------

application/Config/Autoload.php

@@ -1,6 +1,6 @@
 <?php namespace Config;
 
-require BASEPATH.'Config/AutoloadConfig.php';
+require_once BASEPATH.'Config/AutoloadConfig.php';
 
 /**
  * -------------------------------------------------------------------

application/Config/Cache.php

@@ -36,7 +36,7 @@ class Cache extends BaseConfig
 	| system.
 	|
 	*/
-	public $path = WRITEPATH.'cache/';
+	public $storePath = WRITEPATH.'cache/';
 
 	/*
 	|--------------------------------------------------------------------------

application/Config/ContentSecurityPolicy.php

@@ -23,7 +23,7 @@ class ContentSecurityPolicy extends BaseConfig
 
 	public $imageSrc = 'self';
 
-	public $base_uri = null;
+	public $baseURI = 'none';
 
 	public $childSrc = null;
 
@@ -38,6 +38,8 @@ class ContentSecurityPolicy extends BaseConfig
 	public $mediaSrc = null;
 
 	public $objectSrc = null;
+	
+	public $manifestSrc = null;
 
 	public $pluginTypes = null;
 

application/Config/Email.php

@@ -2,6 +2,16 @@
 
 class Email
 {
+	/**
+	 * @var string
+	 */
+	public $fromEmail;
+
+	/**
+	 * @var string
+	 */
+	public $fromName;
+
 	/**
 	 * The "user agent"
 	 * @var string

application/Config/Filters.php

@@ -9,15 +9,18 @@ class Filters extends BaseConfig
 	public $aliases = [
 		'csrf' 	  => \App\Filters\CSRF::class,
 		'toolbar' => \App\Filters\DebugToolbar::class,
+		'honeypot' => \App\Filters\Honeypot::class
 	];
 
 	// Always applied before every request
 	public $globals = [
 		'before' => [
-			// 'csrf'
+			//'honeypot'
+			// 'csrf',
 		],
 		'after'  => [
-			'toolbar'
+			'toolbar',
+			//'honeypot'
 		]
 	];
 

application/Config/Honeypot.php

@@ -0,0 +1,31 @@
+<?php namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Honeypot extends BaseConfig
+{
+
+	/**
+	 * Makes Honeypot visible or not to human
+	 * 
+	 * @var boolean
+	 */
+	public $hidden = true;
+    /**
+	 * Honeypot Label Content
+	 * @var String
+	 */
+    public $label = 'Fill This Field';
+
+    /**
+	 * Honeypot Field Name 
+	 * @var String
+	 */
+    public $name = 'honeypot';
+
+    /**
+	 * Honeypot HTML Template 
+	 * @var String
+	 */
+    public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
+}

application/Config/Paths.php

@@ -6,7 +6,7 @@
  * Modifying these allows you to re-structure your application,
  * share a system folder between multiple applications, and more.
  *
- * All paths are relative to the application's front controller, index.php
+ * All paths are relative to the project's root folder.
  */
 class Paths
 {
@@ -19,7 +19,7 @@ class Paths
 	 * Include the path if the folder is not in the same directory
 	 * as this file.
 	 */
-	public $systemDirectory = '../system';
+	public $systemDirectory = 'system';
 
 	/*
 	 *---------------------------------------------------------------
@@ -34,7 +34,7 @@ class Paths
 	 *
 	 * NO TRAILING SLASH!
 	 */
-	public $applicationDirectory = '../application';
+	public $applicationDirectory = 'application';
 
 	/*
 	 * ---------------------------------------------------------------
@@ -47,7 +47,7 @@ class Paths
 	 * for maximum security, keeping it out of the application and/or
 	 * system directories.
 	 */
-	public $writableDirectory = '../writable';
+	public $writableDirectory = 'writable';
 
 	/*
 	 * ---------------------------------------------------------------
@@ -60,7 +60,7 @@ class Paths
 	 * for maximum security, keeping it out of the application and/or
 	 * system directories.
 	 */
-	public $testsDirectory = '../tests';
+	public $testsDirectory = 'tests';
 
 	/*
 	 * ---------------------------------------------------------------

application/Config/Services.php

@@ -1,6 +1,7 @@
 <?php namespace Config;
 
 use CodeIgniter\Config\Services as CoreServices;
+use CodeIgniter\Config\BaseConfig;
 
 require_once BASEPATH.'Config/Services.php';
 
@@ -30,5 +31,20 @@ class Services extends CoreServices
 //        return new \CodeIgniter\Example();
 //    }
 
+    public static function honeypot(BaseConfig $config = null, $getShared = true)
+    {
+        if ($getShared)
+        {
+            return self::getSharedInstance('honeypot', $config);
+        }
+
+        if (is_null($config)) 
+        {
+            $config = new \Config\Honeypot();
+        }
+
+        return new \CodeIgniter\Honeypot\Honeypot($config);
+    }
+
 
 }