Merge branch 'hotfix/2' into develop

weierophinney · weierophinney · commit a768034c21ad · 2018-04-25T16:06:01.000-05:00
Forward port #2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
@@ -36,7 +40,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#2](https://github.com/zendframework/zend-json-server/pull/2) fixes an issue with how the `Response::setOptions()` method would handle a
+  key of `0`; previously, it would (incorrectly) set the JSON-RPC version of the response;
+  now it does not.
 
 ## 3.0.0 - 2015-03-31
 
diff --git a/src/Response.php b/src/Response.php
@@ -74,7 +74,7 @@ public function setOptions(array $options)
                 continue;
             }
 
-            if ($key == 'jsonrpc') {
+            if ('jsonrpc' === $key) {
                 $this->setVersion($value);
                 continue;
             }
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -200,4 +200,15 @@ public function getOptions()
             'id'  => 'foobar'
         ];
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-json-server/pull/2
+     */
+    public function testValueOfZeroForOptionsKeyShouldNotBeInterpretedAsVersionKey()
+    {
+        $this->response->setOptions([
+            0 => '2.0',
+        ]);
+        $this->assertNull($this->response->getVersion());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function setOptions(array $options)`
`74`	`74`	`continue;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if ($key == 'jsonrpc') {`
	`77`	`+ if ('jsonrpc' === $key) {`
`78`	`78`	`$this->setVersion($value);`
`79`	`79`	`continue;`
`80`	`80`	`}`