allow override User Agent from request options

anime-db · Jul 21, 2017 · 8d049bc · 8d049bc
1 parent 5b2171a
commit 8d049bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Service/Browser.php b/src/Service/Browser.php
@@ -50,8 +50,10 @@ public function __construct(Client $client, $host, $app_client)
     public function get($path, array $options = [])
     {
         if ($this->app_client) {
-            $options['headers'] = isset($options['headers']) ? $options['headers'] : [];
-            $options['headers']['User-Agent'] = $this->app_client;
+            $options['headers'] = array_merge(
+                ['User-Agent' => $this->app_client],
+                isset($options['headers']) ? $options['headers'] : []
+            );
         }
 
         $response = $this->client->request('GET', $this->host.$path, $options);

diff --git a/tests/Service/BrowserTest.php b/tests/Service/BrowserTest.php
@@ -56,7 +56,23 @@ protected function setUp()
         $this->browser = new Browser($this->client, $this->host, $this->app_client);
     }
 
-    public function testGet()
+    /**
+     * @return array
+     */
+    public function appClients()
+    {
+        return [
+            [''],
+            ['Override User Agent'],
+        ];
+    }
+
+    /**
+     * @dataProvider appClients
+     *
+     * @param string $app_client
+     */
+    public function testGet($app_client)
     {
         $path = '/foo';
         $params = ['bar' => 'baz'];
@@ -65,6 +81,12 @@ public function testGet()
                 'User-Agent' => $this->app_client,
             ],
         ];
+
+        if ($app_client) {
+            $options['headers']['User-Agent'] = $app_client;
+            $params['headers']['User-Agent'] = $app_client;
+        }
+
         $content = 'Hello, world!';
 
         $this->stream