Merge remote-tracking branch 'origin/master' into 49-add-migration-generator-tests

pirs1337 · pirs1337 · commit 82131a23a76f · 2024-12-09T13:44:36.000+06:00
diff --git a/src/EntityGeneratorServiceProvider.php b/src/EntityGeneratorServiceProvider.php
@@ -9,10 +9,10 @@ class EntityGeneratorServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        $this->mergeConfigFrom(getcwd() . '/config/entity-generator.php', 'entity-generator');
+        $this->mergeConfigFrom(__DIR__ . '/../config/entity-generator.php', 'entity-generator');
 
         $this->commands([
-            MakeEntityCommand::class
+            MakeEntityCommand::class,
         ]);
 
         $this->publishes([

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ class EntityGeneratorServiceProvider extends ServiceProvider`
`9`	`9`	`{`
`10`	`10`	`public function boot()`
`11`	`11`	`{`
`12`		`- $this->mergeConfigFrom(getcwd() . '/config/entity-generator.php', 'entity-generator');`
	`12`	`+ $this->mergeConfigFrom(__DIR__ . '/../config/entity-generator.php', 'entity-generator');`
`13`	`13`
`14`	`14`	`$this->commands([`
`15`		`- MakeEntityCommand::class`
	`15`	`+ MakeEntityCommand::class,`
`16`	`16`	`]);`
`17`	`17`
`18`	`18`	`$this->publishes([`