From 10d50a824e566431fdb7a58f986468f5d34d2bc7 Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@gmail.com>
Date: Fri, 7 Dec 2018 17:44:44 -0200
Subject: [PATCH] Rename BASEPATH constant to SYSTEMPATH

---
 application/Config/Autoload.php               |   2 +-
 application/Config/Routes.php                 |   4 +-
 application/Config/Services.php               |   2 +-
 application/Config/Toolbar.php                |   2 +-
 system/Autoloader/FileLocator.php             |   2 +-
 system/CodeIgniter.php                        |   2 +-
 system/Common.php                             |   4 +-
 system/Config/AutoloadConfig.php              | 146 +++++++++---------
 system/Debug/Exceptions.php                   |   7 +-
 .../Toolbar/Collectors/BaseCollector.php      |   4 +-
 system/Debug/Toolbar/Collectors/Files.php     |   2 +-
 system/Log/Handlers/FileHandler.php           |   2 +-
 system/Log/Logger.php                         |   4 +-
 system/View/View.php                          |   2 +-
 system/bootstrap.php                          |  12 +-
 tests/system/Autoloader/FileLocatorTest.php   |   8 +-
 tests/system/Files/FileTest.php               |  24 +--
 tests/system/HTTP/DownloadResponseTest.php    |   4 +-
 tests/system/Log/FileHandlerTest.php          |   2 +-
 user_guide_src/source/cli/cli_commands.rst    |   2 +-
 user_guide_src/source/concepts/autoloader.rst |   2 +-
 .../source/general/common_functions.rst       |   2 +-
 22 files changed, 121 insertions(+), 120 deletions(-)

diff --git a/application/Config/Autoload.php b/application/Config/Autoload.php
index ad6cb3f9ee..77e78a043d 100644
--- a/application/Config/Autoload.php
+++ b/application/Config/Autoload.php
@@ -1,6 +1,6 @@
 <?php namespace Config;
 
