Sort query param values in ServiceRestProxy::groupedQueryParams

Azure · Nov 10, 2016 · 3eac8c2 · 3eac8c2
1 parent fc36f35
commit 3eac8c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Common/Internal/ServiceRestProxy.php b/src/Common/Internal/ServiceRestProxy.php
@@ -508,6 +508,8 @@ public static function groupQueryValues($values)
         Validate::isArray($values, 'values');
         $joined = Resources::EMPTY_STRING;
 
+        sort($values);
+
         foreach ($values as $value) {
             if (!is_null($value) && !empty($value)) {
                 $joined .= $value . Resources::SEPARATOR;

diff --git a/tests/unit/Common/Internal/ServiceRestProxyTest.php b/tests/unit/Common/Internal/ServiceRestProxyTest.php
@@ -161,6 +161,22 @@ public function testGroupQueryValues()
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @covers  MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::groupQueryValues
+     */
+    public function testGroupQueryValuesWithUnorderedValues()
+    {
+        // Setup
+        $values = array('B', 'C', 'A');
+        $expected = 'A,B,C';
+
+        // Test
+        $actual = ServiceRestProxy::groupQueryValues($values);
+
+        // Assert
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * @covers  MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::groupQueryValues
      */