Merge branch 'master' of https://github.com/rootinc/laravel-s3-file-model

Dan Jewett · Dan Jewett · commit 0ce5cd12e256 · 2020-12-10T11:20:00.000-05:00
* 'master' of https://github.com/rootinc/laravel-s3-file-model: Remove "public-read" from local/public/S3 Update FileModelServiceProvider.php
diff --git a/src/FileModelServiceProvider.php b/src/FileModelServiceProvider.php
@@ -13,6 +13,8 @@ class FileModelServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $now_slug = date('Y_m_d_His');
+
         if ($this->app->runningInConsole())
         {
             $this->publishes([
@@ -36,8 +38,8 @@ public function boot()
             ], 'file-factory');
 
             $this->publishes([
-                __DIR__ . '/../templates/2020_03_12_152841_create_files_table.php' => database_path('migrations/2020_03_12_152841_create_files_table.php'),
+                __DIR__ . '/../templates/2020_03_12_152841_create_files_table.php' => database_path("migrations/{$now_slug}_create_files_table.php"),
             ], 'file-table');
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ class FileModelServiceProvider extends ServiceProvider`
`13`	`13`	`*/`
`14`	`14`	`public function boot()`
`15`	`15`	`{`
	`16`	`+ $now_slug = date('Y_m_d_His');`
	`17`	`+`
`16`	`18`	`if ($this->app->runningInConsole())`
`17`	`19`	`{`
`18`	`20`	`$this->publishes([`
`@@ -36,8 +38,8 @@ public function boot()`
`36`	`38`	`], 'file-factory');`
`37`	`39`
`38`	`40`	`$this->publishes([`
`39`		`- __DIR__ . '/../templates/2020_03_12_152841_create_files_table.php' => database_path('migrations/2020_03_12_152841_create_files_table.php'),`
	`41`	`+ __DIR__ . '/../templates/2020_03_12_152841_create_files_table.php' => database_path("migrations/{$now_slug}_create_files_table.php"),`
`40`	`42`	`], 'file-table');`
`41`	`43`	`}`
`42`	`44`	`}`
`43`		`-}`
	`45`	`+}`