-require_once BASEPATH . 'Config/AutoloadConfig.php';
+require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
 
 /**
  * -------------------------------------------------------------------
diff --git a/application/Config/Routes.php b/application/Config/Routes.php
index 0925c3c344..8e13664e6b 100644
--- a/application/Config/Routes.php
+++ b/application/Config/Routes.php
@@ -22,9 +22,9 @@ $routes = Services::routes(true);
 
 // Load the system's routing file first, so that the app and ENVIRONMENT
 // can override as needed.
-if (file_exists(BASEPATH . 'Config/Routes.php'))
+if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
 {
-	require BASEPATH . 'Config/Routes.php';
+	require SYSTEMPATH . 'Config/Routes.php';
 }
 
 /**
diff --git a/application/Config/Services.php b/application/Config/Services.php
index 061d0d781f..3eab9153cb 100644
--- a/application/Config/Services.php
+++ b/application/Config/Services.php
@@ -3,7 +3,7 @@
 use CodeIgniter\Config\Services as CoreServices;
 use CodeIgniter\Config\BaseConfig;
 
-require_once BASEPATH . 'Config/Services.php';
+require_once SYSTEMPATH . 'Config/Services.php';
 
 /**
  * Services Configuration file.
diff --git a/application/Config/Toolbar.php b/application/Config/Toolbar.php
index 7b59691527..fb51f56c8b 100644
--- a/application/Config/Toolbar.php
+++ b/application/Config/Toolbar.php
@@ -27,5 +27,5 @@ class Toolbar extends BaseConfig
 		\CodeIgniter\Debug\Toolbar\Collectors\Events::class,
 	];
 	public $maxHistory = 20;
-	public $viewsPath  = BASEPATH . 'Debug/Toolbar/Views/';
+	public $viewsPath  = SYSTEMPATH . 'Debug/Toolbar/Views/';
 }
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index fb2893f7c9..25327d5b22 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -339,7 +339,7 @@ class FileLocator
 	{
 		$paths = [
 			APPPATH,
-			BASEPATH,
+			SYSTEMPATH,
 		];
 
 		foreach ($paths as $path)
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index e0ce367788..3061bf011f 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -182,7 +182,7 @@ class CodeIgniter
 
 		if (CI_DEBUG)
 		{
-			require_once BASEPATH . 'ThirdParty/Kint/kint.php';
+			require_once SYSTEMPATH . 'ThirdParty/Kint/kint.php';
 		}
 	}
 
diff --git a/system/Common.php b/system/Common.php
index 0977aff4c5..feb8a9e155 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -585,7 +585,7 @@ if (! function_exists('helper'))
 						$appHelper = $path;
 						// @codeCoverageIgnoreEnd
 					}
-					elseif (strpos($path, BASEPATH) === 0)
+					elseif (strpos($path, SYSTEMPATH) === 0)
 					{
 						$systemHelper = $path;
 					}
@@ -694,7 +694,7 @@ if (! function_exists('csrf_field'))
 	 */
 	function csrf_field(string $id = null)
 	{
-		return '<input type="hidden"' . (!empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
+		return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
 	}
 }
 
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index d7d3f060ba..61ef260bf2 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -88,7 +88,7 @@ class AutoloadConfig
 		 *   `];
 		 */
 		$this->psr4 = [
-			'CodeIgniter' => realpath(BASEPATH),
+			'CodeIgniter' => realpath(SYSTEMPATH),
 		];
 
 		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
@@ -113,78 +113,78 @@ class AutoloadConfig
 		 *   ];
 		 */
 		$this->classmap = [
-			'CodeIgniter\CodeIgniter'                       => BASEPATH . 'CodeIgniter.php',
-			'CodeIgniter\CLI\CLI'                           => BASEPATH . 'CLI/CLI.php',
-			'CodeIgniter\Cache\CacheFactory'                => BASEPATH . 'Cache/CacheFactory.php',
-			'CodeIgniter\Cache\CacheInterface'              => BASEPATH . 'Cache/CacheInterface.php',
-			'CodeIgniter\Cache\Handlers\DummyHandler'       => BASEPATH . 'Cache/Handlers/DummyHandler.php',
-			'CodeIgniter\Cache\Handlers\FileHandler'        => BASEPATH . 'Cache/Handlers/FileHandler.php',
-			'CodeIgniter\Cache\Handlers\MemcachedHandler'   => BASEPATH . 'Cache/Handlers/MemcachedHandler.php',
-			'CodeIgniter\Cache\Handlers\PredisHandler'      => BASEPATH . 'Cache/Handlers/PredisHandler.php',
-			'CodeIgniter\Cache\Handlers\RedisHandler'       => BASEPATH . 'Cache/Handlers/RedisHandler.php',
-			'CodeIgniter\Cache\Handlers\WincacheHandler'    => BASEPATH . 'Cache/Handlers/WincacheHandler.php',
-			'CodeIgniter\Controller'                        => BASEPATH . 'Controller.php',
-			'CodeIgniter\Config\AutoloadConfig'             => BASEPATH . 'Config/Autoload.php',
-			'CodeIgniter\Config\BaseConfig'                 => BASEPATH . 'Config/BaseConfig.php',
-			'CodeIgniter\Config\Database'                   => BASEPATH . 'Config/Database.php',
-			'CodeIgniter\Config\Database\Connection'        => BASEPATH . 'Config/Database/Connection.php',
-			'CodeIgniter\Config\Database\Connection\MySQLi' => BASEPATH . 'Config/Database/Connection/MySQLi.php',
-			'CodeIgniter\Config\DotEnv'                     => BASEPATH . 'Config/DotEnv.php',
-			'CodeIgniter\Database\BaseBuilder'              => BASEPATH . 'Database/BaseBuilder.php',
-			'CodeIgniter\Database\BaseConnection'           => BASEPATH . 'Database/BaseConnection.php',
-			'CodeIgniter\Database\BaseResult'               => BASEPATH . 'Database/BaseResult.php',
-			'CodeIgniter\Database\Config'                   => BASEPATH . 'Database/Config.php',
-			'CodeIgniter\Database\ConnectionInterface'      => BASEPATH . 'Database/ConnectionInterface.php',
-			'CodeIgniter\Database\Database'                 => BASEPATH . 'Database/Database.php',
-			'CodeIgniter\Database\Query'                    => BASEPATH . 'Database/Query.php',
-			'CodeIgniter\Database\QueryInterface'           => BASEPATH . 'Database/QueryInterface.php',
-			'CodeIgniter\Database\ResultInterface'          => BASEPATH . 'Database/ResultInterface.php',
-			'CodeIgniter\Database\Migration'                => BASEPATH . 'Database/Migration.php',
-			'CodeIgniter\Database\MigrationRunner'          => BASEPATH . 'Database/MigrationRunner.php',
-			'CodeIgniter\Debug\Exceptions'                  => BASEPATH . 'Debug/Exceptions.php',
-			'CodeIgniter\Debug\Timer'                       => BASEPATH . 'Debug/Timer.php',
-			'CodeIgniter\Debug\Iterator'                    => BASEPATH . 'Debug/Iterator.php',
-			'CodeIgniter\Events\Events'                     => BASEPATH . 'Events/Events.php',
-			'CodeIgniter\HTTP\CLIRequest'                   => BASEPATH . 'HTTP/CLIRequest.php',
-			'CodeIgniter\HTTP\ContentSecurityPolicy'        => BASEPATH . 'HTTP/ContentSecurityPolicy.php',
-			'CodeIgniter\HTTP\CURLRequest'                  => BASEPATH . 'HTTP/CURLRequest.php',
-			'CodeIgniter\HTTP\IncomingRequest'              => BASEPATH . 'HTTP/IncomingRequest.php',
-			'CodeIgniter\HTTP\Message'                      => BASEPATH . 'HTTP/Message.php',
-			'CodeIgniter\HTTP\Negotiate'                    => BASEPATH . 'HTTP/Negotiate.php',
-			'CodeIgniter\HTTP\Request'                      => BASEPATH . 'HTTP/Request.php',
-			'CodeIgniter\HTTP\RequestInterface'             => BASEPATH . 'HTTP/RequestInterface.php',
-			'CodeIgniter\HTTP\Response'                     => BASEPATH . 'HTTP/Response.php',
-			'CodeIgniter\HTTP\ResponseInterface'            => BASEPATH . 'HTTP/ResponseInterface.php',
-			'CodeIgniter\HTTP\URI'                          => BASEPATH . 'HTTP/URI.php',
-			'CodeIgniter\Log\Logger'                        => BASEPATH . 'Log/Logger.php',
-			'Psr\Log\AbstractLogger'                        => BASEPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
-			'Psr\Log\InvalidArgumentException'              => BASEPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
-			'Psr\Log\LoggerAwareInterface'                  => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
-			'Psr\Log\LoggerAwareTrait'                      => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
-			'Psr\Log\LoggerInterface'                       => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
-			'Psr\Log\LoggerTrait'                           => BASEPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
-			'Psr\Log\LogLevel'                              => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
-			'Psr\Log\NullLogger'                            => BASEPATH . 'ThirdParty/PSR/Log/NullLogger.php',
-			'CodeIgniter\Log\Handlers\BaseHandler'          => BASEPATH . 'Log/Handlers/BaseHandler.php',
-			'CodeIgniter\Log\Handlers\ChromeLoggerHandler'  => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
-			'CodeIgniter\Log\Handlers\FileHandler'          => BASEPATH . 'Log/Handlers/FileHandler.php',
-			'CodeIgniter\Log\Handlers\HandlerInterface'     => BASEPATH . 'Log/Handlers/HandlerInterface.php',
-			'CodeIgniter\Router\RouteCollection'            => BASEPATH . 'Router/RouteCollection.php',
-			'CodeIgniter\Router\RouteCollectionInterface'   => BASEPATH . 'Router/RouteCollectionInterface.php',
-			'CodeIgniter\Router\Router'                     => BASEPATH . 'Router/Router.php',
-			'CodeIgniter\Router\RouterInterface'            => BASEPATH . 'Router/RouterInterface.php',
-			'CodeIgniter\Security\Security'                 => BASEPATH . 'Security/Security.php',
-			'CodeIgniter\Session\Session'                   => BASEPATH . 'Session/Session.php',
-			'CodeIgniter\Session\SessionInterface'          => BASEPATH . 'Session/SessionInterface.php',
-			'CodeIgniter\Session\Handlers\BaseHandler'      => BASEPATH . 'Session/Handlers/BaseHandler.php',
-			'CodeIgniter\Session\Handlers\FileHandler'      => BASEPATH . 'Session/Handlers/FileHandler.php',
-			'CodeIgniter\Session\Handlers\MemcachedHandler' => BASEPATH . 'Session/Handlers/MemcachedHandler.php',
-			'CodeIgniter\Session\Handlers\RedisHandler'     => BASEPATH . 'Session/Handlers/RedisHandler.php',
-			'CodeIgniter\View\RendererInterface'            => BASEPATH . 'View/RendererInterface.php',
-			'CodeIgniter\View\View'                         => BASEPATH . 'View/View.php',
-			'CodeIgniter\View\Parser'                       => BASEPATH . 'View/Parser.php',
-			'CodeIgniter\View\Cell'                         => BASEPATH . 'View/Cell.php',
-			'Zend\Escaper\Escaper'                          => BASEPATH . 'ThirdParty/ZendEscaper/Escaper.php',
+			'CodeIgniter\CodeIgniter'                       => SYSTEMPATH . 'CodeIgniter.php',
+			'CodeIgniter\CLI\CLI'                           => SYSTEMPATH . 'CLI/CLI.php',
+			'CodeIgniter\Cache\CacheFactory'                => SYSTEMPATH . 'Cache/CacheFactory.php',
+			'CodeIgniter\Cache\CacheInterface'              => SYSTEMPATH . 'Cache/CacheInterface.php',
+			'CodeIgniter\Cache\Handlers\DummyHandler'       => SYSTEMPATH . 'Cache/Handlers/DummyHandler.php',
+			'CodeIgniter\Cache\Handlers\FileHandler'        => SYSTEMPATH . 'Cache/Handlers/FileHandler.php',
+			'CodeIgniter\Cache\Handlers\MemcachedHandler'   => SYSTEMPATH . 'Cache/Handlers/MemcachedHandler.php',
+			'CodeIgniter\Cache\Handlers\PredisHandler'      => SYSTEMPATH . 'Cache/Handlers/PredisHandler.php',
+			'CodeIgniter\Cache\Handlers\RedisHandler'       => SYSTEMPATH . 'Cache/Handlers/RedisHandler.php',
+			'CodeIgniter\Cache\Handlers\WincacheHandler'    => SYSTEMPATH . 'Cache/Handlers/WincacheHandler.php',
+			'CodeIgniter\Controller'                        => SYSTEMPATH . 'Controller.php',
+			'CodeIgniter\Config\AutoloadConfig'             => SYSTEMPATH . 'Config/Autoload.php',
+			'CodeIgniter\Config\BaseConfig'                 => SYSTEMPATH . 'Config/BaseConfig.php',
+			'CodeIgniter\Config\Database'                   => SYSTEMPATH . 'Config/Database.php',
+			'CodeIgniter\Config\Database\Connection'        => SYSTEMPATH . 'Config/Database/Connection.php',
+			'CodeIgniter\Config\Database\Connection\MySQLi' => SYSTEMPATH . 'Config/Database/Connection/MySQLi.php',
+			'CodeIgniter\Config\DotEnv'                     => SYSTEMPATH . 'Config/DotEnv.php',
+			'CodeIgniter\Database\BaseBuilder'              => SYSTEMPATH . 'Database/BaseBuilder.php',
+			'CodeIgniter\Database\BaseConnection'           => SYSTEMPATH . 'Database/BaseConnection.php',
+			'CodeIgniter\Database\BaseResult'               => SYSTEMPATH . 'Database/BaseResult.php',
+			'CodeIgniter\Database\Config'                   => SYSTEMPATH . 'Database/Config.php',
+			'CodeIgniter\Database\ConnectionInterface'      => SYSTEMPATH . 'Database/ConnectionInterface.php',
+			'CodeIgniter\Database\Database'                 => SYSTEMPATH . 'Database/Database.php',
+			'CodeIgniter\Database\Query'                    => SYSTEMPATH . 'Database/Query.php',
+			'CodeIgniter\Database\QueryInterface'           => SYSTEMPATH . 'Database/QueryInterface.php',
+			'CodeIgniter\Database\ResultInterface'          => SYSTEMPATH . 'Database/ResultInterface.php',
+			'CodeIgniter\Database\Migration'                => SYSTEMPATH . 'Database/Migration.php',
+			'CodeIgniter\Database\MigrationRunner'          => SYSTEMPATH . 'Database/MigrationRunner.php',
+			'CodeIgniter\Debug\Exceptions'                  => SYSTEMPATH . 'Debug/Exceptions.php',
+			'CodeIgniter\Debug\Timer'                       => SYSTEMPATH . 'Debug/Timer.php',
+			'CodeIgniter\Debug\Iterator'                    => SYSTEMPATH . 'Debug/Iterator.php',
+			'CodeIgniter\Events\Events'                     => SYSTEMPATH . 'Events/Events.php',
+			'CodeIgniter\HTTP\CLIRequest'                   => SYSTEMPATH . 'HTTP/CLIRequest.php',
+			'CodeIgniter\HTTP\ContentSecurityPolicy'        => SYSTEMPATH . 'HTTP/ContentSecurityPolicy.php',
+			'CodeIgniter\HTTP\CURLRequest'                  => SYSTEMPATH . 'HTTP/CURLRequest.php',
+			'CodeIgniter\HTTP\IncomingRequest'              => SYSTEMPATH . 'HTTP/IncomingRequest.php',
+			'CodeIgniter\HTTP\Message'                      => SYSTEMPATH . 'HTTP/Message.php',
+			'CodeIgniter\HTTP\Negotiate'                    => SYSTEMPATH . 'HTTP/Negotiate.php',
+			'CodeIgniter\HTTP\Request'                      => SYSTEMPATH . 'HTTP/Request.php',
+			'CodeIgniter\HTTP\RequestInterface'             => SYSTEMPATH . 'HTTP/RequestInterface.php',
+			'CodeIgniter\HTTP\Response'                     => SYSTEMPATH . 'HTTP/Response.php',
+			'CodeIgniter\HTTP\ResponseInterface'            => SYSTEMPATH . 'HTTP/ResponseInterface.php',
+			'CodeIgniter\HTTP\URI'                          => SYSTEMPATH . 'HTTP/URI.php',
+			'CodeIgniter\Log\Logger'                        => SYSTEMPATH . 'Log/Logger.php',
+			'Psr\Log\AbstractLogger'                        => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+			'Psr\Log\InvalidArgumentException'              => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
+			'Psr\Log\LoggerAwareInterface'                  => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
+			'Psr\Log\LoggerAwareTrait'                      => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
+			'Psr\Log\LoggerInterface'                       => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+			'Psr\Log\LoggerTrait'                           => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
+			'Psr\Log\LogLevel'                              => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+			'Psr\Log\NullLogger'                            => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
+			'CodeIgniter\Log\Handlers\BaseHandler'          => SYSTEMPATH . 'Log/Handlers/BaseHandler.php',
+			'CodeIgniter\Log\Handlers\ChromeLoggerHandler'  => SYSTEMPATH . 'Log/Handlers/ChromeLoggerHandler.php',
+			'CodeIgniter\Log\Handlers\FileHandler'          => SYSTEMPATH . 'Log/Handlers/FileHandler.php',
+			'CodeIgniter\Log\Handlers\HandlerInterface'     => SYSTEMPATH . 'Log/Handlers/HandlerInterface.php',
+			'CodeIgniter\Router\RouteCollection'            => SYSTEMPATH . 'Router/RouteCollection.php',
+			'CodeIgniter\Router\RouteCollectionInterface'   => SYSTEMPATH . 'Router/RouteCollectionInterface.php',
+			'CodeIgniter\Router\Router'                     => SYSTEMPATH . 'Router/Router.php',
+			'CodeIgniter\Router\RouterInterface'            => SYSTEMPATH . 'Router/RouterInterface.php',
+			'CodeIgniter\Security\Security'                 => SYSTEMPATH . 'Security/Security.php',
+			'CodeIgniter\Session\Session'                   => SYSTEMPATH . 'Session/Session.php',
+			'CodeIgniter\Session\SessionInterface'          => SYSTEMPATH . 'Session/SessionInterface.php',
+			'CodeIgniter\Session\Handlers\BaseHandler'      => SYSTEMPATH . 'Session/Handlers/BaseHandler.php',
+			'CodeIgniter\Session\Handlers\FileHandler'      => SYSTEMPATH . 'Session/Handlers/FileHandler.php',
+			'CodeIgniter\Session\Handlers\MemcachedHandler' => SYSTEMPATH . 'Session/Handlers/MemcachedHandler.php',
+			'CodeIgniter\Session\Handlers\RedisHandler'     => SYSTEMPATH . 'Session/Handlers/RedisHandler.php',
+			'CodeIgniter\View\RendererInterface'            => SYSTEMPATH . 'View/RendererInterface.php',
+			'CodeIgniter\View\View'                         => SYSTEMPATH . 'View/View.php',
+			'CodeIgniter\View\Parser'                       => SYSTEMPATH . 'View/Parser.php',
+			'CodeIgniter\View\Cell'                         => SYSTEMPATH . 'View/Cell.php',
+			'Zend\Escaper\Escaper'                          => SYSTEMPATH . 'ThirdParty/ZendEscaper/Escaper.php',
 		];
 
 		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 092f3f6d9e..cb69f49570 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -176,7 +176,8 @@ class Exceptions
 	 */
 	public function errorHandler(int $severity, string $message, string $file = null, int $line = null, $context = null)
 	{
-		if (! (\error_reporting() & $severity)) {
+		if (! (\error_reporting() & $severity))
+		{
 			return;
 		}
 
@@ -359,9 +360,9 @@ class Exceptions
 		{
 			$file = 'APPPATH/' . substr($file, strlen(APPPATH));
 		}
-		elseif (strpos($file, BASEPATH) === 0)
+		elseif (strpos($file, SYSTEMPATH) === 0)
 		{
-			$file = 'BASEPATH/' . substr($file, strlen(BASEPATH));
+			$file = 'SYSTEMPATH/' . substr($file, strlen(SYSTEMPATH));
 		}
 		elseif (strpos($file, FCPATH) === 0)
 		{
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index 0495f2eab6..3a5889d2f7 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -255,9 +255,9 @@ class BaseCollector
 		{
 			$file = 'APPPATH/' . substr($file, strlen(APPPATH));
 		}
-		elseif (strpos($file, BASEPATH) === 0)
+		elseif (strpos($file, SYSTEMPATH) === 0)
 		{
-			$file = 'BASEPATH/' . substr($file, strlen(BASEPATH));
+			$file = 'SYSTEMPATH/' . substr($file, strlen(SYSTEMPATH));
 		}
 		elseif (strpos($file, FCPATH) === 0)
 		{
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index 21f017b168..5ecf23ca11 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -95,7 +95,7 @@ class Files extends BaseCollector
 		{
 			$path = $this->cleanPath($file);
 
-			if (strpos($path, 'BASEPATH') !== false)
+			if (strpos($path, 'SYSTEMPATH') !== false)
 			{
 				$coreFiles[] = [
 					'name' => basename($file),
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 12ad9ea8bf..f1786b726d 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -108,7 +108,7 @@ class FileHandler extends BaseHandler implements HandlerInterface
 			// Only add protection to php files
 			if ($this->fileExtension === 'php')
 			{
-				$msg .= "<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>\n\n";
+				$msg .= "<?php defined('SYSTEMPATH') || exit('No direct script access allowed'); ?>\n\n";
 			}
 		}
 
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index aeb0ab0791..90df18dd94 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -508,7 +508,7 @@ class Logger implements LoggerInterface
 	//--------------------------------------------------------------------
 
 	/**
-	 * Cleans the paths of filenames by replacing APPPATH, BASEPATH, FCPATH
+	 * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
 	 * with the actual var. i.e.
 	 *
 	 *  /var/www/site/application/Controllers/Home.php
@@ -522,7 +522,7 @@ class Logger implements LoggerInterface
 	protected function cleanFileNames($file)
 	{
 		$file = str_replace(APPPATH, 'APPPATH/', $file);
-		$file = str_replace(BASEPATH, 'BASEPATH/', $file);
+		$file = str_replace(SYSTEMPATH, 'SYSTEMPATH/', $file);
 		$file = str_replace(FCPATH, 'FCPATH/', $file);
 
 		return $file;
diff --git a/system/View/View.php b/system/View/View.php
index f38976245e..d41e9427b8 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -220,7 +220,7 @@ class View implements RendererInterface
 			if (in_array(\CodeIgniter\Debug\Toolbar\Collectors\Views::class, $toolbarCollectors))
 			{
 				// Clean up our path names to make them a little cleaner
-				foreach (['APPPATH', 'BASEPATH', 'ROOTPATH'] as $path)
+				foreach (['APPPATH', 'SYSTEMPATH', 'ROOTPATH'] as $path)
 				{
 					if (strpos($this->renderVars['file'], constant($path)) === 0)
 					{
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 2200084c83..25d15fbbd8 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -65,9 +65,9 @@ if (! defined('ROOTPATH'))
 /**
  * The path to the system directory.
  */
-if (! defined('BASEPATH'))
+if (! defined('SYSTEMPATH'))
 {
-	define('BASEPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
+	define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -93,7 +93,7 @@ if (! defined('TESTPATH'))
  */
 require_once APPPATH . 'Config/Constants.php';
 
-require_once BASEPATH . 'Common.php';
+require_once SYSTEMPATH . 'Common.php';
 
 /*
  * ---------------------------------------------------------------
@@ -105,9 +105,9 @@ require_once BASEPATH . 'Common.php';
  * that the config files can use the path constants.
  */
 
-require_once BASEPATH . 'Autoloader/Autoloader.php';
+require_once SYSTEMPATH . 'Autoloader/Autoloader.php';
 require_once APPPATH . 'Config/Autoload.php';
-require_once BASEPATH . 'Config/BaseService.php';
+require_once SYSTEMPATH . 'Config/BaseService.php';
 require_once APPPATH . 'Config/Services.php';
 
 // Use Config\Services as CodeIgniter\Services
@@ -128,7 +128,7 @@ if (is_file(COMPOSER_PATH))
 
 // Load environment settings from .env files
 // into $_SERVER and $_ENV
-require_once BASEPATH . 'Config/DotEnv.php';
+require_once SYSTEMPATH . 'Config/DotEnv.php';
 
 $env = new \CodeIgniter\Config\DotEnv(ROOTPATH);
 $env->load();
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 0f98fbff5d..ba1ce1cd15 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -21,7 +21,7 @@ class FileLocatorTest extends \CIUnitTestCase
 		$config->psr4 = [
 			'App\Libraries' => '/application/somewhere',
 			'App'           => '/application',
-			'Sys'           => BASEPATH,
+			'Sys'           => SYSTEMPATH,
 			'Blog'          => '/modules/blog',
 			'Tests/Support' => TESTPATH . '_support/',
 		];
@@ -154,7 +154,7 @@ class FileLocatorTest extends \CIUnitTestCase
 		$expected = rtrim(APPPATH, '/') . '/index.html';
 		$this->assertContains($expected, $foundFiles);
 
-		$expected = rtrim(BASEPATH, '/') . '/index.html';
+		$expected = rtrim(SYSTEMPATH, '/') . '/index.html';
 		$this->assertContains($expected, $foundFiles);
 	}
 
@@ -197,8 +197,8 @@ class FileLocatorTest extends \CIUnitTestCase
 		$expectedLin = APPPATH . 'Filters/DebugToolbar.php';
 		$this->assertTrue(in_array($expectedWin, $files) || in_array($expectedLin, $files));
 
-		$expectedWin = BASEPATH . 'Filters\Filters.php';
-		$expectedLin = BASEPATH . 'Filters/Filters.php';
+		$expectedWin = SYSTEMPATH . 'Filters\Filters.php';
+		$expectedLin = SYSTEMPATH . 'Filters/Filters.php';
 		$this->assertTrue(in_array($expectedWin, $files) || in_array($expectedLin, $files));
 	}
 
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index 8dbe11617e..ef279ec4bd 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -5,30 +5,30 @@ class FileTest extends \CIUnitTestCase
 
 	public function testNewGoodChecked()
 	{
-		$path = BASEPATH . 'Common.php';
+		$path = SYSTEMPATH . 'Common.php';
 		$file = new File($path, true);
 		$this->assertEquals($path, $file->getRealPath());
 	}
 
 	public function testNewGoodUnchecked()
 	{
-		$path = BASEPATH . 'Common.php';
+		$path = SYSTEMPATH . 'Common.php';
 		$file = new File($path, false);
 		$this->assertEquals($path, $file->getRealPath());
 	}
 
 	public function testNewBadUnchecked()
 	{
-		$path = BASEPATH . 'bogus';
+		$path = SYSTEMPATH . 'bogus';
 		$file = new File($path, false);
 		$this->assertFalse($file->getRealPath());
 	}
 
 	public function testGuessExtension()
 	{
-		$file = new File(BASEPATH . 'Common.php');
+		$file = new File(SYSTEMPATH . 'Common.php');
 		$this->assertEquals('php', $file->guessExtension());
-		$file = new File(BASEPATH . 'index.html');
+		$file = new File(SYSTEMPATH . 'index.html');
 		$this->assertEquals('html', $file->guessExtension());
 		$file = new File(ROOTPATH . 'phpunit.xml.dist');
 		$this->assertEquals('xml', $file->guessExtension());
@@ -36,28 +36,28 @@ class FileTest extends \CIUnitTestCase
 
 	public function testRandomName()
 	{
-		$file    = new File(BASEPATH . 'Common.php');
+		$file    = new File(SYSTEMPATH . 'Common.php');
 		$result1 = $file->getRandomName();
 		$this->assertNotEquals($result1, $file->getRandomName());
 	}
 
 	public function testCanAccessSplFileInfoMethods()
 	{
-		$file = new File(BASEPATH . 'Common.php');
+		$file = new File(SYSTEMPATH . 'Common.php');
 		$this->assertEquals('file', $file->getType());
 	}
 
 	public function testGetSizeReturnsKB()
 	{
-		$file = new File(BASEPATH . 'Common.php');
-		$size = number_format(filesize(BASEPATH . 'Common.php') / 1024, 3);
+		$file = new File(SYSTEMPATH . 'Common.php');
+		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
 		$this->assertEquals($size, $file->getSize('kb'));
 	}
 
 	public function testGetSizeReturnsMB()
 	{
-		$file = new File(BASEPATH . 'Common.php');
-		$size = number_format(filesize(BASEPATH . 'Common.php') / 1024 / 1024, 3);
+		$file = new File(SYSTEMPATH . 'Common.php');
+		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
 		$this->assertEquals($size, $file->getSize('mb'));
 	}
 
@@ -66,7 +66,7 @@ class FileTest extends \CIUnitTestCase
 	 */
 	public function testThrowsExceptionIfNotAFile()
 	{
-		$file = new File(BASEPATH . 'Commoner.php', true);
+		$file = new File(SYSTEMPATH . 'Commoner.php', true);
 	}
 
 }
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 92b00dbae4..48560f5939 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -152,8 +152,8 @@ class DownloadResponseTest extends \CIUnitTestCase
 
 		$response = new DownloadResponse('unit-test.txt', true);
 
-		$size = filesize(BASEPATH . 'Common.php');
-		$response->setFilePath(BASEPATH . 'Common.php');
+		$size = filesize(SYSTEMPATH . 'Common.php');
+		$response->setFilePath(SYSTEMPATH . 'Common.php');
 		$this->assertSame($size, $response->getContentLength());
 	}
 
diff --git a/tests/system/Log/FileHandlerTest.php b/tests/system/Log/FileHandlerTest.php
index ac2d7507be..fa64c5136b 100644
--- a/tests/system/Log/FileHandlerTest.php
+++ b/tests/system/Log/FileHandlerTest.php
@@ -50,7 +50,7 @@ class FileHandlerTest extends \CIUnitTestCase
 		fclose($fp);
 
 		// did the log file get created?
-		$expectedResult = "<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>\n";
+		$expectedResult = "<?php defined('SYSTEMPATH') || exit('No direct script access allowed'); ?>\n";
 		$this->assertEquals($expectedResult, $line);
 	}
 
diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 07e48a0c00..d55f2cb43d 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -130,7 +130,7 @@ Our demo command might have a ``run`` method something like::
         CLI::write('PHP Version: '. CLI::color(phpversion(), 'yellow'));
         CLI::write('CI Version: '. CLI::color(CodeIgniter::CI_VERSION, 'yellow'));
         CLI::write('APPPATH: '. CLI::color(APPPATH, 'yellow'));
-        CLI::write('BASEPATH: '. CLI::color(BASEPATH, 'yellow'));
+        CLI::write('SYSTEMPATH: '. CLI::color(SYSTEMPATH, 'yellow'));
         CLI::write('ROOTPATH: '. CLI::color(ROOTPATH, 'yellow'));
         CLI::write('Included files: '. CLI::color(count(get_included_files()), 'yellow'));
     }
diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 8ceaffeb2c..d0c37baa62 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -42,7 +42,7 @@ those classes can be found in::
 
 	$psr4 = [
 		'App'         => APPPATH,
-		'CodeIgniter' => BASEPATH,
+		'CodeIgniter' => SYSTEMPATH,
 	];
 
 The key of each row is the namespace itself. This does not need a trailing slash. If you use double-quotes
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 8511025de0..8a2d844f6e 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -328,7 +328,7 @@ Core Constants
 
 	The path to the main application directory. Just above ``APPPATH``.
 
-.. php:const:: BASEPATH
+.. php:const:: SYSTEMPATH
 
 	The path to the **system** directory.