Merge pull request #101 from tunaabutbul/master

some cleanup

Author: nticaric

src/TNTSearchScoutServiceProvider.php

@@ -1,11 +1,10 @@
-<?php
+<?php namespace TeamTNT\Scout;
 
-namespace TeamTNT\Scout;
-
-use Illuminate\Support\ServiceProvider;
+use Engines\TNTSearchEngine;
+use TeamTNT\TNTSearch\TNTSearch;
 use Laravel\Scout\EngineManager;
+use Illuminate\Support\ServiceProvider;
 use TeamTNT\Scout\Console\ImportCommand;
-use TeamTNT\TNTSearch\TNTSearch;
 
 class TNTSearchScoutServiceProvider extends ServiceProvider
 {
@@ -16,18 +15,19 @@ class TNTSearchScoutServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app[EngineManager::class]->extend('tntsearch', function () {
+        $this->app[EngineManager::class]->extend('tntsearch', function ($app) {
             $tnt = new TNTSearch();
+            
             $driver = config('database.default');
-            $config = config('scout.tntsearch') + config("database.connections.$driver");
-
+            $config = config('scout.tntsearch') + config("database.connections.{$driver}");
 
             $tnt->loadConfig($config);
             $tnt->setDatabaseHandle(app('db')->connection()->getPdo());
+            
             $this->setFuzziness($tnt);
             $this->setAsYouType($tnt);
 
-            return new Engines\TNTSearchEngine($tnt);
+            return new TNTSearchEngine($tnt);
         });
 
         if ($this->app->runningInConsole()) {
@@ -39,22 +39,14 @@ public function boot()
 
     protected function setFuzziness($tnt)
     {
-        $fuzziness = config('scout.tntsearch.fuzziness');
-        $prefix_length = config('scout.tntsearch.fuzzy.prefix_length');
-        $max_expansions = config('scout.tntsearch.fuzzy.max_expansions');
-        $distance = config('scout.tntsearch.fuzzy.distance');
-
-
-        $tnt->fuzziness = isset($fuzziness) ? $fuzziness : $tnt->fuzziness;
-        $tnt->fuzzy_prefix_length = isset($prefix_length) ? $prefix_length : $tnt->fuzzy_prefix_length;
-        $tnt->fuzzy_max_expansions = isset($max_expansions) ? $max_expansions : $tnt->fuzzy_max_expansions;
-        $tnt->fuzzy_distance = isset($distance) ? $distance : $tnt->fuzzy_distance;
+        $tnt->fuzziness            = config('scout.tntsearch.fuzziness', $tnt->fuzziness);
+        $tnt->fuzzy_distance       = config('scout.tntsearch.fuzzy.distance', $tnt->fuzzy_distance);
+        $tnt->fuzzy_prefix_length  = config('scout.tntsearch.fuzzy.prefix_length', $tnt->fuzzy_prefix_length);
+        $tnt->fuzzy_max_expansions = config('scout.tntsearch.fuzzy.max_expansions', $tnt->fuzzy_max_expansions);
     }
 
     protected function setAsYouType($tnt)
     {
-        $asYouType = config('scout.tntsearch.asYouType');
-
-        $tnt->asYouType = isset($asYouType) ? $asYouType : $tnt->asYouType;
+        $tnt->asYouType = config('scout.tntsearch.asYouType', $tnt->asYouType);
     }
 }