Merge pull request #56 from Nyholm/urlIssue

Make sure we can have query string in the endpoint.

src/Http/UrlGenerator.php

@@ -53,13 +53,16 @@ public function getUrl($name, $path = '', $params = array())
         }
 
         if (!empty($params)) {
-            //it needs to be PHP_QUERY_RFC3986. We want to have %20 between scopes
-            // we cant run http_build_query($params, null, '&', PHP_QUERY_RFC3986); because it is not supported in php 5.3 or hhvm
-            $url .= '?';
-            foreach ($params as $key => $value) {
-                $url .= sprintf('%s=%s&', rawurlencode($key), rawurlencode($value));
+            // does it exist a query string?
+            $queryString = parse_url($url, PHP_URL_QUERY);
+            if (empty($queryString)) {
+                $url .= '?';
+            } else {
+                $url .= '&';
             }
-            $url = rtrim($url, '&');
+
+            // it needs to be PHP_QUERY_RFC3986. We want to have %20 between scopes
+            $url .= http_build_query($params, null, '&', PHP_QUERY_RFC3986);
         }
 
         return $url;

tests/Http/UrlGeneratorTest.php

@@ -75,6 +75,18 @@ public function testGetUrl()
         $this->assertNotEquals($notExpected, $gen->getUrl('api', 'foobar', array('bar' => 'baz a b')), 'Dont use PHP_QUERY_RFC1738');
     }
 
+    public function testGetUrlWithParams()
+    {
+        $gen = new UrlGenerator();
+
+        $expected = 'https://api.linkedin.com/endpoint?bar=baz&format=json';
+        $this->assertEquals($expected, $gen->getUrl('api', 'endpoint?bar=baz', array('format' => 'json')));
+
+        $expected = 'https://api.linkedin.com/endpoint?bar=baz&bar=baz';
+        $this->assertEquals($expected, $gen->getUrl('api', 'endpoint?bar=baz', array('bar' => 'baz')));
+
+    }
+
     public function testGetCurrentURL()
     {
         $gen = $this->getMock('Happyr\LinkedIn\Http\UrlGenerator', array('getHttpProtocol', 'getHttpHost', 'dropLinkedInParams'), array());