[Feature] Update view encoder to use new default API

lindyhopchris · lindyhopchris · commit d63fd8decbca · 2018-05-16T11:20:48.000+01:00
diff --git a/docs/features/views.md b/docs/features/views.md
@@ -21,8 +21,7 @@ For example:
 @jsonapi('v1', JSON_PRETTY_PRINT, 250)
 ```
 
-Note that if you do not call the `@jsonapi` directive in your templates, then the JSON API named `default` will be
-used.
+Note that if you do not call the `@jsonapi` directive in your templates, then the default API will be used.
 
 ### Encoding Data
 
diff --git a/src/View/Renderer.php b/src/View/Renderer.php
@@ -73,7 +73,7 @@ public function __construct(JsonApiService $service)
      * @param int $options
      * @param int $depth
      */
-    public function with($apiName, $options = 0, $depth = 512)
+    public function with($apiName = null, $options = 0, $depth = 512)
     {
         $this->encoder = $this->service->api($apiName)->encoder($options, $depth);
     }
@@ -87,7 +87,7 @@ public function with($apiName, $options = 0, $depth = 512)
     public function encode($data, $includePaths = null, $fieldSets = null)
     {
         if (!$this->encoder) {
-            $this->with('default');
+            $this->with();
         }
 
         $params = null;
diff --git a/tests/lib/Unit/View/RendererTest.php b/tests/lib/Unit/View/RendererTest.php
@@ -91,7 +91,7 @@ public function testCompileEncoderUsingOptions()
 
     public function testEncodeWithDefaultApi()
     {
-        $post = $this->withEncoder('default');
+        $post = $this->withEncoder();
         $this->renderer->encode($post);
     }
 
@@ -112,7 +112,7 @@ public function testEncodeWithOptions()
     public function testEncodeWithParameters()
     {
         $params = new EncodingParameters(['comments'], ['author' => ['name']]);
-        $post = $this->withEncoder('default', 0, 512, $params);
+        $post = $this->withEncoder(null, 0, 512, $params);
         $this->renderer->encode($post, 'comments', ['author' => ['name']]);
     }
 
@@ -123,7 +123,7 @@ public function testEncodeWithParameters()
      * @param $parameters
      * @return object
      */
-    private function withEncoder($name, $options = 0, $depth = 512, $parameters = null)
+    private function withEncoder($name = null, $options = 0, $depth = 512, $parameters = null)
     {
         $post = (object) ['type' => 'posts', 'id' => '1'];
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function __construct(JsonApiService $service)`
`73`	`73`	`* @param int $options`
`74`	`74`	`* @param int $depth`
`75`	`75`	`*/`
`76`		`- public function with($apiName, $options = 0, $depth = 512)`
	`76`	`+ public function with($apiName = null, $options = 0, $depth = 512)`
`77`	`77`	`{`
`78`	`78`	`$this->encoder = $this->service->api($apiName)->encoder($options, $depth);`
`79`	`79`	`}`
`@@ -87,7 +87,7 @@ public function with($apiName, $options = 0, $depth = 512)`
`87`	`87`	`public function encode($data, $includePaths = null, $fieldSets = null)`
`88`	`88`	`{`
`89`	`89`	`if (!$this->encoder) {`
`90`		`- $this->with('default');`
	`90`	`+ $this->with();`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$params = null;`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function testCompileEncoderUsingOptions()`
`91`	`91`
`92`	`92`	`public function testEncodeWithDefaultApi()`
`93`	`93`	`{`
`94`		`- $post = $this->withEncoder('default');`
	`94`	`+ $post = $this->withEncoder();`
`95`	`95`	`$this->renderer->encode($post);`
`96`	`96`	`}`
`97`	`97`
`@@ -112,7 +112,7 @@ public function testEncodeWithOptions()`
`112`	`112`	`public function testEncodeWithParameters()`
`113`	`113`	`{`
`114`	`114`	`$params = new EncodingParameters(['comments'], ['author' => ['name']]);`
`115`		`- $post = $this->withEncoder('default', 0, 512, $params);`
	`115`	`+ $post = $this->withEncoder(null, 0, 512, $params);`
`116`	`116`	`$this->renderer->encode($post, 'comments', ['author' => ['name']]);`
`117`	`117`	`}`
`118`	`118`
`@@ -123,7 +123,7 @@ public function testEncodeWithParameters()`
`123`	`123`	`* @param $parameters`
`124`	`124`	`* @return object`
`125`	`125`	`*/`
`126`		`- private function withEncoder($name, $options = 0, $depth = 512, $parameters = null)`
	`126`	`+ private function withEncoder($name = null, $options = 0, $depth = 512, $parameters = null)`
`127`	`127`	`{`
`128`	`128`	`$post = (object) ['type' => 'posts', 'id' => '1'];`
`129`	`129`