Style cleanup

polyfractal · Mar 16, 2013 · c4719e5 · c4719e5
1 parent 421d691
commit c4719e5
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/src/Sherlock/Sherlock.php b/src/Sherlock/Sherlock.php
@@ -16,7 +16,7 @@
 use Sherlock\components;
 use Sherlock\common\exceptions;
 use Analog\Analog;
-use Sherlock\wrappers\SortWrapper;
+use Sherlock\wrappers;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
@@ -51,7 +51,8 @@ public function __construct($userSettings = array())
         $this->settings['cluster'] = new Cluster($this->settings['event.dispatcher']);
 
         //Connect Cluster's listener to the dispatcher
-        $this->settings['event.dispatcher']->addListener(Events::REQUEST_PREEXECUTE, array($this->settings['cluster'], 'onRequestExecute'));
+        $eventCallback = array($this->settings['cluster'], 'onRequestExecute');
+        $this->settings['event.dispatcher']->addListener(Events::REQUEST_PREEXECUTE, $eventCallback);
 
         //setup logging
         $this->setupLogging();
@@ -81,7 +82,6 @@ public static function autoload($className)
 
         $className = ltrim($className, '\\');
         $fileName  = $baseDir;
-        $namespace = '';
         if ($lastNsPos = strripos($className, '\\')) {
             $namespace = substr($className, 0, $lastNsPos);
             $className = substr($className, $lastNsPos + 1);
@@ -127,7 +127,7 @@ private static function getDefaultSettings()
      */
     public static function queryBuilder()
     {
-        \Analog\Analog::log("Sherlock::query()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::query()", Analog::DEBUG);
 
         return new \Sherlock\wrappers\QueryWrapper();
     }
@@ -138,9 +138,9 @@ public static function queryBuilder()
      */
     public static function filterBuilder()
     {
-        \Analog\Analog::log("Sherlock::filter()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::filter()", Analog::DEBUG);
 
-        return new \Sherlock\wrappers\FilterWrapper();
+        return new wrappers\FilterWrapper();
     }
 
     /**
@@ -149,9 +149,9 @@ public static function filterBuilder()
      */
     public static function facetBuilder()
     {
-        \Analog\Analog::log("Sherlock::facetBuilder()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::facetBuilder()", Analog::DEBUG);
 
-        return new \Sherlock\wrappers\FacetWrapper();
+        return new wrappers\FacetWrapper();
     }
 
     /**
@@ -160,9 +160,9 @@ public static function facetBuilder()
      */
     public static function indexSettingsBuilder()
     {
-        \Analog\Analog::log("Sherlock::indexSettings()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::indexSettings()", Analog::DEBUG);
 
-        return new \Sherlock\wrappers\IndexSettingsWrapper();
+        return new wrappers\IndexSettingsWrapper();
     }
 
     /**
@@ -172,16 +172,16 @@ public static function indexSettingsBuilder()
      */
     public static function mappingBuilder($type = null)
     {
-        \Analog\Analog::log("Sherlock::mappingProperty()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::mappingProperty()", Analog::DEBUG);
 
-        return new \Sherlock\wrappers\MappingPropertyWrapper($type);
+        return new wrappers\MappingPropertyWrapper($type);
     }
 
     public static function sortBuilder()
     {
-        \Analog\Analog::log("Sherlock::sortBuilder()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock::sortBuilder()", Analog::DEBUG);
 
-        return new SortWrapper();
+        return new wrappers\SortWrapper();
     }
 
     /**
@@ -190,9 +190,9 @@ public static function sortBuilder()
      */
     public function search()
     {
-        \Analog\Analog::log("Sherlock->search()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock->search()", Analog::DEBUG);
 
-        return new \Sherlock\requests\SearchRequest($this->settings['event.dispatcher']);
+        return new requests\SearchRequest($this->settings['event.dispatcher']);
     }
 
     /**
@@ -201,9 +201,9 @@ public function search()
      */
     public function document()
     {
-        \Analog\Analog::log("Sherlock->indexDocument()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock->indexDocument()", Analog::DEBUG);
 
-        return new \Sherlock\requests\IndexDocumentRequest($this->settings['event.dispatcher']);
+        return new requests\IndexDocumentRequest($this->settings['event.dispatcher']);
     }
 
     /**
@@ -219,9 +219,9 @@ public function index($index = null)
             $index[] = $arg;
         }
 
-        \Analog\Analog::log("Sherlock->index()", \Analog\Analog::DEBUG);
+        Analog::log("Sherlock->index()", Analog::DEBUG);
 
-        return new \Sherlock\requests\IndexRequest($this->settings['event.dispatcher'], $index);
+        return new requests\IndexRequest($this->settings['event.dispatcher'], $index);
     }
 
     /**
@@ -269,6 +269,7 @@ public function getSherlockSettings()
      * @throws common\exceptions\BadMethodCallException
      * @return array
      */
+    /*
     private function directoryScan($dir)
     {
         if (!isset($dir))
@@ -299,6 +300,7 @@ private function directoryScan($dir)
         return $files;
 
     }
+    */
 
     /**
      * Setup Analog logger