Merge pull request #3 from vc-dhavaljoshi/main

Php version upgrade

README.md

@@ -17,13 +17,13 @@ Laravel 5.4 >
 You can install the package via composer:
 
 ```bash
-composer require viitorcloud/laravel-ip-gateway
+composer require vcian/laravel-ip-gateway
 ```
 
 After installation, You need to publish the config file for this package. This will add the file `config/ip-gateway.php`, where you can configure this package.
 
 ```bash
-php artisan vendor:publish --provider="LaravelIpGateway\IpGatewayProvider"
+php artisan vendor:publish
 ```
 
 ### Config Usage

composer.json

@@ -16,24 +16,23 @@
   "license": "MIT",
   "authors": [
     {
-      "name": "Rushikesh Soni",
-      "email": "[email protected]",
+      "name": "Vcian - Viitorcloud",
+      "email": "[email protected]",
       "role": "Creator"
     }
   ],
   "require": {
-    "laravel/framework": ">5.4",
-    "php": ">=5.4.0"
+    "php": "^8.0"
   },
   "autoload": {
     "psr-4": {
-      "LaravelIpGateway\\": "src/"
+      "Vcian\\LaravelIpGateway\\": "src/"
     }
   },
   "extra": {
     "laravel": {
       "providers": [
-        "LaravelIpGateway\\IpGatewayProvider"
+        "Vcian\\LaravelIpGateway\\IpGatewayProvider"
       ]
     }
   },

publishable/config/ip-gateway.php

@@ -19,14 +19,14 @@
     'enable_blacklist' => true,
 
     /*
-     * Enable IP detection for middleware
+     * Enable IP detection for Middleware
      *
-     * You can use middleware name ('auth')
+     * You can use Middleware name like 'auth','web','api'
      *
      * @var array
      */
-    'middleware' => [
-
+    'Middleware' => [
+        'web' // Default Middleware
     ],
 
     /*

src/IpGatewayProvider.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelIpGateway;
+namespace Vcian\LaravelIpGateway;
 
 use Illuminate\Support\ServiceProvider;
-use LaravelIpGateway\Middleware\IpGatewayMiddleware;
+use Vcian\LaravelIpGateway\Middleware\IpGatewayMiddleware;
 
 /**
  * Class IpGatewayProvider
@@ -22,7 +22,7 @@ public function boot()
         $router = $this->app['router'];
 
         if (config('ip-gateway')) {
-            foreach (config('ip-gateway.middleware') as $middlewareName) {
+            foreach (config('ip-gateway.Middleware') as $middlewareName) {
                 $router->pushMiddlewareToGroup($middlewareName, IpGatewayMiddleware::class);
             }
         }
@@ -52,4 +52,4 @@ public function publishFiles()
         }
 
     }
-}
+}

src/middleware/IpGatewayMiddleware.php → src/Middleware/IpGatewayMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelIpGateway\Middleware;
+namespace Vcian\LaravelIpGateway\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Log;
@@ -28,7 +28,6 @@ class IpGatewayMiddleware
     public function handle($request, Closure $next)
     {
         $prohibitRequest = false;
-
         if (config('ip-gateway')
             && config('ip-gateway.enable_package') === true
         ) {