Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

Refactor ProjectType handling

Browse source
This commit is contained in:
netkas 2024-09-17 22:08:23 -04:00
parent 1bcfe90bea
commit d0e484631f
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ncc/Managers/PackageManager.php
View file

@ -798,10 +798,9 @@
throw new OperationException(sprintf('Failed to detect project type from source %s: %s', $archive, $e->getMessage()), $e);
}
// TODO: getProjectType() could return the enum case
switch($project_detection->getProjectType())
{
case ProjectType::NCC->value:
case ProjectType::NCC:
try
{
$package_path = (new ProjectManager($project_detection->getProjectFilePath()))->build(
@ -824,7 +823,7 @@
throw new OperationException(sprintf('Failed to build from source %s: %s', $archive, $e->getMessage()), $e);
}
case ProjectType::COMPOSER->value:
case ProjectType::COMPOSER:
try
{
$project_manager = ProjectManager::initializeFromComposer(dirname($project_detection->getProjectFilePath()), $options);

20
src/ncc/Objects/ProjectDetectionResults.php
View file

@ -32,27 +32,21 @@
/**
* @var string
*/
private $project_file_path;
private string $project_file_path;
/**
* @see ProjectType
* @var string
* @var ProjectType
*/
private $project_type;
private ProjectType $project_type;
/**
* ProjectDetectionResults Constructor
*
* @param string $project_file_path
* @param string $project_type
* @param ProjectType $project_type
*/
public function __construct(string $project_file_path, string $project_type)
public function __construct(string $project_file_path, ProjectType $project_type)
{
if(!in_array($project_type, ProjectType::ALL))
{
throw new InvalidArgumentException(sprintf('Invalid project type "%s"', $project_type));
}
$this->project_file_path = $project_file_path;
$this->project_type = $project_type;
}
@ -70,9 +64,9 @@
/**
* Returns the detected project type
*
* @return string
* @return ProjectType
*/
public function getProjectType(): string
public function getProjectType(): ProjectType
{
return $this->project_type;
}

4
src/ncc/Utilities/Resolver.php
View file

@ -173,12 +173,12 @@
{
if(str_ends_with($file, 'project.json'))
{
return new ProjectDetectionResults($file, ProjectType::NCC->value);
return new ProjectDetectionResults($file, ProjectType::NCC);
}
if(str_ends_with($file, 'composer.json'))
{
return new ProjectDetectionResults($file, ProjectType::COMPOSER->value);
return new ProjectDetectionResults($file, ProjectType::COMPOSER);
}
}