Merge pull request #145 from abderrazzak-oxa/support-laravel-8

Author: bweston92

composer.json

@@ -10,8 +10,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": ">=4.2 <8.0",
-        "illuminate/cache": ">=4.2 <8.0"
+        "illuminate/support": ">=4.2 <9.0",
+        "illuminate/cache": ">=4.2 <9.0"
     },
     "suggest": {
         "illuminate/filesystem": "Save settings to a JSON file.",

src/SettingsManager.php

@@ -23,15 +23,15 @@ public function createJsonDriver()
 	{
 		$path = $this->getConfig('anlutro/l4-settings::path');
 
-		$store = new JsonSettingStore($this->app['files'], $path);
+		$store = new JsonSettingStore($this->getSupportedContainer()['files'], $path);
 
 		return $this->wrapDriver($store);
 	}
 
 	public function createDatabaseDriver()
 	{
 		$connectionName = $this->getConfig('anlutro/l4-settings::connection');
-		$connection = $this->app['db']->connection($connectionName);
+		$connection = $this->getSupportedContainer()['db']->connection($connectionName);
 		$table = $this->getConfig('anlutro/l4-settings::table');
 		$keyColumn = $this->getConfig('anlutro/l4-settings::keyColumn');
 		$valueColumn = $this->getConfig('anlutro/l4-settings::valueColumn');
@@ -57,7 +57,7 @@ protected function getConfig($key)
 			$key = str_replace('anlutro/l4-settings::', 'settings.', $key);
 		}
 
-		return $this->app['config']->get($key);
+		return $this->getSupportedContainer()['config']->get($key);
 	}
 
 	protected function wrapDriver($store)
@@ -66,12 +66,17 @@ protected function wrapDriver($store)
 
 		if ($this->getConfig('anlutro/l4-settings::enableCache')) {
 			$store->setCache(
-				$this->app['cache'],
+				$this->getSupportedContainer()['cache'],
 				$this->getConfig('anlutro/l4-settings::cacheTtl'),
 				$this->getConfig('anlutro/l4-settings::forgetCacheByWrite')
 			);
 		}
 
 		return $store;
 	}
+
+	protected function getSupportedContainer()
+    {
+	    return isset($this->app) ? $this->app : $this->container;
+    }
 }