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

Reduced function calls :D

Browse source
This commit is contained in:
Netkas 2023-10-01 12:12:44 -04:00
parent 05c6483edc
commit f2b69253ae
No known key found for this signature in database
GPG key ID: 5DAF58535614062B
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ncc/Classes/NccExtension/NccCompiler.php
View file

@ -327,13 +327,12 @@
* @param PackageWriter $package_writer
* @param string $build_configuration
* @return void
* @throws ConfigurationException
*/
public function processMetadata(PackageWriter $package_writer, string $build_configuration=BuildConfigurationValues::DEFAULT): void
{
$metadata = new Metadata($this->project_manager->getProjectConfiguration()->getProject()->getCompiler());
$metadata->setOptions($this->project_manager->getCompilerOptions($build_configuration));
$metadata->setOptions($this->project_manager->getProjectConfiguration()->getBuild()->getOptions($build_configuration));
$metadata->setUpdateSource($this->project_manager->getProjectConfiguration()->getProject()->getUpdateSource());
$metadata->setMainExecutionPolicy($this->project_manager->getProjectConfiguration()->getBuild()->getMain());
$metadata->setInstaller($this->project_manager->getProjectConfiguration()->getInstaller());

13
src/ncc/Managers/ProjectManager.php
View file

@ -293,19 +293,6 @@
);
}
/**
* Returns an array of compiler options associated with the build configuration
*
* @param string $build_configuration
* @return array
* @throws ConfigurationException
*/
public function getCompilerOptions(string $build_configuration=BuildConfigurationValues::DEFAULT): array
{
$configuration = $this->project_configuration->getBuild()->getBuildConfiguration($build_configuration);
return array_merge($configuration->getOptions(), $this->project_configuration->getBuild()->getOptions());
}
/**
* Saves the project configuration
*

14
src/ncc/Objects/ProjectConfiguration/Build.php
View file

@ -24,6 +24,7 @@
namespace ncc\Objects\ProjectConfiguration;
use InvalidArgumentException;
use ncc\Enums\Options\BuildConfigurationValues;
use ncc\Exceptions\ConfigurationException;
use ncc\Interfaces\BytecodeObjectInterface;
@ -196,13 +197,21 @@
}
/**
* Returns the options for the build, optionally including the options for the given build configuration
*
* @param string|null $build_configuration
* @return array
*/
public function getOptions(): array
public function getOptions(?string $build_configuration=null): array
{
if($build_configuration === null)
{
return $this->options;
}
return array_merge($this->options, $this->getBuildConfiguration($build_configuration)->getOptions());
}
/**
* @param array $options
*/
@ -460,7 +469,6 @@
*
* @param string $name
* @return BuildConfiguration
* @throws ConfigurationException
*/
public function getBuildConfiguration(string $name): BuildConfiguration
{
@ -477,7 +485,7 @@
}
}
throw new ConfigurationException(sprintf('The build configuration "%s" does not exist', $name));
throw new InvalidArgumentException(sprintf('The build configuration "%s" does not exist', $name));
}
/**