phpcbf: fix all at once

codeigniter4 · Nov 10, 2018 · b597db5 · b597db5
1 parent 53f17e8
commit b597db5
Show file tree

Hide file tree

Showing 407 changed files with 16,442 additions and 13,094 deletions.
diff --git a/application/Config/App.php b/application/Config/App.php
@@ -204,10 +204,10 @@ class App extends BaseConfig
 	|       'cookie_httponly') will also affect sessions.
 	|
 	*/
-	public $cookiePrefix = '';
-	public $cookieDomain = '';
-	public $cookiePath = '/';
-	public $cookieSecure = false;
+	public $cookiePrefix   = '';
+	public $cookieDomain   = '';
+	public $cookiePath     = '/';
+	public $cookieSecure   = false;
 	public $cookieHTTPOnly = false;
 
 	/*
@@ -242,11 +242,11 @@ class App extends BaseConfig
 	| CSRFRegenerate  = Regenerate token on every submission
 	| CSRFRedirect    = Redirect to previous page with error on failure
 	*/
-	public $CSRFTokenName   = 'csrf_test_name';
-	public $CSRFCookieName  = 'csrf_cookie_name';
-	public $CSRFExpire      = 7200;
-	public $CSRFRegenerate  = true;
-	public $CSRFRedirect    = true;
+	public $CSRFTokenName  = 'csrf_test_name';
+	public $CSRFCookieName = 'csrf_cookie_name';
+	public $CSRFExpire     = 7200;
+	public $CSRFRegenerate = true;
+	public $CSRFRedirect   = true;
 
 	/*
 	|--------------------------------------------------------------------------
@@ -281,7 +281,7 @@ class App extends BaseConfig
 		'CodeIgniter\Debug\Toolbar\Collectors\Database',
 		'CodeIgniter\Debug\Toolbar\Collectors\Logs',
 		'CodeIgniter\Debug\Toolbar\Collectors\Views',
-//		'CodeIgniter\Debug\Toolbar\Collectors\Cache',
+		// 'CodeIgniter\Debug\Toolbar\Collectors\Cache',
 		'CodeIgniter\Debug\Toolbar\Collectors\Files',
 		'CodeIgniter\Debug\Toolbar\Collectors\Routes',
 		'CodeIgniter\Debug\Toolbar\Collectors\Events',
@@ -303,5 +303,4 @@ class App extends BaseConfig
 
 	//--------------------------------------------------------------------
 
-
 }
diff --git a/application/Config/Cache.php b/application/Config/Cache.php
@@ -36,7 +36,7 @@ class Cache extends BaseConfig
 	| system.
 	|
 	*/
-	public $storePath = WRITEPATH.'cache/';
+	public $storePath = WRITEPATH . 'cache/';
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/application/Config/Constants.php b/application/Config/Constants.php
@@ -21,7 +21,7 @@
 | 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');
+define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.php');
 
 /*
 |--------------------------------------------------------------------------
@@ -31,14 +31,14 @@
 | Provide simple ways to work with the myriad of PHP functions that
 | require information to be in seconds.
 */
-defined('SECOND')   || define('SECOND',                 1);
-defined('MINUTE')   || define('MINUTE',                60);
-defined('HOUR')     || define('HOUR',                3600);
-defined('DAY')      || define('DAY',                86400);
-defined('WEEK')     || define('WEEK',              604800);
-defined('MONTH')    || define('MONTH',            2592000);
-defined('YEAR')     || define('YEAR',            31536000);
-defined('DECADE')   || define('DECADE',         315360000);
+defined('SECOND') || define('SECOND', 1);
+defined('MINUTE') || define('MINUTE', 60);
+defined('HOUR')   || define('HOUR', 3600);
+defined('DAY')    || define('DAY', 86400);
+defined('WEEK')   || define('WEEK', 604800);
+defined('MONTH')  || define('MONTH', 2592000);
+defined('YEAR')   || define('YEAR', 31536000);
+defined('DECADE') || define('DECADE', 315360000);
 
 /*
 |--------------------------------------------------------------------------
@@ -65,13 +65,13 @@
 |       http://tldp.org/LDP/abs/html/exitcodes.html
 |
 */
-defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS',        0); // no errors
-defined('EXIT_ERROR')          || define('EXIT_ERROR',          1); // generic error
-defined('EXIT_CONFIG')         || define('EXIT_CONFIG',         3); // configuration error
-defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE',   4); // file not found
-defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS',  5); // unknown class
+defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR')          || define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
 defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT',     7); // invalid user input
-defined('EXIT_DATABASE')       || define('EXIT_DATABASE',       8); // database error
-defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN',      9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX',    125); // highest automatically-assigned error code
+defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
diff --git a/application/Config/ContentSecurityPolicy.php b/application/Config/ContentSecurityPolicy.php
@@ -38,7 +38,7 @@ class ContentSecurityPolicy extends BaseConfig
 	public $mediaSrc = null;
 
 	public $objectSrc = null;
-	
+
 	public $manifestSrc = null;
 
 	public $pluginTypes = null;

diff --git a/application/Config/Database.php b/application/Config/Database.php
@@ -5,14 +5,16 @@
  *
  * @package Config
  */
