Merge branch 'main' of https://github.com/aarondfrancis/solo

Author: aarondfrancis

README.md

@@ -189,6 +189,11 @@ Solo::allowCommandsAddedFrom([
 ]);
 ```
 
+## Service provider in a custom location.
+
+By default, your `SoloServiceProvider` is created in the `App\Providers` namespace, which is pre-registered as a "safe" location to add commands from. If your `SoloServiceProvider` is in a custom location, it will still be deemed "safe" as long as it resides in your application's namespace (usually `App`, but custom root namespaces are supported.)  
+
+
 ## Contributing
 Please help.
 

src/Manager.php

@@ -18,6 +18,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\Str;
 use InvalidArgumentException;
 use Laravel\Prompts\Themes\Default\Renderer as PromptsRenderer;
 use ReflectionClass;
@@ -43,11 +44,6 @@ class Manager
         'dark' => DarkTheme::class,
     ];
 
-    /**
-     * @var array<class-string>
-     */
-    protected array $configurationAllowedFrom = [];
-
     /**
      * @var array<class-string>
      */
@@ -56,7 +52,7 @@ class Manager
     public function __construct()
     {
         // The only classes that are guaranteed to be fully in the user's control.
-        $this->configurationAllowedFrom = $this->commandsAllowedFrom = [
+        $this->commandsAllowedFrom = [
             App::getNamespace() . 'Providers\\AppServiceProvider',
             App::getNamespace() . 'Providers\\SoloServiceProvider',
         ];
@@ -231,14 +227,15 @@ protected function registrationIsAllowed(): bool
 
     protected function ensureSafeConfigurationLocation($func): void
     {
-        if (in_array($this->caller(), $this->configurationAllowedFrom)) {
+        $caller = $this->caller();
+        $namespace = App::getNamespace();
+
+        if (Str::startsWith($caller, $namespace)) {
             return;
         }
 
-        $locations = implode(' ', $this->configurationAllowedFrom);
-
         throw new Exception(
-            "`$func` may only be called from one of the following classes: [$locations]"
+            "`$func` may only be called from the [$namespace] namespace."
         );
     }
 }