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

Improved exception handling in \ncc\Managers > PackageManager > FetchFromSource()

Browse source
This commit is contained in:
Netkas 2022-12-18 02:11:01 -05:00
parent dd8d40989e
commit a1014eb2a5
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@
use ncc\Utilities\Validate; use ncc\Utilities\Validate;
use ncc\ZiProto\ZiProto; use ncc\ZiProto\ZiProto;
use SplFileInfo; use SplFileInfo;
use Throwable;
class PackageManager class PackageManager
{ {
@ -387,6 +388,7 @@
throw new InstallationException('Remote source ' . $input->Source . ' is not defined'); throw new InstallationException('Remote source ' . $input->Source . ' is not defined');
$repositoryQueryResults = Functions::getRepositoryQueryResults($input, $source, $entry); $repositoryQueryResults = Functions::getRepositoryQueryResults($input, $source, $entry);
$exceptions = [];
if($repositoryQueryResults->Files->ZipballUrl !== null) if($repositoryQueryResults->Files->ZipballUrl !== null)
{ {
@ -395,9 +397,9 @@
$archive = Functions::downloadGitServiceFile($repositoryQueryResults->Files->ZipballUrl, $entry); $archive = Functions::downloadGitServiceFile($repositoryQueryResults->Files->ZipballUrl, $entry);
return PackageCompiler::tryCompile(Functions::extractArchive($archive), $repositoryQueryResults->Version); return PackageCompiler::tryCompile(Functions::extractArchive($archive), $repositoryQueryResults->Version);
} }
catch(Exception $e) catch(Throwable $e)
{ {
unset($e); $exceptions[] = $e;
} }
} }
@ -410,7 +412,7 @@
} }
catch(Exception $e) catch(Exception $e)
{ {
unset($e); $exceptions[] = $e;
} }
} }
@ -422,7 +424,7 @@
} }
catch(Exception $e) catch(Exception $e)
{ {
unset($e); $exceptions[] = $e;
} }
} }
@ -443,11 +445,36 @@
} }
catch(Exception $e) catch(Exception $e)
{ {
unset($e); $exceptions[] = $e;
} }
} }
throw new PackageFetchException(sprintf('Failed to fetch package \'%s\'', $input->Package)); // Recursively create an exception with the previous exceptions as the previous exception
$exception = null;
if(count($exceptions) > 0)
{
foreach($exceptions as $e)
{
if($exception == null)
{
$exception = new PackageFetchException($e->getMessage(), $e);
}
else
{
if($e->getMessage() == $exception->getMessage())
continue;
$exception = new PackageFetchException($e->getMessage(), $exception);
}
}
}
else
{
$exception = new PackageFetchException('Cannot fetch package from remote source, no assets found');
}
throw $exception;
} }
throw new PackageFetchException(sprintf('Unknown remote source type %s', $remote_source_type)); throw new PackageFetchException(sprintf('Unknown remote source type %s', $remote_source_type));