+
 class Database extends \CodeIgniter\Database\Config
 {
 	/**
 	 * The directory that holds the Migrations
 	 * and Seeds directories.
+	 *
 	 * @var string
 	 */
-	public $filesPath = APPPATH.'Database/';
+	public $filesPath = APPPATH . 'Database/';
 
 	/**
 	 * Lets you choose which connection group to
@@ -28,25 +30,25 @@ class Database extends \CodeIgniter\Database\Config
 	 * @var array
 	 */
 	public $default = [
-		'DSN'          => '',
-		'hostname'     => 'localhost',
-		'username'     => '',
-		'password'     => '',
-		'database'     => '',
-		'DBDriver'     => 'MySQLi',
-		'DBPrefix'     => '',
-		'pConnect'     => false,
-		'DBDebug'     => (ENVIRONMENT !== 'production'),
-		'cacheOn'     => false,
-		'cacheDir'     => '',
-		'charset'      => 'utf8',
-		'DBCollat'     => 'utf8_general_ci',
-		'swapPre'      => '',
-		'encrypt'      => false,
-		'compress'     => false,
-		'strictOn'     => false,
-		'failover'     => [],
-		'port'         => 3306
+		'DSN'      => '',
+		'hostname' => 'localhost',
+		'username' => '',
+		'password' => '',
+		'database' => '',
+		'DBDriver' => 'MySQLi',
+		'DBPrefix' => '',
+		'pConnect' => false,
+		'DBDebug'  => (ENVIRONMENT !== 'production'),
+		'cacheOn'  => false,
+		'cacheDir' => '',
+		'charset'  => 'utf8',
+		'DBCollat' => 'utf8_general_ci',
+		'swapPre'  => '',
+		'encrypt'  => false,
+		'compress' => false,
+		'strictOn' => false,
+		'failover' => [],
+		'port'     => 3306,
 	];
 
 	/**
@@ -56,49 +58,49 @@ class Database extends \CodeIgniter\Database\Config
 	 * @var array
 	 */
 	public $tests = [
-		'DSN'          => '',
-		'hostname'     => '127.0.0.1',
-		'username'     => '',
-		'password'     => '',
-		'database'     => '',
-		'DBDriver'     => '',
-		'DBPrefix'     => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE.
-		'pConnect'     => false,
-		'DBDebug'     => (ENVIRONMENT !== 'production'),
-		'cacheOn'     => false,
-		'cacheDir'     => '',
-		'charset'      => 'utf8',
-		'DBCollat'     => 'utf8_general_ci',
-		'swapPre'      => '',
-		'encrypt'      => false,
-		'compress'     => false,
-		'strictOn'     => false,
-		'failover'     => [],
-		'port'         => 3306
+		'DSN'      => '',
+		'hostname' => '127.0.0.1',
+		'username' => '',
+		'password' => '',
+		'database' => '',
+		'DBDriver' => '',
+		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE.
+		'pConnect' => false,
+		'DBDebug'  => (ENVIRONMENT !== 'production'),
+		'cacheOn'  => false,
+		'cacheDir' => '',
+		'charset'  => 'utf8',
+		'DBCollat' => 'utf8_general_ci',
+		'swapPre'  => '',
+		'encrypt'  => false,
+		'compress' => false,
+		'strictOn' => false,
+		'failover' => [],
+		'port'     => 3306,
 	];
 
 	//--------------------------------------------------------------------
 
 	public function __construct()
 	{
-	    parent::__construct();
+		parent::__construct();
 
 		// Ensure that we always set the database group to 'tests' if
 		// we are currently running an automated test suite, so that
 		// we don't overwrite live data on accident.
-		if (ENVIRONMENT == 'testing')
+		if (ENVIRONMENT === 'testing')
 		{
 			$this->defaultGroup = 'tests';
 
 			// Under Travis-CI, we can set an ENV var named 'DB_GROUP'
 			// so that we can test against multiple databases.
 			if ($group = getenv('DB'))
 			{
-				if (is_file(TESTPATH.'travis/Database.php'))
+				if (is_file(TESTPATH . 'travis/Database.php'))
 				{
-					require TESTPATH.'travis/Database.php';
+					require TESTPATH . 'travis/Database.php';
 
-					if ( ! empty($dbconfig) && array_key_exists($group, $dbconfig))
+					if (! empty($dbconfig) && array_key_exists($group, $dbconfig))
 					{
 						$this->tests = $dbconfig[$group];
 					}
@@ -109,5 +111,4 @@ public function __construct()
 
 	//--------------------------------------------------------------------
 
-
 }
diff --git a/application/Config/DocTypes.php b/application/Config/DocTypes.php
@@ -8,26 +8,26 @@
 
 class DocTypes
 {
-	public $list = 
+	public $list =
 	[
-		'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-		'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-		'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-		'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-		'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
-		'html5' => '<!DOCTYPE html>',
-		'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-		'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-		'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
-		'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
-		'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
-		'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
-		'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
-		'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
-		'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+		'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+		'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+		'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+		'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+		'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+		'html5'             => '<!DOCTYPE html>',
+		'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+		'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+		'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+		'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+		'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+		'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+		'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+		'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+		'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
 		'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
 		'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-		'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
-		'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
+		'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+		'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
 	];
-}
+}