Object encoding no longer counts the object to determine whether it should write a comma after an element, as count() may not be reliable, depending on the object (some objects may not be explicitly countable).

Author: rayward

src/JsonStream/Encoder.php

@@ -148,23 +148,23 @@ private function _encodeList($list)
 	/**
 	 * Encodes an object or associative array.
 	 *
-	 * @param mixed $list
+	 * @param array|object $object
 	 */
-	private function _encodeObject($list)
+	private function _encodeObject($object)
 	{
 		$this->_writeValue('{');
 
-		$x = 1;
-		foreach ($list as $key => $value) {
-			$this->_encodeScalar((string)$key);
-			$this->_writeValue(':');
-			$this->encode($value);
+		$firstIteration = true;
 
-			if ($x < count($list)) {
+		foreach ($object as $key => $value) {
+			if (!$firstIteration) {
 				$this->_writeValue(',');
 			}
+			$firstIteration = false;
 
-			$x++;
+			$this->_encodeScalar((string)$key);
+			$this->_writeValue(':');
+			$this->encode($value);
 		}
 
 		$this->_writeValue('}');