Merge pull request #1551 from samsonasik/composer-script-reduce-manua…

…l-define-system-dir remove manual define "system/" directory prefix at ComposerScripts
codeigniter4 · Dec 6, 2018 · 8714368 · 8714368
2 parents 41065e7 + 70292c9
commit 8714368
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
@@ -49,7 +49,7 @@
  */
 class ComposerScripts
 {
-	protected static $basePath = 'system/ThirdParty/';
+	protected static $basePath = 'ThirdParty/';
 
 	/**
 	 * After composer install/update, this is called to move
@@ -144,7 +144,7 @@ public static function moveEscaper()
 	{
 		if (class_exists('\\Zend\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))
 		{
-			$base = static::$basePath . 'ZendEscaper';
+			$base = basename(__DIR__) . '/' . static::$basePath . 'ZendEscaper';
 
 			foreach ([$base, $base . '/Exception'] as $path)
 			{
@@ -183,7 +183,7 @@ public static function moveKint()
 
 		if (is_file($filename))
 		{
-			$base = static::$basePath . 'Kint';
+			$base = basename(__DIR__) . '/' . static::$basePath . 'Kint';
 
 			// Remove the contents of the previous Kint folder, if any.
 			if (is_dir($base))