First idea of how version 5 will look (#127)

* Starting to support geocoder v4

* Using provider factories to create providers

* Factory fixes

* Adding profiling provider

* Do not profile if not debug

* Remove services.xml

* Added chain factory

* Bugfixes

* Bugfixes

* Bugfixes

* Fixed tests

* Travis config update

* Adding support for cache

* Added change log

Author: Nyholm

.travis.yml

@@ -1,28 +1,28 @@
 language: php
 
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
-    - 5.4
-    - 5.5
-    - 5.6
+    - 7.0
+    - 7.1
 
 env:
-    - SYMFONY_VERSION=2.3.*
-    - SYMFONY_VERSION=2.5.*
-    - SYMFONY_VERSION=2.7.*
-    - SYMFONY_VERSION=2.8.*
+    - SYMFONY_VERSION=3.3.*
     - SYMFONY_VERSION=dev-master
 
 matrix:
     allow_failures:
         - env: SYMFONY_VERSION=dev-master
-        - php: hhvm
-          dist: trusty
-          env: SYMFONY_VERSION=2.7.*
 
 before_script:
     - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
     # This command must be run with `--prefer-source`, otherwise the `Doctrine\Tests\OrmTestCase` class
     # won't be found.
     - composer update --prefer-source
 
-script: phpunit --coverage-text
+script:
+  - phpunit --coverage-text --coverage-clover=build/coverage.xml

BazingaGeocoderBundle.php

@@ -12,8 +12,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\AddProvidersPass;
-use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\AddDumperPass;
-use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\LoggablePass;
+use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\ProfilerPass;
 
 /**
  * @author William Durand <[email protected]>
@@ -27,8 +26,7 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
+        $container->addCompilerPass(new ProfilerPass());
         $container->addCompilerPass(new AddProvidersPass());
-        $container->addCompilerPass(new AddDumperPass());
-        $container->addCompilerPass(new LoggablePass());
     }
 }

Changelog.md

@@ -0,0 +1,26 @@
+# Changelog
+
+The changelog describes what have been "Added", "Changed", "Removed" or "Fixed" between versions. 
+
+## Version 5.0.0
+
+Version 5 does only support Symfony 3.3+ and PHP7. We dropped some complexity and added plenty of type hints.  
+
+### Added
+
+- Support for Geocoder 4.0
+- Provider factories
+
+### Changed
+
+- We moved cache support to `geocoder-php/cache-provider`
+
+### Removed
+
+- `DumperManager`
+- `LoggableGeocoder`
+- Configuration for default provider
+
+## Version 4.1.0
+
+No changelog before this version

DataCollector/GeocoderDataCollector.php

@@ -22,7 +22,7 @@ class GeocoderDataCollector extends DataCollector
     /**
      * @var GeocoderLogger
      */
-    protected $logger;
+    private $logger;
 
     /**
      * @param GeocoderLogger $logger
@@ -38,7 +38,7 @@ public function __construct(GeocoderLogger $logger)
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         $this->data = array(
-            'requests' => null !== $this->logger ? $this->logger->getRequests() : array(),
+            'requests' => $this->logger->getRequests(),
         );
     }
 

DataCollector/ProfilingProvider.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Bazinga\Bundle\GeocoderBundle\DataCollector;
+
+use Bazinga\Bundle\GeocoderBundle\Logger\GeocoderLogger;
+use Geocoder\Collection;
+use Geocoder\Provider\Provider;
+use Geocoder\Query\GeocodeQuery;
+use Geocoder\Query\ReverseQuery;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+class ProfilingProvider implements Provider
+{
+    /**
+     * @var Provider
+     */
+    private $realProvider;
+
+    /**
+     * @var GeocoderLogger
+     */
+    private $logger;
+
+    /**
+     * @param Provider       $realProvider
+     * @param GeocoderLogger $logger
+     */
+    public function __construct(Provider $realProvider, GeocoderLogger $logger)
+    {
+        $this->realProvider = $realProvider;
+        $this->logger = $logger;
+    }
+
+    public function geocodeQuery(GeocodeQuery $query): Collection
+    {
+        $startTime = microtime(true);
+        try {
+            $results = $this->realProvider->geocodeQuery($query);
+        } finally {
+            $duration = (microtime(true) - $startTime) * 1000;
+
+            $this->logger->logRequest(
+                sprintf('[Geocoding] %s', $query),
+                $duration,
+                $this->getName(),
+                $results
+            );
+        }
+
+        return $results;
+    }
+
+    public function reverseQuery(ReverseQuery $query): Collection
+    {
+        $startTime = microtime(true);
+        try {
+            $results = $this->realProvider->reverseQuery($query);
+        } finally {
+            $duration = (microtime(true) - $startTime) * 1000;
+
+            $this->logger->logRequest(
+                sprintf('[Geocoding] %s', $query),
+                $duration,
+                $this->getName(),
+                $results
+            );
+        }
+
+        return $results;
+    }
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->realProvider, $method], $args);
+    }
+
+    public function getName(): string
+    {
+        return $this->realProvider->getName();
+    }
+}