.gitignore

@@ -31,4 +31,3 @@ tests/example_project/ncc
 tests/example_project/build
 /.phpunit.result.cache
 /.idea/php-test-framework.xml
-/.idea/gbrowser_project.xml

CHANGELOG.md

@@ -5,21 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.1.6] - 2024-10-29
-
-This update introduces critical bug fixes
-
-### Fixed
- - Validate package instance before checking execution policy
-
-
-
-## [2.1.5] - 2024-10-14
-
-This update introduces a critical bug fix
-
-
-
 ## [2.1.4] - 2024-10-13
 
 This update introduces minor bug fixes & improvements

Makefile

@@ -18,23 +18,23 @@ DEBIAN_PACKAGE_BUILD_PATH := $(BUILD_PATH)/ncc_$(BUILD_VERSION)_all.deb
 
 # List of paths for autoloading
 AUTOLOAD_PATHS := $(addprefix $(SRC_PATH)/ncc/ThirdParty/, \
-	composer/Semver \
+    composer/Semver \
-	defuse/php-encryption \
+    defuse/php-encryption \
-	jelix/version \
+    jelix/version \
-	nikic/PhpParser \
+    nikic/PhpParser \
-	Symfony/polyfill_ctype \
+    Symfony/polyfill_ctype \
-	Symfony/polyfill_mbstring \
+    Symfony/polyfill_mbstring \
-	Symfony/polyfill_uuid \
+    Symfony/polyfill_uuid \
-	Symfony/Process \
+    Symfony/Process \
-	Symfony/Uid \
+    Symfony/Uid \
-	Symfony/Filesystem \
+    Symfony/Filesystem \
-	Symfony/Yaml \
+    Symfony/Yaml \
-	theseer/DirectoryScanner \
+    theseer/DirectoryScanner \
 )
 
 # Check for necessary binaries
 ifndef PHPCC
-	$(error "PHP binary not found. Please install PHP or check your PATH")
+    $(error "PHP binary not found. Please install PHP or check your PATH")
 endif
 
 # Check if phpab is installed
@@ -153,13 +153,13 @@ clean:
 .PHONY: help
 help:
 	@echo "Available commands:"
-	@echo "  make autoload		  - Generate autoload files"
+	@echo "  make autoload          - Generate autoload files"
-	@echo "  make redist			- Prepare the project for redistribution"
+	@echo "  make redist            - Prepare the project for redistribution"
-	@echo "  make install		   - Installs ncc on the system (requires root privileges & php)"
+	@echo "  make install           - Installs ncc on the system (requires root privileges & php)"
-	@echo "  make tar			   - Package the project into a tarball (Generic installer, requires php)"
+	@echo "  make tar               - Package the project into a tarball (Generic installer, requires php)"
-	@echo "  make deb			   - Package the project into a Debian package"
+	@echo "  make deb               - Package the project into a Debian package"
-	@echo "  make docker-debian	 - Build a Debian Docker image"
+	@echo "  make docker-debian     - Build a Debian Docker image"
 	@echo "  make docker-debian-run - Run the Debian Docker image"
-	@echo "  make docker-alpine	 - Build an Alpine Docker image"
+	@echo "  make docker-alpine     - Build an Alpine Docker image"
 	@echo "  make docker-alpine-run - Run the Alpine Docker image"
-	@echo "  make clean			 - Clean the build artifacts"
+	@echo "  make clean             - Clean the build artifacts"

src/ncc/Classes/PhpExtension/Templates/github_ci_build.yml.tpl

@@ -40,7 +40,7 @@
 
       - name: Build project
         run: |
-          ncc build --config %TPL_BUILD_NAME% --build-source --log-level debug
+          ncc build --config %TPL_BUILD_NAME% --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4

src/ncc/Classes/Runtime.php

@@ -94,14 +94,14 @@
                 throw new InvalidArgumentException(sprintf('Package %s is not imported', $package));
             }
 
+            if(self::$imported_packages[$package]?->getMetadata()?->getMainExecutionPolicy() === null)
+            {
+                Console::out('The package does not have a main execution policy, skipping execution');
+                return 0;
+            }
+
             if(self::$imported_packages[$package] instanceof PackageReader)
             {
-                if(self::$imported_packages[$package]?->getMetadata()?->getMainExecutionPolicy() === null)
-                {
-                    Console::out('The package does not have a main execution policy, skipping execution');
-                    return 0;
-                }
-
                 return ExecutionUnitRunner::executeFromPackage(
                     self::$imported_packages[$package],
                     self::$imported_packages[$package]->getMetadata()->getMainExecutionPolicy()

src/ncc/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.4

src/ncc/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.6",
+  "version": "2.1.4",
   "branch": "stable",
   "flags": [],
   "components": [