Merge pull request #8 from ARCANEDEV/update-laravel_5.4_support

arcanedev-maroc · web-flow · commit 027c9bc712b7 · 2017-01-31T12:07:44.000Z
Adding Laravel 5.4 Support
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,12 @@
+* text=auto
+
+/.github          export-ignore
 /_docs            export-ignore
 /tests            export-ignore
-/.editorconfig    export-ignore
-/.gitattributes   export-ignore
-/.gitignore       export-ignore
-/.scrutinizer.yml export-ignore
-/.travis.yml      export-ignore
-/phpunit.xml      export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+.gitignore        export-ignore
+.scrutinizer.yml  export-ignore
+.travis.yml       export-ignore
+phpunit.xml       export-ignore
+CONTRIBUTING.md   export-ignore
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+- GeoIP Version: #.#.#
+- Laravel Version: #.#.#
+- PHP Version: #.#.#
+
+### Description:
+
+### Steps To Reproduce:
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 3
     php_code_sniffer:
         enabled: true
         config:
diff --git a/.travis.yml b/.travis.yml
@@ -13,9 +13,7 @@ matrix:
     - php: nightly
 
 env:
-  - TESTBENCH_VERSION=3.1.*
-  - TESTBENCH_VERSION=3.2.*
-  - TESTBENCH_VERSION=3.3.*
+  - TESTBENCH_VERSION=3.4.*
 
 before_script:
   - travis_retry composer self-update
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,31 @@
+# CONTRIBUTING
+
+Contributions are welcome, and are accepted via pull requests. Please review these guidelines before submitting any pull requests.
+
+## Guidelines
+
+  * Please follow the [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) Coding Standard, PHP-FIG Naming Conventions and the [PSR-4](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md) autoloading standard
+  * Ensure that the current tests pass, and if you've added something new, add the tests where relevant.
+  * Remember that we follow SemVer. If you are changing the behaviour, or the public api, you may need to update the docs.
+  * Send a coherent commit history, making sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
+  * You may also need to rebase to avoid merge conflicts.
+
+## Running Tests
+
+You will need an install of [Composer](https://getcomposer.org) before continuing.
+
+First, install the dependencies:
+
+```bash
+$ composer install
+```
+
+Then run phpunit:
+
+```bash
+$ vendor/bin/phpunit
+```
+
+If the test suite passes on your local machine you should be good to go.
+
+When you make a pull request, the tests will automatically be run again by [Travis CI](https://travis-ci.org/).
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 ARCANEDEV <arcanedev.maroc@gmail.com> - GeoIP
+Copyright (c) 2015-2017 ARCANEDEV <arcanedev.maroc@gmail.com> - GeoIP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -18,8 +18,18 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/GeoIP/release
 
 ## Features
 
-  - Coming soon&hellip;
-
+  * Well tested with maximum code quality.
+  * Easy setup &amp; configuration.
+  * Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
+  * Well documented &amp; IDE Friendly.
+  * Made with :heart: &amp; :coffee:.
+
+## Table of contents
+
+  1. [Installation and Setup](_docs/1-Installation-and-Setup.md)
+  2. [Configuration](_docs/2-Configuration.md)
+  3. [Usage](_docs/3-Usage.md)
+  
 ## Security
 
 If you discover any security related issues, please email arcanedev-maroc@gmail.com instead of using the issue tracker.
diff --git a/_docs/0-Home.md b/_docs/0-Home.md
@@ -0,0 +1,17 @@
+# GeoIP
+
+GeoIP package for Laravel.
+
+### Features
+
+  * Well tested with maximum code quality.
+  * Easy setup &amp; configuration.
+  * Laravel `5.1 | 5.2 | 5.3 | 5.4` are supported.
+  * Well documented &amp; IDE Friendly.
+  * Made with :heart: &amp; :coffee:.
+
+## Table of contents
+
+  1. [Installation and Setup](1-Installation-and-Setup.md)
+  2. [Configuration](2-Configuration.md)
+  3. [Usage](3-Usage.md)
diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md
@@ -0,0 +1,26 @@
+# 1. Installation
+
+## Server Requirements
+
+The GeoIP package has a few system requirements:
+
+    - PHP >= 5.6.4
+    
+## Version Compatibility
+
+| GeoIP                         | Laravel                                                                                |
+|:------------------------------|:---------------------------------------------------------------------------------------|
+| ![GeoIP v2.0.x][geo_ip_2_0_x] | ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] |
+| ![GeoIP v2.1.x][geo_ip_2_1_x] | ![Laravel v5.4][laravel_5_4]                                                           |
+
+[laravel_5_1]:  https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
+[laravel_5_2]:  https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2"
+[laravel_5_3]:  https://img.shields.io/badge/v5.3-supported-brightgreen.svg?style=flat-square "Laravel v5.3"
+[laravel_5_4]:  https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4"
+
+[geo_ip_2_0_x]: https://img.shields.io/badge/version-2.0.*-blue.svg?style=flat-square "GeoIP v2.0.*"
+[geo_ip_2_1_x]: https://img.shields.io/badge/version-2.1.*-blue.svg?style=flat-square "GeoIP v2.1.*"
+
+## Composer
+
+Coming Soon...
diff --git a/_docs/2-Configuration.md b/_docs/2-Configuration.md
@@ -0,0 +1,3 @@
+# 2. Configuration
+
+Coming Soon...
diff --git a/_docs/3-Usage.md b/_docs/3-Usage.md
@@ -0,0 +1,3 @@
+# 4. Usage
+
+Coming Soon...
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     ],
     "require": {
         "php":               ">=5.6.4",
-        "arcanedev/support": "~3.20",
-        "guzzlehttp/guzzle": "~5.0|~6.0"
+        "arcanedev/support": "~4.0",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "phpunit/phpcov":  "~3.0",
@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.1-dev"
         }
     },
     "suggest": {
diff --git a/src/DriverManager.php b/src/DriverManager.php
@@ -1,8 +1,7 @@
 <?php namespace Arcanedev\GeoIP;
 
 use Arcanedev\GeoIP\Contracts\DriverFactory;
-use Arcanedev\Support\Manager;
-use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Support\Manager;
 
 /**
  * Class     DriverManager
@@ -12,20 +11,6 @@
  */
 class DriverManager extends Manager implements DriverFactory
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Constructor
-     | ------------------------------------------------------------------------------------------------
-     */
-    /**
-     * DriverManager constructor.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     */
-    public function __construct(Application $app)
-    {
-        parent::__construct($app);
-    }
-
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters
      | ------------------------------------------------------------------------------------------------
diff --git a/src/GeoIPServiceProvider.php b/src/GeoIPServiceProvider.php
@@ -27,7 +27,7 @@ class GeoIPServiceProvider extends PackageServiceProvider
      *
      * @var bool
      */
-    protected $defer   = true;
+    protected $defer = true;
 
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters
@@ -78,7 +78,6 @@ public function boot()
     public function provides()
     {
         return [
-            'geoip',
             Contracts\GeoIP::class,
             Contracts\DriverFactory::class,
             Contracts\GeoIPDriver::class,
@@ -96,9 +95,15 @@ public function provides()
      */
     private function registerGeoIpManager()
     {
-        $this->singleton(Contracts\DriverFactory::class, DriverManager::class);
+        $this->singleton(Contracts\DriverFactory::class, function ($app) {
+            return new DriverManager($app);
+        });
+
         $this->singleton(Contracts\GeoIPDriver::class, function ($app) {
-            return $app[Contracts\DriverFactory::class]->driver();
+            /** @var  \Arcanedev\GeoIP\Contracts\DriverFactory  $manager */
+            $manager = $app[Contracts\DriverFactory::class];
+
+            return $manager->driver();
         });
     }
 
@@ -112,7 +117,7 @@ private function registerGeoIpCache()
             $config = $app['config'];
 
             return new Cache(
-                $this->app['cache.store'],
+                $app['cache.store'],
                 $config->get('geoip.cache.tags', []),
                 $config->get('geoip.cache.expires', 30)
             );
@@ -134,7 +139,5 @@ private function registerGeoIp()
                 Arr::only($config->get('geoip', []), ['cache', 'location', 'currencies'])
             );
         });
-
-        $this->singleton('arcanedev.geoip', Contracts\GeoIP::class);
     }
 }
diff --git a/tests/DriverManagerTest.php b/tests/DriverManagerTest.php
@@ -42,7 +42,6 @@ public function it_can_be_instantiated()
     {
         $expectations = [
             \Illuminate\Support\Manager::class,
-            \Arcanedev\Support\Manager::class,
             \Arcanedev\GeoIP\Contracts\DriverFactory::class,
             \Arcanedev\GeoIP\DriverManager::class,
         ];
diff --git a/tests/GeoIPServiceProviderTest.php b/tests/GeoIPServiceProviderTest.php
@@ -56,7 +56,6 @@ public function it_can_be_instantiated()
     public function it_can_provides()
     {
         $expected = [
-            'geoip',
             \Arcanedev\GeoIP\Contracts\GeoIP::class,
             \Arcanedev\GeoIP\Contracts\DriverFactory::class,
             \Arcanedev\GeoIP\Contracts\GeoIPDriver::class,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# 2. Configuration`
	`2`	`+`
	`3`	`+Coming Soon...`