composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°7331 - Update cleanup script to remove denied folders no matter if they seem questionable

Browse Source
This commit is contained in:
Molkobain
2024-03-22 15:47:25 +01:00
parent 3588a50597
commit b38a7c8ab6
76 changed files with 19 additions and 15632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sources/Dependencies/AbstractFolderAnalyzer.php
View File

@@ -33,7 +33,19 @@ abstract class AbstractFolderAnalyzer
* @since 3.2.0 N°7175 update regexp to also remove `examples` folder
* @link https://www.regular-expressions.info/alternation.html RegExp alternation reference
*/
public const QUESTIONNABLE_FOLDER_REGEXP = '/^(tests?|examples?|htdocs?|demos?)$/i';
public const QUESTIONNABLE_FOLDER_REGEXP = '/^(tests?|examples?|htdocs?|demos?|.github)$/i';
/**
* @param string $sFolderName
*
* @return false|int as {@see \preg_match()}
* @uses static::QUESTIONNABLE_FOLDER_REGEXP
* @uses \preg_match()
*/
public static function IsQuestionnableFolder(string $sFolderName): false|int
{
return preg_match(static::QUESTIONNABLE_FOLDER_REGEXP, $sFolderName);
}
/**
* @return string Relative path to the root folder of the dependencies (e.g. "lib" for composer, "node_modules" for npm, ...) from iTop app. root
@@ -58,10 +70,12 @@ abstract class AbstractFolderAnalyzer
}
/**
* @param bool $bCheckQuestionableFoldersOnly If true, only questionnable folders {@see \Combodo\iTop\Dependencies\AbstractFolderAnalyzer::IsQuestionnableFolder()} will be listed
*
* @return array List of all subdirs of the dependencies folder that are {@see IsQuestionnableFolder}.
* Warning : each path contains slashes (meaning on Windows you'll get eg `C:/Dev/wamp64/www/itop-27/lib/goaop/framework/tests`)
*/
public function ListAllFoldersAbsPaths(): array
public function ListAllFoldersAbsPaths(bool $bCheckQuestionableFoldersOnly = true): array
{
$aAllTestDirs = array();
$sPath = realpath($this->GetDependenciesRootFolderAbsPath());
@@ -77,8 +91,7 @@ abstract class AbstractFolderAnalyzer
continue;
}
$sDirName = $file->getFilename();
if (!$this->IsQuestionnableFolder($sDirName))
{
if ($bCheckQuestionableFoldersOnly && !static::IsQuestionnableFolder($sDirName)) {
continue;
}
@@ -90,18 +103,6 @@ abstract class AbstractFolderAnalyzer
return $aAllTestDirs;
}
/**
* @param string $sFolderName
*
* @return false|int as {@see \preg_match()}
* @uses static::QUESTIONNABLE_FOLDER_REGEXP
* @uses \preg_match()
*/
public static function IsQuestionnableFolder(string $sFolderName): false|int
{
return preg_match(static::QUESTIONNABLE_FOLDER_REGEXP, $sFolderName);
}
/**
* @return array Array of absolute paths to allowed questionnable folders
*/
@@ -134,7 +135,7 @@ abstract class AbstractFolderAnalyzer
public function ListDeniedButStillPresentFoldersAbsPaths(): array
{
$aDeniedTestDir = $this->ListDeniedFoldersAbsPaths();
$aAllTestDir = $this->ListAllFoldersAbsPaths();
$aAllTestDir = $this->ListAllFoldersAbsPaths(false);
return array_intersect($aDeniedTestDir, $aAllTestDir);
}
}

1
sources/Dependencies/NPM/iTopNPM.php
View File

@@ -69,6 +69,7 @@ class iTopNPM extends AbstractFolderAnalyzer
'@popperjs/core/lib',
// ACE Editor see https://www.npmjs.com/package/ace-builds for dir contents
'ace-builds/.github',
'ace-builds/demo',
'ace-builds/src',
'ace-builds/src-min-noconflict',