Merge pull request laravel#2069 from Chumper/4.0

taylorotwell · taylorotwell · commit d7f773423d36 · 2013-08-10T10:33:46.000-07:00
Config Repository fails on a true value due to weak comparison
diff --git a/src/Illuminate/Config/Repository.php b/src/Illuminate/Config/Repository.php
@@ -64,7 +64,7 @@ public function has($key)
 	{
 		$default = microtime(true);
 
-		return $this->get($key, $default) != $default;
+		return $this->get($key, $default) !== $default;
 	}
 
 	/**
@@ -324,7 +324,7 @@ public function getLoader()
 	{
 		return $this->loader;
 	}
-	
+
 	/**
 	 * Set the loader implementation.
 	 *
diff --git a/tests/Config/ConfigRepositoryTest.php b/tests/Config/ConfigRepositoryTest.php
@@ -18,6 +18,17 @@ public function testHasGroupIndicatesIfConfigGroupExists()
 	}
 
 
+	public function testHasOnTrueReturnsTrue()
+	{
+		$config = $this->getRepository();
+		$options = $this->getDummyOptions();
+		$config->getLoader()->shouldReceive('load')->once()->with('production', 'app', null)->andReturn($options);
+
+		$this->assertTrue($config->has('app.bing'));
+		$this->assertEquals(true,$config->get('app.bing'));
+	}
+
+
 	public function testGetReturnsBasicItems()
 	{
 		$config = $this->getRepository();
@@ -128,7 +139,7 @@ protected function getRepository()
 
 	protected function getDummyOptions()
 	{
-		return array('foo' => 'bar', 'baz' => array('boom' => 'breeze'));
+		return array('foo' => 'bar', 'baz' => array('boom' => 'breeze'), 'bing' => true);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function has($key)`
`64`	`64`	`{`
`65`	`65`	`$default = microtime(true);`
`66`	`66`
`67`		`- return $this->get($key, $default) != $default;`
	`67`	`+ return $this->get($key, $default) !== $default;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
`@@ -324,7 +324,7 @@ public function getLoader()`
`324`	`324`	`{`
`325`	`325`	`return $this->loader;`
`326`	`326`	`}`
`327`		`-`
	`327`	`+`
`328`	`328`	`/**`
`329`	`329`	`* Set the loader implementation.`
`330`	`330`	`*`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,17 @@ public function testHasGroupIndicatesIfConfigGroupExists()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
	`21`	`+ public function testHasOnTrueReturnsTrue()`
	`22`	`+ {`
	`23`	`+ $config = $this->getRepository();`
	`24`	`+ $options = $this->getDummyOptions();`
	`25`	`+ $config->getLoader()->shouldReceive('load')->once()->with('production', 'app', null)->andReturn($options);`
	`26`	`+`
	`27`	`+ $this->assertTrue($config->has('app.bing'));`
	`28`	`+ $this->assertEquals(true,$config->get('app.bing'));`
	`29`	`+ }`
	`30`	`+`
	`31`	`+`
`21`	`32`	`public function testGetReturnsBasicItems()`
`22`	`33`	`{`
`23`	`34`	`$config = $this->getRepository();`
`@@ -128,7 +139,7 @@ protected function getRepository()`
`128`	`139`
`129`	`140`	`protected function getDummyOptions()`
`130`	`141`	`{`
`131`		`- return array('foo' => 'bar', 'baz' => array('boom' => 'breeze'));`
	`142`	`+ return array('foo' => 'bar', 'baz' => array('boom' => 'breeze'), 'bing' => true);`
`132`	`143`	`}`
`133`	`144`
`134`	`145`	`}`