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

Added check for importing a package from the system

Browse source
This commit is contained in:
Netkas 2023-10-01 16:28:57 -04:00
parent 4d317d61ab
commit 44a12b66cf
No known key found for this signature in database
GPG key ID: 5DAF58535614062B
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/ncc/Classes/Runtime.php
View file

@ -164,6 +164,11 @@
*/ */
private static function importFromSystem(string $package, string $version=Versions::LATEST): string private static function importFromSystem(string $package, string $version=Versions::LATEST): string
{ {
if(!self::getPackageManager()->getPackageLock()->entryExists($package))
{
throw new ImportException(sprintf('The package "%s" does not exist in the package lock', $package));
}
$entry = self::getPackageManager()->getPackageLock()->getEntry($package); $entry = self::getPackageManager()->getPackageLock()->getEntry($package);
foreach($entry->getClassMap($version) as $class => $component_name) foreach($entry->getClassMap($version) as $class => $component_name)
@ -247,18 +252,7 @@
}; };
} }
// Import dependencies recursively // Import the required files
if(!$package_reader->getFlag(PackageFlags::STATIC_DEPENDENCIES))
{
foreach($package_reader->getDependencies() as $dependency)
{
$dependency = $package_reader->getDependency($dependency);
/** @noinspection UnusedFunctionResultInspection */
self::import($dependency->getName(), $dependency->getVersion());
}
}
if($package_reader->getMetadata()->getOption(BuildConfigurationOptions::REQUIRE_FILES) !== null) if($package_reader->getMetadata()->getOption(BuildConfigurationOptions::REQUIRE_FILES) !== null)
{ {
foreach($package_reader->getMetadata()->getOption(BuildConfigurationOptions::REQUIRE_FILES) as $item) foreach($package_reader->getMetadata()->getOption(BuildConfigurationOptions::REQUIRE_FILES) as $item)
@ -274,6 +268,18 @@
} }
} }
// Import dependencies recursively
if(!$package_reader->getFlag(PackageFlags::STATIC_DEPENDENCIES))
{
foreach($package_reader->getDependencies() as $dependency)
{
$dependency = $package_reader->getDependency($dependency);
/** @noinspection UnusedFunctionResultInspection */
self::import($dependency->getName(), $dependency->getVersion());
}
}
return $package_reader->getAssembly()->getPackage(); return $package_reader->getAssembly()->getPackage();
} }