Allow Laravel version >= 6

CristalTeam · Sep 15, 2020 · 22749bc · 22749bc
1 parent 02ba9fe
commit 22749bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "4.*|5.*",
+        "illuminate/support": ">=4",
         "mailin-api/mailin-api-php": "dev-master"
     },
     "autoload": {

diff --git a/src/Vansteen/Sendinblue/SendinblueServiceProvider.php b/src/Vansteen/Sendinblue/SendinblueServiceProvider.php
@@ -27,7 +27,7 @@ public function boot()
 		{
 			$this->package('vansteen/sendinblue');
 		}
-		elseif ($version[0] == 5)
+		elseif ($version[0] >= 5)
 		{
 			$this->publishes([
 				__DIR__.'/../../config/config.php' => config_path('sendinblue.php'),
@@ -43,21 +43,7 @@ public function boot()
 	public function register()
 	{
 		$this->app->singleton('sendinblue_wrapper', function() {
-
-			$app = app();
-			$version = $app::VERSION;
-
-			if ($version[0] == 4)
-			{
-				$ml = new Mailin('https://api.sendinblue.com/v2.0', Config::get('sendinblue::apikey'));
-				return new SendinblueWrapper($ml);
-			}
-			elseif ($version[0] == 5)
-			{
-				$ml = new Mailin('https://api.sendinblue.com/v2.0', Config::get('sendinblue.apikey'));
-				return new SendinblueWrapper($ml);
-			}
-
+			return new SendinblueWrapper(new Mailin('https://api.sendinblue.com/v2.0', Config::get('sendinblue::apikey')));
 		});
 	}
 

diff --git a/src/Vansteen/Sendinblue/SendinblueWrapper.php b/src/Vansteen/Sendinblue/SendinblueWrapper.php
@@ -48,4 +48,4 @@ public function __call($method, array $args)
         // Otherwise, treat it as a property
         return $this->ml->{$method};
     }
-}
+}
diff --git a/src/config/config.php b/src/config/config.php
@@ -12,6 +12,6 @@
     |
     */
 
-    'apikey' => 'your-api-key',
+    'apikey' => env('SENDINBLUE_API_KEY'),
 
 );