Merge branch 'master' of github.com:matt-daneshvar/laravel-survey

config/survey.php

@@ -1,12 +1,12 @@
 <?php
 
 return [
-    
-    /**
+
+    /*
      * Database related configurations.
      */
     'database' => [
-        /**
+        /*
          * Name of the tables created by the migrations
          * and used by the models of this package.
          */
@@ -17,5 +17,5 @@
             'entries' => 'entries',
             'answers' => 'answers',
         ],
-    ]
-];
+    ],
+];

src/Models/Answer.php

@@ -8,18 +8,18 @@ class Answer extends Model
 {
     /**
      * Answer constructor.
-     * 
+     *
      * @param array $attributes
      */
     public function __construct(array $attributes = [])
     {
         if (! isset($this->table)) {
             $this->setTable(config('survey.database.tables.answers'));
         }
-        
+
         parent::__construct($attributes);
     }
-    
+
     /**
      * The attributes that are mass assignable.
      *

src/Models/Entry.php

@@ -34,7 +34,7 @@ protected static function boot()
 
     /**
      * Entry constructor.
-     * 
+     *
      * @param array $attributes
      */
     public function __construct(array $attributes = [])

src/Models/Question.php

@@ -39,7 +39,7 @@ protected static function boot()
 
     /**
      * Question constructor.
-     * 
+     *
      * @param array $attributes
      */
     public function __construct(array $attributes = [])

src/Models/Section.php

@@ -19,7 +19,7 @@ public function __construct(array $attributes = [])
 
         parent::__construct($attributes);
     }
-    
+
     /**
      * The attributes that are mass assignable.
      *

src/Models/Survey.php

@@ -8,7 +8,7 @@ class Survey extends Model
 {
     /**
      * Survey constructor.
-     * 
+     *
      * @param array $attributes
      */
     public function __construct(array $attributes = [])
@@ -19,7 +19,7 @@ public function __construct(array $attributes = [])
 
         parent::__construct($attributes);
     }
-    
+
     /**
      * The attributes that are mass assignable.
      *

src/SurveyServiceProvider.php

@@ -17,12 +17,12 @@ class SurveyServiceProvider extends ServiceProvider
     public function boot(ViewFactory $viewFactory)
     {
         $this->publishes([
-            __DIR__ . '/../config/survey.php' => config_path('survey.php'),
+            __DIR__.'/../config/survey.php' => config_path('survey.php'),
         ], 'config');
-
-        $this->mergeConfigFrom(__DIR__ . '/../config/survey.php', 'survey');
 
-        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'survey');
+        $this->mergeConfigFrom(__DIR__.'/../config/survey.php', 'survey');
+
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'survey');
 
         $viewFactory->composer('survey::standard', SurveyComposer::class);
 
@@ -50,8 +50,8 @@ protected function publishMigrations($migrations)
             }
 
             $this->publishes([
-                __DIR__ . "/../database/migrations/$migration.php.stub" => database_path('migrations/' . date('Y_m_d_His',
-                        time()) . "_$migration.php"),
+                __DIR__."/../database/migrations/$migration.php.stub" => database_path('migrations/'.date('Y_m_d_His',
+                        time())."_$migration.php"),
             ], 'migrations');
         }
     }

tests/TestCase.php

@@ -3,8 +3,8 @@
 namespace MattDaneshvar\Survey\Tests;
 
 use Illuminate\Foundation\Auth\User;
-use MattDaneshvar\Survey\SurveyServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
+use MattDaneshvar\Survey\SurveyServiceProvider;
 
 class TestCase extends Orchestra
 {