From e1d3a09966810b75a0bc0f35847d4ccee52341c8 Mon Sep 17 00:00:00 2001 From: Victor Westerlund Date: Fri, 31 Oct 2025 10:08:32 +0100 Subject: [PATCH] refactor: include Vegvisir source files from Reflect as a function (#3) I know we just merged #2 and released verison 1.1.0 where the Vegvisir/Reflect crosstalk was supposed to be a class. But after using this briefly, I feel like it gets too verbose. This function will be called _a lot_ and therefore I think it should be pretty quick to type - just like the Vegvisir `VV` class. Instead of typing ```php use vlw\Scaffold\Scaffold; Scaffold::include("some/file.php"); ``` we can instead type ```php use function vlw\Scaffold\load; load("some/file.php"); ``` Reviewed-on: https://codeberg.org/vlw/scaffold/pulls/3 --- src/Scaffold.php | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/src/Scaffold.php b/src/Scaffold.php index 313bb7d..9258e39 100644 --- a/src/Scaffold.php +++ b/src/Scaffold.php @@ -5,25 +5,17 @@ use VV; use Reflect\Path; - class Scaffold { - /** - * Include a source file - * - * @param string $pathname Relative path from project root to a source file - */ - public static function include(string $pathname): void { - if (!class_exists("VV")) { - self::load_vegvisir_kernel(); - } - - require_once VV::root($pathname); - } - - /** - * Load the Vegvisir VV class from Reflect - */ - private static function load_vegvisir_kernel(): void { + /** + * Include a source file from either Vegvisir or Reflect + * + * @param string $pathname Relative path from project root to a source file + */ + function load(string $pathname): void { + // Load the Vegvisir VV clas from Reflect + if (!class_exists("VV")) { require_once Path::root("vegvisir/src/kernel/Init.php"); require_once Path::root("vegvisir/src/request/VV.php"); } - } \ No newline at end of file + + require_once VV::root($pathname); + }