N°7331 - Refactor Composer cleanup scripts to be used by other dependencies managers as well

.make/build/afterBuild.php

@@ -4,7 +4,7 @@ $iBeginTime = time();
 chdir(__DIR__);
 
 $aCommands = [
-	'php composer/rmDeniedTestDir.php',
+	'php composer/rmUnnecessaryFolders.php',
 	'php build/commands/setupCssCompiler.php',
 //	'bash /tmp/gabuzomeu.sh',
 ];

.make/dependencies/composer/listOutdated.php

@@ -26,7 +26,7 @@
  * @link https://getcomposer.org/doc/03-cli.md#show
  */
 
-$iTopFolder = __DIR__."/../../";
+$iTopFolder = __DIR__."/../../../";
 
 require_once("$iTopFolder/approot.inc.php");
 $sApproot = APPROOT;

.make/dependencies/composer/tcpdf/tcpdfUpdateFonts.php

@@ -13,7 +13,7 @@
  * @link https://github.com/tecnickcom/TCPDF?tab=readme-ov-file#note TCPDF is in support only mode
  */
 
-$sItopRootFolder = realpath(__DIR__ . "/../../../");
+$sItopRootFolder = realpath(__DIR__ . "/../../../../");
 $sCurrentScriptFileName = basename(__FILE__);
 
 

.make/dependencies/rmUnnecessaryFolders.php

@@ -19,8 +19,6 @@
  *
  */
 
-use Combodo\iTop\Composer\iTopComposer;
-
 $iTopFolder = __DIR__ . "/../../" ;
 
 require_once ("$iTopFolder/approot.inc.php");
@@ -33,13 +31,34 @@ if  (php_sapi_name() !== 'cli')
 
 clearstatcache();
 
-$oiTopComposer = new iTopComposer();
-$aDeniedButStillPresent = $oiTopComposer->ListDeniedButStillPresent();
+// Read params
+$key = array_search("--manager", $argv);
+if (false === $key || false === isset($argv[$key + 1]) ) {
+	throw new \Exception("Usage: " . __FILE__ . " --manager composer|npm");
+}
+$sDependenciesHandlerCode = $argv[$key + 1];
+
+switch ($sDependenciesHandlerCode) {
+	case "composer":
+		$sDependenciesHandlerFQCN = \Combodo\iTop\Dependencies\Composer\iTopComposer::class;
+		break;
+
+	case "npm":
+		$sDependenciesHandlerFQCN = \Combodo\iTop\Dependencies\NPM\iTopNPM::class;
+		break;
+
+	default:
+		throw new \Exception("Invalid dependencies handler code, $sDependenciesHandlerCode given, expected composer|npm");
+}
+
+// Start handler
+$oDependenciesHandler = new $sDependenciesHandlerFQCN();
+$aDeniedButStillPresent = $oDependenciesHandler->ListDeniedButStillPresent();
 
 echo "\n";
 foreach ($aDeniedButStillPresent as $sDir)
 {
-	if (false === iTopComposer::IsTestDir($sDir))
+	if (false === $oDependenciesHandler::IsQuestionnableFolder($sDir))
 	{
 		echo "ERROR found INVALID denied test dir: '$sDir'\n";
 		throw new \Exception("$sDir must end with /Test/ or /test/");
@@ -61,13 +80,13 @@ foreach ($aDeniedButStillPresent as $sDir)
 
 
 $aAllowedAndDeniedDirs = array_merge(
-	$oiTopComposer->ListAllowedTestDir(),
-	$oiTopComposer->ListDeniedTestDir()
+	$oDependenciesHandler->ListAllowedQuestionnableFoldersAbsPaths(),
+	$oDependenciesHandler->ListDeniedQuestionnableFolderAbsPaths()
 );
-$aExistingDirs = $oiTopComposer->ListAllTestDir();
+$aExistingDirs = $oDependenciesHandler->ListAllQuestionnableFoldersAbsPaths();
 $aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
 if (false === empty($aMissing)) {
 	echo "Some new tests dirs exists !\n"
-		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-		.'  List of dirs:'."\n".var_export($aMissing, true);
+		.'  They must be declared either in the allowed or denied list in '.$sDependenciesHandlerFQCN." (see N°2651).\n"
+		.'  List of dirs:'."\n".var_export($aMissing, true)."\n";
 }