changed Media::type() to cast a Content-Type string to array

UnionOfRAD · Feb 15, 2012 · a2d40ab · a2d40ab
1 parent 0c94093
commit a2d40ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/net/http/Media.php b/net/http/Media.php
@@ -249,7 +249,7 @@ public static function type($type, $content = null, array $options = array()) {
 			return compact('content') + array('options' => static::_handlers($type));
 		}
 		if ($content) {
-			static::$_types[$type] = $content;
+			static::$_types[$type] = (array)$content;
 		}
 		static::$_handlers[$type] = $options ? Set::merge($defaults, $options) : array();
 	}
@@ -756,12 +756,12 @@ protected static function _types($type = null) {
 			'html'         => array('text/html', 'application/xhtml+xml', '*/*'),
 			'htm'          => array('alias' => 'html'),
 			'form'         => array('application/x-www-form-urlencoded', 'multipart/form-data'),
-			'json'         => 'application/json',
-			'rss'          => 'application/rss+xml',
-			'atom'         => 'application/atom+xml',
-			'css'          => 'text/css',
+			'json'         => array('application/json'),
+			'rss'          => array('application/rss+xml'),
+			'atom'         => array('application/atom+xml'),
+			'css'          => array('text/css'),
 			'js'           => array('application/javascript', 'text/javascript'),
-			'text'         => 'text/plain',
+			'text'         => array('text/plain'),
 			'txt'          => array('alias' => 'text'),
 			'xml'          => array('application/xml', 'text/xml')
 		);

diff --git a/net/http/Request.php b/net/http/Request.php
@@ -240,13 +240,11 @@ public function to($format, array $options = array()) {
 				$this->headers('Authorization', "Basic {$auth}");
 			}
 		}
-
 		if(in_array($options['method'], array('POST', 'PUT'))) {
 			$media = $this->_classes['media'];
-			$contentType = $media::type($this->_type);
-			$contentType = is_array($contentType) ? reset($contentType) : $contentType;
-			$contentType = is_array($contentType) ? reset($contentType) : $contentType;
-			$this->headers('Content-Type', $contentType);
+			if($type = $media::type($this->_type)) {
+				$this->headers('Content-Type', $type['content'][0]);
+			}
 		}
 
 		$body = $this->body($options['body']);

diff --git a/tests/cases/net/http/MediaTest.php b/tests/cases/net/http/MediaTest.php
@@ -42,7 +42,7 @@ public function testMediaTypes() {
 		$this->assertEqual($expected, Media::formats());
 
 		$result = Media::type('json');
-		$expected = 'application/json';
+		$expected = array('application/json');
 		$this->assertEqual($expected, $result['content']);
 
 		$expected = array(
@@ -57,7 +57,7 @@ public function testMediaTypes() {
 		$this->assertTrue(in_array('my', $result));
 
 		$result = Media::type('my');
-		$expected = 'text/x-my';
+		$expected = array('text/x-my');
 		$this->assertEqual($expected, $result['content']);
 
 		$expected = array(
@@ -90,7 +90,7 @@ public function testContentTypeDetection() {
 		$this->assertEqual('json', Media::type('application/json; charset=UTF-8'));
 
 		$result = Media::type('json');
-		$expected = array('content' => 'application/json', 'options' => array(
+		$expected = array('content' => array('application/json'), 'options' => array(
 			'cast' => true, 'encode' => 'json_encode', 'decode' => $result['options']['decode']
 		));
 		$this->assertEqual($expected, $result);
@@ -517,7 +517,7 @@ public function testEncodeRecordSet() {
 	 */
 	public function testTypeAliasResolution() {
 		$resolved = Media::type('text');
-		$this->assertEqual('text/plain', $resolved['content']);
+		$this->assertEqual(array('text/plain'), $resolved['content']);
 		unset($resolved['options']['encode']);
 
 		$result = Media::type('txt');