Switching default value / return from config to allow config to be go…

…tten before default values.
bradcornford · Sep 28, 2017 · 059baf9 · 059baf9
1 parent 4f79a68
commit 059baf9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/spec/Cornford/Setter/SettingSpec.php b/spec/Cornford/Setter/SettingSpec.php
@@ -220,6 +220,7 @@ function it_can_get_a_setting_with_a_default_value()
 		$query->shouldReceive('lists')->andReturn(false);
 
 		$repository = Mockery::mock('Illuminate\Config\Repository');
+        $repository->shouldReceive('has')->andReturn(false);
 
 		$cache = Mockery::mock('Illuminate\Cache\Repository');
 
@@ -239,6 +240,7 @@ function it_can_get_a_setting_with_a_default_value_of_false()
 		$query->shouldReceive('lists')->andReturn(false);
 
 		$repository = Mockery::mock('Illuminate\Config\Repository');
+        $repository->shouldReceive('has')->andReturn(false);
 
 		$cache = Mockery::mock('Illuminate\Cache\Repository');
 
@@ -258,6 +260,7 @@ function it_can_get_a_setting_with_a_default_value_of_an_empty_array()
 		$query->shouldReceive('lists')->andReturn(false);
 
 		$repository = Mockery::mock('Illuminate\Config\Repository');
+        $repository->shouldReceive('has')->andReturn(false);
 
 		$cache = Mockery::mock('Illuminate\Cache\Repository');
 

diff --git a/src/Cornford/Setter/Setting.php b/src/Cornford/Setter/Setting.php
@@ -61,15 +61,15 @@ public function get($key, $default = null)
 		if ($results) {
 			return $this->returnResults($results, $key);
 		}
+
+        if ($this->configHas($key)) {
+            return $this->returnConfig($key);
+        }
 
 		if ($default !== null) {
 			return $default;
 		}
 
-		if ($this->configHas($key)) {
-			return $this->returnConfig($key);
-		}
-
 		return false;
 	}