Merge branch 'master' into guzzle_5_backport

wayfair · Oct 18, 2017 · 781c07c · 781c07c
2 parents bc03413 + 9112a8b
commit 781c07c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ $renderer = new Renderer('http://localhost:3030/batch');
 Give it some work:
 
 ```
-$renderer->addJob('myViewId', ['name' => 'my_module_name', 'data' => ['some' => ['props']]);
+$renderer->addJob('myViewId', ['name' => 'my_module_name', 'data' => ['some' => ['props']]]);
 ```
 
 Optionally add a plugin or two (see plugin section):

diff --git a/src/Renderer.php b/src/Renderer.php
@@ -49,7 +49,7 @@ public function __construct($url, $plugins = [], $config = [])
     {
         $this->url = $url;
         $this->plugins = $plugins;
-        $this->config = array_merge(self::$configDefaults, $config);
+        $this->config = array_merge(static::$configDefaults, $config);
     }
 
     /**