Merge pull request #2063 from alissn/RefactorModuleHelper

Refactor `module` helper, improve code clarity, and handle exceptions

Author: dcblogdev

src/helpers.php

@@ -1,9 +1,10 @@
 <?php
 
 use Illuminate\Foundation\Vite;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Vite as ViteFacade;
-use Nwidart\Modules\Laravel\Module;
+use Nwidart\Modules\Exceptions\ModuleNotFoundException;
+use Nwidart\Modules\FileRepository;
+use Nwidart\Modules\Module;
 
 if (! function_exists('module')) {
     /**
@@ -15,14 +16,16 @@
      */
     function module(string $name, bool $instance = false): bool|Module
     {
-        $modules = app('modules');
-        if (! $modules->has($name)) {
-            Log::error("Module '$name' not found.");
+        /** @var FileRepository $repository */
+        $repository = app('modules');
 
+        try {
+            $module = $repository->findOrFail($name);
+
+            return $instance ? $module : $module->isEnabled();
+        } catch (ModuleNotFoundException $exception) {
             return false;
         }
-
-        return $instance ? $modules->find($name) : $modules->isEnabled($name);
     }
 }
 

tests/ModuleHelperTest.php

@@ -4,9 +4,8 @@
 
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Log;
 use Nwidart\Modules\Contracts\RepositoryInterface;
-use Nwidart\Modules\Laravel\Module;
+use Nwidart\Modules\Module;
 
 class ModuleHelperTest extends BaseTestCase
 {
@@ -39,20 +38,6 @@ public function test_module_returns_true_when_found()
         $this->assertTrue(module('Blog'));
     }
 
-    public function test_module_returns_false_and_log_error_when_not_found()
-    {
-        Log::shouldReceive('error')->once()->with("Module 'Blogs' not found.");
-
-        $this->assertFalse(module('Blogs'));
-    }
-
-    public function test_module_returns_false_and_log_error_when_not_found_and_instance_parameter_is_true()
-    {
-        Log::shouldReceive('error')->once()->with("Module 'Blogs' not found.");
-
-        $this->assertFalse(module('Blogs', true));
-    }
-
     public function test_module_returns_instance_when_instance_parameter_is_true()
     {
         $module = module('Blog', true);