Merge pull request #1551 from samsonasik/composer-script-reduce-manual-define-system-dir

jim-parry · web-flow · commit 871436854893 · 2018-12-05T23:03:13.000-08:00
remove manual define "system/" directory prefix at ComposerScripts
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))

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`*/`
`50`	`50`	`class ComposerScripts`
`51`	`51`	`{`
`52`		`- protected static $basePath = 'system/ThirdParty/';`
	`52`	`+ protected static $basePath = 'ThirdParty/';`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* After composer install/update, this is called to move`
`@@ -144,7 +144,7 @@ public static function moveEscaper()`
`144`	`144`	`{`
`145`	`145`	`if (class_exists('\\Zend\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))`
`146`	`146`	`{`
`147`		`- $base = static::$basePath . 'ZendEscaper';`
	`147`	`+ $base = basename(__DIR__) . '/' . static::$basePath . 'ZendEscaper';`
`148`	`148`
`149`	`149`	`foreach ([$base, $base . '/Exception'] as $path)`
`150`	`150`	`{`
`@@ -183,7 +183,7 @@ public static function moveKint()`
`183`	`183`
`184`	`184`	`if (is_file($filename))`
`185`	`185`	`{`
`186`		`- $base = static::$basePath . 'Kint';`
	`186`	`+ $base = basename(__DIR__) . '/' . static::$basePath . 'Kint';`
`187`	`187`
`188`	`188`	`// Remove the contents of the previous Kint folder, if any.`
`189`	`189`	`if (is_dir($base))`