Merge pull request #697 from matt-catalyst/redis-duplicate-assertion

jaimeperez · web-flow · commit 7c02b15e8b4f · 2017-11-07T08:47:36.000+01:00
Fix duplicate assertion error using Redis Store
diff --git a/lib/SimpleSAML/Store/Redis.php b/lib/SimpleSAML/Store/Redis.php
@@ -72,7 +72,7 @@ public function get($type, $key)
 
         $result = $this->redis->get("{$type}.{$key}");
 
-        if ($result === false) {
+        if ($result === false || $result === null) {
             return null;
         }
 
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -48,7 +48,7 @@ protected function setUp()
 
     public function getMocked($key)
     {
-        return array_key_exists($key, $this->config) ? $this->config[$key] : false;
+        return array_key_exists($key, $this->config) ? $this->config[$key] : null;
     }
 
     public function setMocked($key, $value)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function get($type, $key)`
`72`	`72`
`73`	`73`	`$result = $this->redis->get("{$type}.{$key}");`
`74`	`74`
`75`		`- if ($result === false) {`
	`75`	`+ if ($result === false \|\| $result === null) {`
`76`	`76`	`return null;`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function setUp()`
`48`	`48`
`49`	`49`	`public function getMocked($key)`
`50`	`50`	`{`
`51`		`- return array_key_exists($key, $this->config) ? $this->config[$key] : false;`
	`51`	`+ return array_key_exists($key, $this->config) ? $this->config[$key] : null;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function setMocked($key, $value)`