handle multiple results

Author: toin0u

Geocoder/LoggableGeocoder.php

@@ -39,17 +39,17 @@ public function geocode($value)
         }
 
         $startTime = microtime(true);
-        $result    = parent::geocode($value);
+        $results   = parent::geocode($value);
         $duration  = (microtime(true) - $startTime) * 1000;
 
         $this->logger->logRequest(
             sprintf("[Geocoding] %s", $value),
             $duration,
             $this->getProviderClass(),
-            json_encode($result->toArray())
+            $results
         );
 
-        return $result;
+        return $results;
     }
 
     /**
@@ -62,19 +62,14 @@ public function reverse($latitude, $longitude)
         }
 
         $startTime = microtime(true);
-        $result    = parent::reverse($latitude, $longitude);
+        $results   = parent::reverse($latitude, $longitude);
         $duration  = (microtime(true) - $startTime) * 1000;
 
         $value = sprintf("[Reverse geocoding] latitude: %s, longitude: %s", $latitude, $longitude);
 
-        $this->logger->logRequest(
-            $value,
-            $duration,
-            $this->getProviderClass(),
-            json_encode($result->toArray())
-        );
+        $this->logger->logRequest($value, $duration, $this->getProviderClass(), $results);
 
-        return $result;
+        return $results;
     }
 
     protected function getProviderClass()

Logger/GeocoderLogger.php

@@ -17,12 +17,17 @@
  */
 class GeocoderLogger
 {
+    /**
+     * @var LoggerInterface
+     */
     protected $logger;
 
+    /**
+     * @var array
+     */
     protected $requests = array();
 
     /**
-     *
      * @param LoggerInterface $logger
      */
     public function __construct(LoggerInterface $logger = null)
@@ -31,28 +36,31 @@ public function __construct(LoggerInterface $logger = null)
     }
 
     /**
-     *
-     * @param string $value         value to geocode
-     * @param float  $duration
-     * @param string $providerClass Geocoder provider class
-     * @param mixed  $result
+     * @param string                      $value         value to geocode
+     * @param float                       $duration      geocoding duration
+     * @param string                      $providerClass Geocoder provider class name
+     * @param \SplObjectStorage|Geocoded  $results
      */
-    public function logRequest($value, $duration, $providerClass, $result)
+    public function logRequest($value, $duration, $providerClass, $results)
     {
         if (null !== $this->logger) {
-            $this->requests[] = array(
-                'value'         => $value,
-                'duration'      => $duration,
-                'providerClass' => $providerClass,
-                'result'        => $result
-            );
+            $this->logger->info(sprintf("%s %0.2f ms (%s)", $value, $duration, $providerClass));
+        }
 
-            $this->logger->info(sprintf("%s %0.2f ms (%s)",
-                $value,
-                $duration,
-                $providerClass
-            ));
+        if ($results instanceof \SplObjectStorage) {
+            foreach ($results as $result) {
+                $data[] = $result->toArray();
+            }
+        } else {
+            $data = $results->toArray();
         }
+
+        $this->requests[] = array(
+            'value'         => $value,
+            'duration'      => $duration,
+            'providerClass' => $providerClass,
+            'result'        => json_encode($data),
+        );
     }
 
     /**