refactor for laravel 5

Author: toin0u

.travis.yml

@@ -1,13 +1,14 @@
 language: php
 
 php:
-    - 5.3
     - 5.4
     - 5.5
+    - 5.6
+    - hhvm
 
 before_script:
-    - curl -sS http://getcomposer.org/installer | php
-    - php composer.phar install --dev --prefer-dist --no-interaction
+    - travis_retry composer self-update
+    - travis_retry composer install --no-interaction --prefer-source --dev
 
 script: phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Antoine Corcy <[email protected]>
+Copyright (c) 2013-2015 Antoine Corcy <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -13,19 +13,26 @@
     }],
 
     "require" : {
-        "php"                 : ">=5.3.0",
-        "illuminate/support"  : "~4.0",
+        "php"                 : ">=5.4",
+        "illuminate/support"  : "5.0.*",
         "willdurand/geocoder" : "~2.4"
     },
 
     "require-dev" : {
-        "orchestra/testbench"    : "~2.0",
-        "satooshi/php-coveralls" : "~0.6"
+        "orchestra/testbench"    : "~3.0",
+        "satooshi/php-coveralls" : "~0.6",
+        "phpunit/phpunit"        : "~4.5"
     },
 
     "autoload" : {
-        "psr-0" : {
-            "Toin0u\\Geocoder" : "src/"
+        "psr-4" : {
+            "Toin0u\\Geocoder\\" : "src/"
+        }
+    },
+
+    "autoload-dev" : {
+        "psr-4": {
+            "Toin0u\\Tests\\Geocoder\\" : "tests/"
         }
     },
 

src/config/config.php renamed to config/geocoder.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
-    'providers' => array(
-        'Geocoder\Provider\GoogleMapsProvider' => array('fr-FR', 'Île-de-France', true),
+    'providers' => [
+        'Geocoder\Provider\GoogleMapsProvider' => ['fr-FR', 'Île-de-France', true],
         'Geocoder\Provider\FreeGeoIpProvider'  => null,
-    ),
-    'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
-);
+    ],
+    'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter',
+];

phpunit.xml.dist

@@ -8,16 +8,16 @@
     processIsolation="false"
     stopOnFailure="false"
     syntaxCheck="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     >
     <testsuites>
-        <testsuite name="Geocoder library for Laravel4 Test Suite">
+        <testsuite name="Geocoder library for Laravel Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory>./src/Toin0u/</directory>
+            <directory>./src/</directory>
         </whitelist>
     </filter>
 </phpunit>

src/Toin0u/Geocoder/GeocoderFacade.php renamed to src/Facade/Geocoder.php

@@ -9,16 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Toin0u\Geocoder;
-
-use Illuminate\Support\Facades\Facade;
+namespace Toin0u\Geocoder\Facade;
 
 /**
  * Facade for Geocoder
  *
  * @author Antoine Corcy <[email protected]>
  */
-class GeocoderFacade extends Facade
+class Geocoder extends \Illuminate\Support\Facades\Facade
 {
     /**
     * Get the registered name of the component.

src/Toin0u/Geocoder/GeocoderServiceProvider.php renamed to src/GeocoderServiceProvider.php

@@ -13,30 +13,26 @@
 
 use Geocoder\Geocoder;
 use Geocoder\Provider\ChainProvider;
-use Illuminate\Support\ServiceProvider;
 
 /**
  * Geocoder service provider
  *
  * @author Antoine Corcy <[email protected]>
  */
-class GeocoderServiceProvider extends ServiceProvider
+class GeocoderServiceProvider extends \Illuminate\Support\ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
     /**
      * Bootstrap the application events.
      *
      * @return void
      */
     public function boot()
     {
-        $this->package('toin0u/geocoder-laravel');
+        $source = realpath(__DIR__ . '/../config/geocoder.php');
+
+        $this->publishes([$source => config_path('geocoder.php')]);
+
+        $this->mergeConfigFrom($source, 'geocoder');
     }
 
     /**
@@ -47,15 +43,15 @@ public function boot()
     public function register()
     {
         $this->app->singleton('geocoder.adapter', function($app) {
-            $adapter = $app['config']->get('geocoder-laravel::adapter');
+            $adapter = $app['config']->get('geocoder.adapter');
 
             return new $adapter;
         });
 
         $this->app->singleton('geocoder.chain', function($app) {
-            $providers = array();
+            $providers = [];
 
-            foreach($app['config']->get('geocoder-laravel::providers') as $provider => $arguments) {
+            foreach($app['config']->get('geocoder.providers') as $provider => $arguments) {
                 if (0 !== count($arguments)) {
                     $providers[] = call_user_func_array(
                         function ($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null) use ($app, $provider) {
@@ -88,6 +84,6 @@ function ($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null) use ($app, $pr
      */
     public function provides()
     {
-        return array('geocoder', 'geocoder.adapter', 'geocoder.chain');
+        return ['geocoder', 'geocoder.adapter', 'geocoder.chain'];
     }
 }

tests/Geocoder/Tests/GeocoderFacadeTest.php renamed to tests/Facade/GeocoderTest.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Geocoder\Tests;
+namespace Toin0u\Tests\Geocoder\Facade;
 
 /**
  * @author Antoine Corcy <[email protected]>
  */
-class GeocoderFacadeTest extends TestCase
+class GeocoderTest extends \Toin0u\Tests\Geocoder\TestCase
 {
     public function testGeocoderFacade()
     {

tests/Geocoder/Tests/GeocoderServiceProviderTest.php renamed to tests/GeocoderServiceProviderTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Geocoder\Tests;
+namespace Toin0u\Tests\Geocoder;
 
 /**
  * @author Antoine Corcy <[email protected]>
@@ -18,11 +18,11 @@ class GeocoderServiceProviderTest extends TestCase
 {
     public function testConfig()
     {
-        $this->assertTrue(is_array($providers = $this->app['config']->get('geocoder-laravel::providers')));
+        $this->assertTrue(is_array($providers = $this->app['config']->get('geocoder.providers')));
         $this->assertCount(2, $providers);
         $this->assertArrayHasKey('Geocoder\\Provider\\GoogleMapsProvider', $providers);
         $this->assertArrayHasKey('Geocoder\\Provider\\FreeGeoIpProvider', $providers);
-        $this->assertSame('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));
+        $this->assertSame('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['config']->get('geocoder.adapter'));
     }
 
     public function testLoadedProviders()

tests/Geocoder/Tests/TestCase.php renamed to tests/TestCase.php

@@ -9,24 +9,30 @@
  * file that was distributed with this source code.
  */
 
-namespace Geocoder\Tests;
+namespace Toin0u\Tests\Geocoder;
 
 /**
  * @author Antoine Corcy <[email protected]>
  */
 class TestCase extends \Orchestra\Testbench\TestCase
 {
-    protected function getPackageProviders()
+    /**
+     * {@inheritDoc}
+     */
+    protected function getPackageProviders($app)
     {
-        return array(
+        return [
             'Toin0u\Geocoder\GeocoderServiceProvider',
-        );
+        ];
     }
 
-    protected function getPackageAliases()
+    /**
+     * {@inheritDoc}
+     */
+    protected function getPackageAliases($app)
     {
-        return array(
-            'Geocoder' => 'Toin0u\Geocoder\GeocoderFacade',
-        );
+        return [
+            'Geocoder' => 'Toin0u\Geocoder\Facade\Geocoder',
+        ];
     }
 }