Removed view paths on paths to clean

codeigniter4 · Apr 20, 2020 · 4cb62d1 · 4cb62d1
1 parent 51ab7f2
commit 4cb62d1
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -374,9 +374,6 @@ public static function cleanPath(string $file): string
 	{
 		switch (true)
 		{
-			case strpos($file, VIEWPATH) === 0:
-				$file = 'VIEWPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VIEWPATH));
-				break;
 			case strpos($file, APPPATH) === 0:
 				$file = 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH));
 				break;

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
@@ -16,7 +16,6 @@
 defined('APPPATH')       || define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
 defined('WRITEPATH')     || define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
 defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
-defined('VIEWPATH')      || define('VIEWPATH', realpath($paths->viewDirectory) . DIRECTORY_SEPARATOR);
 defined('ROOTPATH')      || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 defined('CIPATH')        || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR);
 defined('FCPATH')        || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR);

diff --git a/system/bootstrap.php b/system/bootstrap.php
@@ -87,14 +87,6 @@
 	define('TESTPATH', realpath($paths->testsDirectory) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the views directory
- */
-if (! defined('VIEWPATH'))
-{
-	define('VIEWPATH', realpath($paths->viewDirectory) . DIRECTORY_SEPARATOR);
-}
-
 /*
  * ---------------------------------------------------------------
  * GRAB OUR CONSTANTS & COMMON

diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
@@ -25,18 +25,10 @@ public function dirtyPathsProvider()
 				APPPATH . 'Config' . $ds . 'App.php',
 				'APPPATH' . $ds . 'Config' . $ds . 'App.php',
 			],
-			[
-				APPPATH . 'Views' . $ds . 'welcome_message.php',
-				'VIEWPATH' . $ds . 'welcome_message.php',
-			],
 			[
 				SYSTEMPATH . 'CodeIgniter.php',
 				'SYSTEMPATH' . $ds . 'CodeIgniter.php',
 			],
-			[
-				VIEWPATH . 'errors' . $ds . 'html' . $ds . 'error_exception.php',
-				'VIEWPATH' . $ds . 'errors' . $ds . 'html' . $ds . 'error_exception.php',
-			],
 			[
 				VENDORPATH . 'autoload.php',
 				'VENDORPATH' . $ds . 'autoload.php',