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

Validate and enforce repository type enum usage

Browse source
This commit is contained in:
netkas 2024-09-18 00:54:12 -04:00
parent ffc6588ff9
commit 836d0f33eb
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ncc/CLI/Management/RepositoryMenu.php
View file

@ -25,6 +25,7 @@
use Exception; use Exception;
use ncc\Enums\ConsoleColors; use ncc\Enums\ConsoleColors;
use ncc\Enums\Scopes; use ncc\Enums\Scopes;
use ncc\Enums\Types\RepositoryType;
use ncc\Managers\RepositoryManager; use ncc\Managers\RepositoryManager;
use ncc\Objects\CliHelpSection; use ncc\Objects\CliHelpSection;
use ncc\Objects\RepositoryConfiguration; use ncc\Objects\RepositoryConfiguration;
@ -164,6 +165,13 @@
return 1; return 1;
} }
$parsed_type = RepositoryType::tryFrom($type);
if($parsed_type === null)
{
Console::outError(sprintf('Unknown repository type \'%s\'.', $type), true, 1);
return 1;
}
if($host === null) if($host === null)
{ {
Console::outError(sprintf('Missing required argument \'%s\'.', 'host'), true, 1); Console::outError(sprintf('Missing required argument \'%s\'.', 'host'), true, 1);
@ -172,7 +180,7 @@
try try
{ {
(new RepositoryManager())->addRepository(new RepositoryConfiguration($name, $host, $type, $ssl)); (new RepositoryManager())->addRepository(new RepositoryConfiguration($name, $host, $parsed_type, $ssl));
} }
catch(Exception $e) catch(Exception $e)
{ {

14
src/ncc/Objects/RepositoryConfiguration.php
View file

@ -67,10 +67,10 @@
* *
* @param string $name The unique name of the remote source. (e.g. 'github') * @param string $name The unique name of the remote source. (e.g. 'github')
* @param string $host The host of the service ncc should use with this source (gitlab.com, github.com, git.example.com:8080 etc...). * @param string $host The host of the service ncc should use with this source (gitlab.com, github.com, git.example.com:8080 etc...).
* @param string $type The type of service ncc should use with this source (gitlab, github, etc...). * @param RepositoryType $type The type of service ncc should use with this source (gitlab, github, etc...).
* @param bool $ssl If SSL should be used when connecting to the service * @param bool $ssl If SSL should be used when connecting to the service
*/ */
public function __construct(string $name, string $host, string $type, bool $ssl=true) public function __construct(string $name, string $host, RepositoryType $type, bool $ssl=true)
{ {
$this->setName($name); $this->setName($name);
$this->setHost($host); $this->setHost($host);
@ -112,17 +112,11 @@
/** /**
* Sets the type of service ncc should use with this source (gitlab, github, etc...). * Sets the type of service ncc should use with this source (gitlab, github, etc...).
* *
* @param string $type * @param RepositoryType $type
* @see RepositoryType * @see RepositoryType
*/ */
public function setType(string $type): void public function setType(RepositoryType $type): void
{ {
// TODO: Fix this, not a proper use of cases()
if(!in_array(strtolower($type), RepositoryType::cases(), true))
{
throw new InvalidArgumentException(sprintf('Invalid repository type \'%s\'', $type));
}
$this->type = $type; $this->type = $type;
} }