diff --git a/src/installer/extension b/src/installer/extension index bbdcffa..64b76f4 100644 --- a/src/installer/extension +++ b/src/installer/extension @@ -4,11 +4,11 @@ use ncc\Exceptions\ConstantReadonlyException; use ncc\Exceptions\ImportException; use ncc\Exceptions\InvalidConstantNameException; -use ncc\Exceptions\InvalidPackageNameException; -use ncc\Exceptions\InvalidScopeException; -use ncc\Exceptions\PackageLockException; -use ncc\Exceptions\PackageNotFoundException; -use ncc\ncc; + use ncc\Exceptions\InvalidPackageNameException; + use ncc\Exceptions\InvalidScopeException; + use ncc\Exceptions\PackageLockException; + use ncc\Exceptions\PackageNotFoundException; + use ncc\ncc; use ncc\Runtime; if(!defined('NCC_INIT')) diff --git a/src/ncc/Classes/ComposerExtension/ComposerSourceBuiltin.php b/src/ncc/Classes/ComposerExtension/ComposerSourceBuiltin.php index a210837..55da655 100644 --- a/src/ncc/Classes/ComposerExtension/ComposerSourceBuiltin.php +++ b/src/ncc/Classes/ComposerExtension/ComposerSourceBuiltin.php @@ -333,7 +333,7 @@ } // Create a build configuration - $build_configuration = new ProjectConfiguration\BuildConfiguration(); + $build_configuration = new ProjectConfiguration\Build\BuildConfiguration(); $build_configuration->Name = 'default'; $build_configuration->OutputPath = 'build'; diff --git a/src/ncc/Managers/ProjectManager.php b/src/ncc/Managers/ProjectManager.php index 286910b..a9187b5 100644 --- a/src/ncc/Managers/ProjectManager.php +++ b/src/ncc/Managers/ProjectManager.php @@ -140,12 +140,12 @@ $this->ProjectConfiguration->Build->DefineConstants['ASSEMBLY_UID'] = '%ASSEMBLY.UID%'; // Generate configurations - $DebugConfiguration = new ProjectConfiguration\BuildConfiguration(); + $DebugConfiguration = new ProjectConfiguration\Build\BuildConfiguration(); $DebugConfiguration->Name = 'debug'; $DebugConfiguration->OutputPath = 'build/debug'; $DebugConfiguration->DefineConstants["DEBUG"] = '1'; // Debugging constant if the program wishes to check for this $this->ProjectConfiguration->Build->Configurations[] = $DebugConfiguration; - $ReleaseConfiguration = new ProjectConfiguration\BuildConfiguration(); + $ReleaseConfiguration = new ProjectConfiguration\Build\BuildConfiguration(); $ReleaseConfiguration->Name = 'release'; $ReleaseConfiguration->OutputPath = 'build/release'; $ReleaseConfiguration->DefineConstants["DEBUG"] = '0'; // Debugging constant if the program wishes to check for this diff --git a/src/ncc/Objects/ProjectConfiguration.php b/src/ncc/Objects/ProjectConfiguration.php index a0e4c83..216091f 100644 --- a/src/ncc/Objects/ProjectConfiguration.php +++ b/src/ncc/Objects/ProjectConfiguration.php @@ -21,7 +21,7 @@ use ncc\Exceptions\UnsupportedExtensionVersionException; use ncc\Objects\ProjectConfiguration\Assembly; use ncc\Objects\ProjectConfiguration\Build; - use ncc\Objects\ProjectConfiguration\BuildConfiguration; + use ncc\Objects\ProjectConfiguration\Build\BuildConfiguration; use ncc\Objects\ProjectConfiguration\ExecutionPolicy; use ncc\Objects\ProjectConfiguration\Installer; use ncc\Objects\ProjectConfiguration\Project; diff --git a/src/ncc/Objects/ProjectConfiguration/Build.php b/src/ncc/Objects/ProjectConfiguration/Build.php index aea3594..797ab55 100644 --- a/src/ncc/Objects/ProjectConfiguration/Build.php +++ b/src/ncc/Objects/ProjectConfiguration/Build.php @@ -9,6 +9,7 @@ use ncc\Exceptions\InvalidBuildConfigurationException; use ncc\Exceptions\InvalidConstantNameException; use ncc\Exceptions\InvalidProjectBuildConfiguration; + use ncc\Objects\ProjectConfiguration\Build\BuildConfiguration; use ncc\Utilities\Functions; use ncc\Utilities\Validate; diff --git a/src/ncc/Objects/ProjectConfiguration/BuildConfiguration.php b/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php similarity index 98% rename from src/ncc/Objects/ProjectConfiguration/BuildConfiguration.php rename to src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php index 3d228db..8653268 100644 --- a/src/ncc/Objects/ProjectConfiguration/BuildConfiguration.php +++ b/src/ncc/Objects/ProjectConfiguration/Build/BuildConfiguration.php @@ -2,10 +2,11 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace ncc\Objects\ProjectConfiguration; + namespace ncc\Objects\ProjectConfiguration\Build; use ncc\Exceptions\InvalidBuildConfigurationException; use ncc\Exceptions\InvalidDependencyConfiguration; + use ncc\Objects\ProjectConfiguration\Dependency; use ncc\Utilities\Functions; use ncc\Utilities\Validate;