MAGETWO-32767: Fix Default Accept Header

Bryant Luk · Bryant Luk · commit f9bb264f42ab · 2015-01-23T10:38:55.000-06:00
- Ensure that method by default returns a string[] for Accept values
diff --git a/app/code/Magento/Webapi/Controller/Rest/Request.php b/app/code/Magento/Webapi/Controller/Rest/Request.php
@@ -103,7 +103,7 @@ public function getAcceptTypes()
         foreach ($qualityToTypes as $typeList) {
             $orderedTypes += $typeList;
         }
-        return empty($orderedTypes) ? self::DEFAULT_ACCEPT : array_keys($orderedTypes);
+        return empty($orderedTypes) ? [self::DEFAULT_ACCEPT] : array_keys($orderedTypes);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/Rest/RequestTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/Rest/RequestTest.php
@@ -177,7 +177,7 @@ public function providerAcceptType()
     {
         return [
             // Each element is: array(Accept HTTP header value, expected result))
-            ['', []],
+            ['', ['*/*']],
             [
                 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
                 ['text/html', 'application/xhtml+xml', 'application/xml', '*/*']

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getAcceptTypes()`
`103`	`103`	`foreach ($qualityToTypes as $typeList) {`
`104`	`104`	`$orderedTypes += $typeList;`
`105`	`105`	`}`
`106`		`- return empty($orderedTypes) ? self::DEFAULT_ACCEPT : array_keys($orderedTypes);`
	`106`	`+ return empty($orderedTypes) ? [self::DEFAULT_ACCEPT] : array_keys($orderedTypes);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function providerAcceptType()`
`177`	`177`	`{`
`178`	`178`	`return [`
`179`	`179`	`// Each element is: array(Accept HTTP header value, expected result))`
`180`		`- ['', []],`
	`180`	`+ ['', ['/']],`
`181`	`181`	`[`
`182`	`182`	`'text/html,application/xhtml+xml,application/xml;q=0.9,/;q=0.8',`
`183`	`183`	`['text/html', 'application/xhtml+xml', 'application/xml', '/']`