WIP: Commands for basic scaffolding

Author: chrisjk123

database/factories/PostFactory.php

@@ -16,5 +16,7 @@
         'content' => $faker->paragraph,
         'status' => 'published',
         'published_at' => now(),
+        'allow_comments' => true,
+        'allow_guest_comments' => true,
     ];
 });

database/migrations/2019_12_28_101010_create_posts_table.php

@@ -26,11 +26,11 @@ public function up()
             $table->text('content')->nullable();
 
             $table->boolean('allow_comments')->default(
-                config('blogs.posts.allow_comments')
+                config('blog.posts.allow_comments')
             )->nullable();
 
             $table->boolean('allow_guest_comments')->default(
-                config('blogs.posts.allow_guest_comments')
+                config('blog.posts.allow_guest_comments')
             )->nullable();
 
             $table->string('status')->nullable();

src/BlogServiceProvider.php

@@ -94,7 +94,7 @@ private function routeConfiguration()
     private function handleMigrations()
     {
         if ($this->app->runningInConsole()) {
-            $this->loadMigrationsFrom(__DIR__.'/../database/migrations/');
+            $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         }
     }
 
@@ -106,16 +106,19 @@ private function handleMigrations()
     private function handlePublishing()
     {
         if ($this->app->runningInConsole()) {
+
+            // TODO: Are these really needed?
             $this->publishes([
                 __DIR__.'/../database/factories/' => database_path('factories'),
             ], 'blog-factories');
 
+            // TODO: Are these really needed?
             $this->publishes([
                 __DIR__.'/../database/seeds/' => database_path('seeds'),
             ], 'blog-seeders');
 
             $this->publishes([
-                __DIR__.'/../config/blogs.php' => config_path('blogs.php'),
+                __DIR__.'/../config/blog.php' => config_path('blog.php'),
             ], 'blog-config');
         }
     }
@@ -138,7 +141,6 @@ private function handleCommands()
     {
         $this->commands([
             \Chriscreates\Blog\Console\Commands\InstallCommand::class,
-            \Chriscreates\Blog\Console\Commands\PublishCommand::class,
             \Chriscreates\Blog\Console\Commands\SetupCommand::class,
         ]);
     }

src/Comment.php

@@ -3,14 +3,12 @@
 namespace Chriscreates\Blog;
 
 use Chriscreates\Blog\Builders\CommentBuilder;
-use Chriscreates\Blog\Traits\Comment\CommentApproval;
 use Chriscreates\Blog\Traits\IsAuthorable;
 use Illuminate\Database\Eloquent\Model;
 
 class Comment extends Model
 {
-    use CommentApproval,
-    IsAuthorable;
+    use IsAuthorable;
 
     protected $table = 'comments';
 

src/Console/Commands/InstallCommand.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Console\DetectsApplicationNamespace;
-use Illuminate\Support\Str;
 
 class InstallCommand extends Command
 {
@@ -34,45 +33,10 @@ public function handle()
         $this->callSilent('vendor:publish', ['--tag' => 'blog-factories']);
         $this->callSilent('vendor:publish', ['--tag' => 'blog-seeders']);
         $this->callSilent('vendor:publish', ['--tag' => 'blog-config']);
-        // $this->callSilent('migrate');
-        //
-        // $this->registerCanvasServiceProvider();
+        $this->callSilent('migrate');
 
-        $this->info('Installation complete.');
-    }
+        // TODO: Do we need to publish a provider?
 
-    /**
-     * Register the Canvas service provider in the application configuration file.
-     *
-     * @return void
-     */
-    private function registerCanvasServiceProvider()
-    {
-        $namespace = Str::replaceLast('\\', '', $this->getAppNamespace());
-        $appConfig = file_get_contents(config_path('app.php'));
-
-        if (Str::contains($appConfig, $namespace.'\\Providers\\CanvasServiceProvider::class')) {
-            return;
-        }
-
-        $lineEndingCount = [
-            "\r\n" => substr_count($appConfig, "\r\n"),
-            "\r" => substr_count($appConfig, "\r"),
-            "\n" => substr_count($appConfig, "\n"),
-        ];
-
-        $eol = array_keys($lineEndingCount, max($lineEndingCount))[0];
-
-        file_put_contents(config_path('app.php'), str_replace(
-            "{$namespace}\\Providers\EventServiceProvider::class,".$eol,
-            "{$namespace}\\Providers\EventServiceProvider::class,".$eol."        {$namespace}\Providers\CanvasServiceProvider::class,".$eol,
-            $appConfig
-        ));
-
-        file_put_contents(app_path('Providers/CanvasServiceProvider.php'), str_replace(
-            "namespace App\Providers;",
-            "namespace {$namespace}\Providers;",
-            file_get_contents(app_path('Providers/CanvasServiceProvider.php'))
-        ));
+        $this->info('Installation complete.');
     }
 }