Merge pull request #1 from bcit-ci/develop

Merge from offcial [bcit-ci/CodeIgniter4]

Author: wuzheng40

.php_cs

@@ -1,65 +1,38 @@
 <?php
 
 $finder = Symfony\CS\Finder\DefaultFinder::create()
+		->exclude('ThirdParty')
 		->in('system');
 
 return Symfony\CS\Config\Config::create()
-		->level(Symfony\CS\FixerInterface::NONE_LEVEL)
+		->level(Symfony\CS\FixerInterface::PSR1_LEVEL)
 		->fixers(array(
-			'psr0',
-			'encoding',
-			'short_tag',
-			'braces',
+			'class_definition',
 			'eof_ending',
-			'line_after_namespace',
+			'function_call_space',
 			'linefeed',
 			'lowercase_constants',
 			'lowercase_keywords',
 			'method_argument_space',
+			'no_trailing_whitespace_in_comment',
 			'parenthesis',
 			'php_closing_tag',
-			'single_line_after_imports',
 			'trailing_spaces',
 			'visibility',
 			'array_element_no_space_before_comma',
 			'array_element_white_space_after_comma',
 			'concat_without_spaces',
-			'double_arrow_multiline_whitespaces',
-			'duplicate_semicolon',
-			'function_typehint_space',
 			'include',
-			'multiline_array_trailing_comma',
-			'no_empty_lines_after_phpdocs',
-			'object_operator',
 			'operators_spaces',
-			'phpdoc_indent',
-			'phpdoc_no_empty_return',
-			'phpdoc_params',
-			'phpdoc_scalar',
-			'phpdoc_separation',
-			'phpdoc_to_comment',
-			'phpdoc_trim',
-			'phpdoc_type_to_var',
-			'phpdoc_types',
-			'print_to_echo',
-			'remove_leading_slash_use',
-			'remove_lines_between_uses',
-			'return',
-			'single_array_no_trailing_comma',
 			'spaces_before_semicolon',
-			'standardize_not_equal',
 			'ternary_spaces',
-			'trim_array_spaces',
 			'unary_operators_spaces',
-			'unused_use',
+			'spaces_cast',
 			'whitespacy_lines',
 			'align_double_arrow',
 			'align_equals',
+			'logical_not_operators_with_spaces',
 			'logical_not_operators_with_successor_space',
 			'multiline_spaces_before_semicolon',
-			'no_blank_lines_before_namespace',
-			'ordered_use',
-			'phpdoc_order',
-			'short_array_syntax',
 		))
 		->finder($finder);

.travis.yml

@@ -2,6 +2,7 @@ language: php
 
 php:
   - 7
+  - 7.1
 
 global:
   - CI=true
@@ -30,3 +31,5 @@ before_install:
 before_script:
   - composer install --prefer-source
 
+after_success:
+  - travis_retry php vendor/bin/coveralls

README.md

