Updating to the latest Fractal.

Signed-off-by: Jason Lewis <[email protected]>
dingo · May 28, 2014 · 65b453c · 65b453c
1 parent 64649a6
commit 65b453c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Transformer/FractalTransformer.php b/src/Transformer/FractalTransformer.php
@@ -89,15 +89,15 @@ protected function createResource($response, $transformer)
 	}
 
 	/**
-	 * Parse includes
+	 * Parse includes.
 	 * 
 	 * @return void
 	 */
 	protected function parseIncludes()
 	{
-		$scopes = array_filter(explode($this->includeSeparator, $this->request->get($this->includeKey)));
+		$includes = array_filter(explode($this->includeSeparator, $this->request->get($this->includeKey)));
 
-		$this->fractal->parseIncludes($scopes);
+		$this->fractal->parseIncludes($includes);
 	}
 
 }
diff --git a/tests/TransformerFractalTransformerTest.php b/tests/TransformerFractalTransformerTest.php
@@ -62,7 +62,6 @@ public function testTransformingCollectionUsingCallback()
 
 	public function testTransformingNestedRelationships()
 	{
-		$this->transformerFactory->transform('Bar', 'BarTransformerStub');
 		$this->transformerFactory->setRequest(Illuminate\Http\Request::create('/', 'GET', ['include' => 'foo']));
 		$this->assertEquals(['data' => ['bar' => 'baz', 'foo' => ['data' => ['foo' => 'bar']]]], $this->transformerFactory->transformResponse(new Bar));
 	}

diff --git a/tests/stubs.php b/tests/stubs.php
@@ -140,8 +140,10 @@ class Foo {
 }
 
 class Bar implements Dingo\Api\Transformer\TransformableInterface  {
+
 	public function getTransformer()
 	{
 		return new BarTransformerStub;
 	}
+
 }