diff --git a/src/ncc/Classes/Runtime.php b/src/ncc/Classes/Runtime.php index d72016e..9eeef8d 100644 --- a/src/ncc/Classes/Runtime.php +++ b/src/ncc/Classes/Runtime.php @@ -160,6 +160,8 @@ self::import($dependency->getName(), $dependency->getVersion()); } + // TODO: Import required files if any (see options) + return $package; } @@ -217,6 +219,8 @@ } } + // TODO: Import required files if any (see options) + return $package_reader->getAssembly()->getPackage(); } diff --git a/src/ncc/Managers/PackageManager.php b/src/ncc/Managers/PackageManager.php index 8a97c77..5073020 100644 --- a/src/ncc/Managers/PackageManager.php +++ b/src/ncc/Managers/PackageManager.php @@ -380,6 +380,8 @@ { foreach($this->checkRequiredDependencies($package_reader) as $dependency) { + // TODO: Check if the dependency is satisfied on the system before trying to install it + Console::outVerbose(sprintf( 'Package %s=%s requires %s=%s, installing dependency', $package_reader->getAssembly()->getPackage(), $package_reader->getAssembly()->getVersion(), @@ -390,13 +392,6 @@ $installed_packages = array_merge($installed_packages, $this->install($dependency->getSource(), $authentication)); } } - else - { - Console::outVerbose(sprintf( - 'Skipping installation of dependencies for package %s=%s', - $package_reader->getAssembly()->getPackage(), $package_reader->getAssembly()->getVersion() - )); - } return $installed_packages; } diff --git a/src/ncc/Managers/ProjectManager.php b/src/ncc/Managers/ProjectManager.php index 795deaa..cd06e4e 100644 --- a/src/ncc/Managers/ProjectManager.php +++ b/src/ncc/Managers/ProjectManager.php @@ -557,6 +557,7 @@ if($composer_json->getAutoload()?->getFiles() !== null) { $required_files = []; + foreach($composer_json->getAutoload()?->getFiles() as $path) { $required_files = array_merge($required_files, self::copyContents($project_path, $project_src, $path)); diff --git a/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php b/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php index 6ec6cd5..c963d8e 100644 --- a/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php +++ b/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php @@ -419,6 +419,7 @@ return $item !== $dependency; }); } + // TODO: Merge output_path & output_name into one single property similiar to -o|--output /** * @inheritDoc diff --git a/tests/projects/lib/src/TestLib/test.php b/tests/projects/lib/src/TestLib/test.php new file mode 100644 index 0000000..1dc36db --- /dev/null +++ b/tests/projects/lib/src/TestLib/test.php @@ -0,0 +1,5 @@ +