#4 Change namespace from Torann to InteractionDesignFoundation

alies-dev · alies-dev · commit 08e200c6c5d7 · 2021-12-10T15:20:27.000+03:00
diff --git a/README.md b/README.md
@@ -1,34 +1,32 @@
 # GeoIP for Laravel
 
-[![Build Status](https://travis-ci.org/Torann/laravel-geoip.svg?branch=master)](https://travis-ci.org/Torann/laravel-geoip)
-[![Latest Stable Version](https://poser.pugx.org/torann/geoip/v/stable.png)](https://packagist.org/packages/torann/geoip)
-[![Total Downloads](https://poser.pugx.org/torann/geoip/downloads.png)](https://packagist.org/packages/torann/geoip)
-[![Patreon donate button](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://www.patreon.com/torann)
-[![Donate weekly to this project using Gratipay](https://img.shields.io/badge/gratipay-donate-yellow.svg)](https://gratipay.com/~torann)
-[![Donate to this project using Flattr](https://img.shields.io/badge/flattr-donate-yellow.svg)](https://flattr.com/profile/torann)
-[![Donate to this project using Paypal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4CJA2A97NPYVU)
+[![Latest Stable Version](https://poser.pugx.org/interaction-design-foundation/laravel-geoip/v/stable.png)](https://packagist.org/packages/interaction-design-foundation/laravel-geoip)
+[![Total Downloads](https://poser.pugx.org/interaction-design-foundation/laravel-geoip/downloads.png)](https://packagist.org/packages/interaction-design-foundation/laravel-geoip)
 
 Determine the geographical location and currency of website visitors based on their IP addresses.
 
-- [GeoIP for Laravel on Packagist](https://packagist.org/packages/torann/geoip)
-- [GeoIP for Laravel on GitHub](https://github.com/Torann/laravel-geoip)
-- [Upgrade Guides](http://lyften.com/projects/laravel-geoip/doc/upgrade.html)
 
-## Official Documentation
+## Installation
+
+You can install the package in to a Laravel app that uses [Nova](https://nova.laravel.com) via composer:
+
+```bash
+composer require interaction-design-foundation/laravel-geoip
+```
 
-Documentation for the package can be found on [Lyften.com](http://lyften.com/projects/laravel-geoip/).
 
-## Older versions of Laravel
+## Official Documentation
+
+ @todo
 
-- Laravel 5 [version 1.1](https://github.com/Torann/laravel-geoip/tree/1.1)
-- Laravel 4 [version 0.1.1](https://github.com/Torann/laravel-geoip/tree/0.1.1)
 
 ## Contributions
 
 Many people have contributed to project since its inception.
 
 Thanks to:
 
+- [Daniel Stainback](https://github.com/InteractionDesignFoundation)
 - [Dwight Watson](https://github.com/dwightwatson)
 - [nikkiii](https://github.com/nikkiii)
 - [jeffhennis](https://github.com/jeffhennis)
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "torann/geoip",
+  "name": "interaction-design-foundation/laravel-geoip",
   "description": "Support for multiple GeoIP services.",
   "keywords": [
     "laravel",
@@ -11,12 +11,6 @@
     "infoDB"
   ],
   "license": "BSD-2-Clause",
-  "authors": [
-    {
-      "name": "Daniel Stainback",
-      "email": "torann@gmail.com"
-    }
-  ],
   "require": {
     "php": "^8.0|^8.1",
     "illuminate/support": "^8.0",
@@ -40,15 +34,15 @@
       "src/helpers.php"
     ],
     "psr-4": {
-      "Torann\\GeoIP\\": "src/"
+      "InteractionDesignFoundation\\GeoIP\\": "src/"
     }
   },
   "autoload-dev": {
     "files": [
       "tests/TestFunctions.php"
     ],
     "psr-4": {
-      "Torann\\GeoIP\\Tests\\": "tests/"
+      "InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
     }
   },
   "scripts": {
@@ -62,10 +56,10 @@
     },
     "laravel": {
       "providers": [
-        "Torann\\GeoIP\\GeoIPServiceProvider"
+        "InteractionDesignFoundation\\GeoIP\\GeoIPServiceProvider"
       ],
       "aliases": {
-        "GeoIP": "Torann\\GeoIP\\Facades\\GeoIP"
+        "GeoIP": "InteractionDesignFoundation\\GeoIP\\Facades\\GeoIP"
       }
     }
   }
diff --git a/config/geoip.php b/config/geoip.php
@@ -52,43 +52,43 @@
     'services' => [
 
         'maxmind_database' => [
-            'class' => \Torann\GeoIP\Services\MaxMindDatabase::class,
+            'class' => \InteractionDesignFoundation\GeoIP\Services\MaxMindDatabase::class,
             'database_path' => storage_path('app/geoip.mmdb'),
             'update_url' => sprintf('https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=%s&suffix=tar.gz', env('MAXMIND_LICENSE_KEY')),
             'locales' => ['en'],
         ],
 
         'maxmind_api' => [
-            'class' => \Torann\GeoIP\Services\MaxMindWebService::class,
+            'class' => \InteractionDesignFoundation\GeoIP\Services\MaxMindWebService::class,
             'user_id' => env('MAXMIND_USER_ID'),
             'license_key' => env('MAXMIND_LICENSE_KEY'),
             'locales' => ['en'],
         ],
 
         'ipapi' => [
-            'class' => \Torann\GeoIP\Services\IPApi::class,
+            'class' => \InteractionDesignFoundation\GeoIP\Services\IPApi::class,
             'secure' => true,
             'key' => env('IPAPI_KEY'),
             'continent_path' => storage_path('app/continents.json'),
             'lang' => 'en',
         ],
 
         'ipgeolocation' => [
-            'class' => \Torann\GeoIP\Services\IPGeoLocation::class,
+            'class' => \InteractionDesignFoundation\GeoIP\Services\IPGeoLocation::class,
             'secure' => true,
             'key' => env('IPGEOLOCATION_KEY'),
             'continent_path' => storage_path('app/continents.json'),
             'lang' => 'en',
         ],
 
         'ipdata' => [
-            'class'  => \Torann\GeoIP\Services\IPData::class,
+            'class'  => \InteractionDesignFoundation\GeoIP\Services\IPData::class,
             'key'    => env('IPDATA_API_KEY'),
             'secure' => true,
         ],
 
         'ipfinder' => [
-            'class'  => \Torann\GeoIP\Services\IPFinder::class,
+            'class'  => \InteractionDesignFoundation\GeoIP\Services\IPFinder::class,
             'key'    => env('IPFINDER_API_KEY'),
             'secure' => true,
             'locales' => ['en'],
@@ -124,7 +124,7 @@
     |
     */
 
-    'cache_tags' => ['torann-geoip-location'],
+    'cache_tags' => ['laravel-geoip-location'],
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/Cache.php b/src/Cache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP;
+namespace InteractionDesignFoundation\GeoIP;
 
 use Illuminate\Cache\CacheManager;
 
diff --git a/src/Console/Clear.php b/src/Console/Clear.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Console;
+namespace InteractionDesignFoundation\GeoIP\Console;
 
 use Illuminate\Console\Command;
 
diff --git a/src/Console/Update.php b/src/Console/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Console;
+namespace InteractionDesignFoundation\GeoIP\Console;
 
 use Illuminate\Console\Command;
 
diff --git a/src/Contracts/ServiceInterface.php b/src/Contracts/ServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Contracts;
+namespace InteractionDesignFoundation\GeoIP\Contracts;
 
 interface ServiceInterface
 {
@@ -17,7 +17,7 @@ public function boot();
      *
      * @param string $ip
      *
-     * @return \Torann\GeoIP\Location
+     * @return \InteractionDesignFoundation\GeoIP\Location
      */
     public function locate($ip);
 
@@ -26,7 +26,7 @@ public function locate($ip);
      *
      * @param array $attributes
      *
-     * @return \Torann\GeoIP\Location
+     * @return \InteractionDesignFoundation\GeoIP\Location
      */
     public function hydrate(array $attributes = []);
 
diff --git a/src/Facades/GeoIP.php b/src/Facades/GeoIP.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Facades;
+namespace InteractionDesignFoundation\GeoIP\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
diff --git a/src/GeoIP.php b/src/GeoIP.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP;
+namespace InteractionDesignFoundation\GeoIP;
 
 use Exception;
 use Monolog\Logger;
@@ -106,7 +106,7 @@ public function __construct(array $config, CacheManager $cache)
      *
      * @param string $ip
      *
-     * @return \Torann\GeoIP\Location
+     * @return \InteractionDesignFoundation\GeoIP\Location
      * @throws \Exception
      */
     public function getLocation($ip = null)
@@ -127,7 +127,7 @@ public function getLocation($ip = null)
      *
      * @param string $ip
      *
-     * @return \Torann\GeoIP\Location
+     * @return \InteractionDesignFoundation\GeoIP\Location
      * @throws \Exception
      */
     private function find($ip = null)
@@ -188,7 +188,7 @@ public function getCurrency($iso)
     /**
      * Get service instance.
      *
-     * @return \Torann\GeoIP\Contracts\ServiceInterface
+     * @return \InteractionDesignFoundation\GeoIP\Contracts\ServiceInterface
      * @throws Exception
      */
     public function getService()
@@ -215,7 +215,7 @@ public function getService()
     /**
      * Get cache instance.
      *
-     * @return \Torann\GeoIP\Cache
+     * @return \InteractionDesignFoundation\GeoIP\Cache
      */
     public function getCache()
     {
diff --git a/src/GeoIPServiceProvider.php b/src/GeoIPServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP;
+namespace InteractionDesignFoundation\GeoIP;
 
 use Illuminate\Support\Str;
 use Illuminate\Support\ServiceProvider;
diff --git a/src/Location.php b/src/Location.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP;
+namespace InteractionDesignFoundation\GeoIP;
 
 use ArrayAccess;
 use Illuminate\Support\Str;
@@ -24,7 +24,7 @@
  * @property bool $default
  * @property bool $cached
  *
- * @package Torann\GeoIP
+ * @package InteractionDesignFoundation\GeoIP
  */
 class Location implements ArrayAccess
 {
diff --git a/src/Services/AbstractService.php b/src/Services/AbstractService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
-use Torann\GeoIP\Location;
+use InteractionDesignFoundation\GeoIP\Location;
 use Illuminate\Support\Arr;
-use Torann\GeoIP\Contracts\ServiceInterface;
+use InteractionDesignFoundation\GeoIP\Contracts\ServiceInterface;
 
 abstract class AbstractService implements ServiceInterface
 {
diff --git a/src/Services/IPApi.php b/src/Services/IPApi.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use Exception;
 use Illuminate\Support\Arr;
-use Torann\GeoIP\Support\HttpClient;
+use InteractionDesignFoundation\GeoIP\Support\HttpClient;
 
 class IPApi extends AbstractService
 {
diff --git a/src/Services/IPData.php b/src/Services/IPData.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use Exception;
 use Illuminate\Support\Arr;
-use Torann\GeoIP\Support\HttpClient;
+use InteractionDesignFoundation\GeoIP\Support\HttpClient;
 
 /**
  * Class GeoIP
- * @package Torann\GeoIP\Services
+ * @package InteractionDesignFoundation\GeoIP\Services
  */
 class IPData extends AbstractService
 {
diff --git a/src/Services/IPFinder.php b/src/Services/IPFinder.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use Exception;
 use Illuminate\Support\Arr;
-use Torann\GeoIP\Support\HttpClient;
+use InteractionDesignFoundation\GeoIP\Support\HttpClient;
 
 /**
  * Class GeoIP
- * @package Torann\GeoIP\Services
+ * @package InteractionDesignFoundation\GeoIP\Services
  */
 class IPFinder extends AbstractService
 {
@@ -29,7 +29,7 @@ public function boot()
         $this->client = new HttpClient([
             'base_uri' => 'https://api.ipfinder.io/v1/',
             'headers' => [
-                'User-Agent' => 'Laravel-GeoIP-Torann',
+                'User-Agent' => 'Laravel-GeoIP-InteractionDesignFoundation',
             ],
             'query'    => [
                 'token' => $this->config('key'),
diff --git a/src/Services/IPGeoLocation.php b/src/Services/IPGeoLocation.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use Exception;
 use Illuminate\Support\Arr;
-use Torann\GeoIP\Support\HttpClient;
+use InteractionDesignFoundation\GeoIP\Support\HttpClient;
 
 class IPGeoLocation extends AbstractService
 {
diff --git a/src/Services/MaxMindDatabase.php b/src/Services/MaxMindDatabase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use PharData;
 use Exception;
diff --git a/src/Services/MaxMindWebService.php b/src/Services/MaxMindWebService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Services;
+namespace InteractionDesignFoundation\GeoIP\Services;
 
 use GeoIp2\WebService\Client;
 
diff --git a/src/Support/HttpClient.php b/src/Support/HttpClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Torann\GeoIP\Support;
+namespace InteractionDesignFoundation\GeoIP\Support;
 
 use Illuminate\Support\Arr;
 
diff --git a/src/helpers.php b/src/helpers.php
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
diff --git a/tests/GeoIPTest.php b/tests/GeoIPTest.php
diff --git a/tests/Services/MaxMindDatabaseTest.php b/tests/Services/MaxMindDatabaseTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
diff --git a/tests/TestFunctions.php b/tests/TestFunctions.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Torann\GeoIP\Contracts;`
	`3`	`+namespace InteractionDesignFoundation\GeoIP\Contracts;`
`4`	`4`
`5`	`5`	`interface ServiceInterface`
`6`	`6`	`{`
`@@ -17,7 +17,7 @@ public function boot();`
`17`	`17`	`*`
`18`	`18`	`* @param string $ip`
`19`	`19`	`*`
`20`		`- * @return \Torann\GeoIP\Location`
	`20`	`+ * @return \InteractionDesignFoundation\GeoIP\Location`
`21`	`21`	`*/`
`22`	`22`	`public function locate($ip);`
`23`	`23`
`@@ -26,7 +26,7 @@ public function locate($ip);`
`26`	`26`	`*`
`27`	`27`	`* @param array $attributes`
`28`	`28`	`*`
`29`		`- * @return \Torann\GeoIP\Location`
	`29`	`+ * @return \InteractionDesignFoundation\GeoIP\Location`
`30`	`30`	`*/`
`31`	`31`	`public function hydrate(array $attributes = []);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Torann\GeoIP;`
	`3`	`+namespace InteractionDesignFoundation\GeoIP;`
`4`	`4`
`5`	`5`	`use Exception;`
`6`	`6`	`use Monolog\Logger;`
`@@ -106,7 +106,7 @@ public function __construct(array $config, CacheManager $cache)`
`106`	`106`	`*`
`107`	`107`	`* @param string $ip`
`108`	`108`	`*`
`109`		`- * @return \Torann\GeoIP\Location`
	`109`	`+ * @return \InteractionDesignFoundation\GeoIP\Location`
`110`	`110`	`* @throws \Exception`
`111`	`111`	`*/`
`112`	`112`	`public function getLocation($ip = null)`
`@@ -127,7 +127,7 @@ public function getLocation($ip = null)`
`127`	`127`	`*`
`128`	`128`	`* @param string $ip`
`129`	`129`	`*`
`130`		`- * @return \Torann\GeoIP\Location`
	`130`	`+ * @return \InteractionDesignFoundation\GeoIP\Location`
`131`	`131`	`* @throws \Exception`
`132`	`132`	`*/`
`133`	`133`	`private function find($ip = null)`
`@@ -188,7 +188,7 @@ public function getCurrency($iso)`
`188`	`188`	`/**`
`189`	`189`	`* Get service instance.`
`190`	`190`	`*`
`191`		`- * @return \Torann\GeoIP\Contracts\ServiceInterface`
	`191`	`+ * @return \InteractionDesignFoundation\GeoIP\Contracts\ServiceInterface`
`192`	`192`	`* @throws Exception`
`193`	`193`	`*/`
`194`	`194`	`public function getService()`
`@@ -215,7 +215,7 @@ public function getService()`
`215`	`215`	`/**`
`216`	`216`	`* Get cache instance.`
`217`	`217`	`*`
`218`		`- * @return \Torann\GeoIP\Cache`
	`218`	`+ * @return \InteractionDesignFoundation\GeoIP\Cache`
`219`	`219`	`*/`
`220`	`220`	`public function getCache()`
`221`	`221`	`{`