@@ -1,6 +1,7 @@
 # CodeIgniter 4 Development
 
 [![Build Status](https://travis-ci.org/bcit-ci/CodeIgniter4.svg?branch=develop)](https://travis-ci.org/bcit-ci/CodeIgniter4)
+[![Coverage Status](https://coveralls.io/repos/github/bcit-ci/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/bcit-ci/CodeIgniter4?branch=develop)
 <br>
 
 ## What is CodeIgniter?

application/Config/App.php

@@ -292,28 +292,6 @@ class App extends BaseConfig
 	*/
 	public $errorViewPath = APPPATH.'Views/errors';
 
-	/*
-	|--------------------------------------------------------------------------
-	| Composer auto-loading
-	|--------------------------------------------------------------------------
-	|
-	| Enabling this setting will tell CodeIgniter to look for a Composer
-	| package auto-loader script in /vendor/autoload.php.
-	|
-	|	$composerAutoload = TRUE;
-	|
-	| Or if you have your vendor/ directory located somewhere else, you
-	| can opt to set a specific path as well:
-	|
-	|	$composerAutoload = '/path/to/vendor/autoload.php';
-	|
-	| For more information about Composer, please visit http://getcomposer.org/
-	|
-	| Note: This will NOT disable or override the CodeIgniter-specific
-	|	autoloading.
-	*/
-	public $composerAutoload = false;
-
 	/*
 	|--------------------------------------------------------------------------
 	| Encryption Key

application/Config/Autoload.php

@@ -54,7 +54,7 @@ public function __construct()
 			APP_NAMESPACE                => APPPATH,			// For custom namespace
 			'App'                        => APPPATH,			// To ensure filters, etc still found
 		];
-
+        
 		/**
 		 * -------------------------------------------------------------------
 		 * Class Map

application/Config/Boot/development.php

@@ -4,11 +4,10 @@
 |--------------------------------------------------------------------------
 | ERROR DISPLAY
 |--------------------------------------------------------------------------
+| In development, we want to show as many errors as possible to help
+| make sure they don't make it to production. And save us hours of
+| painful debugging.
 */
-
-// In development, we want to show as many errors as possible to help
-// make sure they don't make it to production. And save us hours of
-// painful debugging.
 error_reporting(-1);
 ini_set('display_errors', 1);
 
@@ -22,23 +21,13 @@
 */
 define('SHOW_DEBUG_BACKTRACE', true);
 
-/*
-|--------------------------------------------------------------------------
-| KINT
-|--------------------------------------------------------------------------
-| If true, will enable the Kint PHP Debugging tool and make it available
-| globally throughout your application to use while making sure things
-| work the way you intend them to.
-*/
-$useKint = true;
-
 /*
 |--------------------------------------------------------------------------
 | DEBUG MODE
 |--------------------------------------------------------------------------
 | Debug mode is an experimental flag that can allow changes throughout
-| the system. It's not widely used currently, and may not survive
-| release of the framework.
+| the system. This will control whether Kint is loaded, and a few other
+| items. It can always be used within your own application too.
 */
 
-define('CI_DEBUG', 1);
+define('CI_DEBUG', 1);

application/Config/Boot/production.php

@@ -4,10 +4,9 @@
 |--------------------------------------------------------------------------
 | ERROR DISPLAY
 |--------------------------------------------------------------------------
+| Don't show ANY in production environments. Instead, let the system catch
+| it and display a generic error message.
 */
-
-// Don't show ANY in production environments. Instead, let the system catch
-// it and display a generic error message.
 ini_set('display_errors', 0);
 error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 
@@ -20,4 +19,4 @@
 | release of the framework.
 */
 
-define('CI_DEBUG', 0);
+define('CI_DEBUG', 0);

application/Config/Boot/testing.php

@@ -4,11 +4,10 @@
 |--------------------------------------------------------------------------
 | ERROR DISPLAY
 |--------------------------------------------------------------------------
+| In development, we want to show as many errors as possible to help
+| make sure they don't make it to production. And save us hours of
+| painful debugging.
 */
-
-// In development, we want to show as many errors as possible to help
-// make sure they don't make it to production. And save us hours of
-// painful debugging.
 error_reporting(-1);
 ini_set('display_errors', 1);
 
@@ -22,16 +21,6 @@
 */
 define('SHOW_DEBUG_BACKTRACE', true);
 
-/*
-|--------------------------------------------------------------------------
-| KINT
-|--------------------------------------------------------------------------
-| If true, will enable the Kint PHP Debugging tool and make it available
-| globally throughout your application to use while making sure things
-| work the way you intend them to.
-*/
-$useKint = true;
-
 /*
 |--------------------------------------------------------------------------
 | DEBUG MODE
@@ -41,4 +30,4 @@
 | release of the framework.
 */
 
-define('CI_DEBUG', 1);
+define('CI_DEBUG', 1);

application/Config/Constants.php

@@ -13,6 +13,16 @@
 //
 define('APP_NAMESPACE', 'App');
 
+/*
+|--------------------------------------------------------------------------
+| Composer Path
+|--------------------------------------------------------------------------
+|
+| The path that Composer's autoload file is expected to live. By default,
+| the vendor folder is in the Root directory, but you can customize that here.
+*/
+define('COMPOSER_PATH', ROOTPATH.'vendor/autoload.php');
+
 /*
 |--------------------------------------------------------------------------
 | Timing Constants

application/Config/Paths.php

@@ -0,0 +1,78 @@
+<?php namespace Config;
+
+/**
+ * Holds the paths that are used by the system to
+ * locate the main directories, application, system, etc.
+ * 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
+ */
+class Paths
+{
+    /*
+     *---------------------------------------------------------------
+     * SYSTEM FOLDER NAME
+     *---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "system" folder.
+     * Include the path if the folder is not in the same directory
+     * as this file.
+     */
+    public $systemDirectory = '../system';
+
+    /*
+     *---------------------------------------------------------------
+     * APPLICATION FOLDER NAME
+     *---------------------------------------------------------------
+     *
+     * If you want this front controller to use a different "application"
+     * folder than the default one you can set its name here. The folder
+     * can also be renamed or relocated anywhere on your getServer. If
+     * you do, use a full getServer path. For more info please see the user guide:
+     * http://codeigniter.com/user_guide/general/managing_apps.html
+     *
+     * NO TRAILING SLASH!
+     */
+    public $applicationDirectory = '../application';
+
+    /*
+     * ---------------------------------------------------------------
+     * WRITABLE DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "writable" directory.
+     * The writable directory allows you to group all directories that
+     * need write permission to a single place that can be tucked away
+     * for maximum security, keeping it out of the application and/or
+     * system directories.
+     */
+    public $writableDirectory = '../writable';
+
+    /*
+     * ---------------------------------------------------------------
+     * TESTS DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "tests" directory.
+     * The writable directory allows you to group all directories that
+     * need write permission to a single place that can be tucked away
+     * for maximum security, keeping it out of the application and/or
+     * system directories.
+     */
+    public $testsDirectory = '../tests';
+
+    /*
+     * ---------------------------------------------------------------
+     * PUBLIC DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of the directory that
+     * contains the main index.php front-controller. By default,
+     * this is the `public` directory, but some hosts may not
+     * be able to map a primary domain to a sub-directory so you
+     * can change this to `public_html`, for example, to comply
+     * with your host's needs.
+     */
+    public $publicDirectory = 'public';
+}

application/Filters/DebugToolbar.php

@@ -35,10 +35,10 @@ public function after(RequestInterface $request, ResponseInterface $response)
 	{
 		if ( ! is_cli() && CI_DEBUG)
 		{
-			global $codeigniter;
+			global $app;
 
 			$toolbar = Services::toolbar(new App());
-			$stats   = $codeigniter->getPerfomanceStats();
+			$stats   = $app->getPerformanceStats();
 
 			return $response->appendBody(
 				$toolbar->run(