Check request header to detect allowed content-type. Closes #3

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Jul 30, 2013 · de85d8f · de85d8f
1 parent 1c7ff48
commit de85d8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Orchestra/Facile/Template/Driver.php b/src/Orchestra/Facile/Template/Driver.php
@@ -5,7 +5,7 @@
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Contracts\ArrayableInterface;
 use Illuminate\Support\Contracts\RenderableInterface;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 
@@ -32,7 +32,7 @@ abstract class Driver {
 	 */
 	public function format()
 	{
-		return Input::get('format', $this->defaultFormat);
+		return Request::format($this->defaultFormat);
 	}
 
 	/**

diff --git a/tests/Template/DriverTest.php b/tests/Template/DriverTest.php
@@ -53,13 +53,13 @@ public function testFormatMethod()
 		$stub = new TemplateDriverStub;
 
 		$request = m::mock('Request');
-		$request->shouldReceive('input')->once()->andReturn('html');
-		\Illuminate\Support\Facades\Input::setFacadeApplication(array('request' => $request));
+		$request->shouldReceive('format')->once()->andReturn('html');
+		\Illuminate\Support\Facades\Request::setFacadeApplication(array('request' => $request));
 
 		$this->assertEquals('html', $stub->format());
 
-		$request->shouldReceive('input')->once()->andReturn('json');
-		\Illuminate\Support\Facades\Input::setFacadeApplication(array('request' => $request));
+		$request->shouldReceive('format')->once()->andReturn('json');
+		\Illuminate\Support\Facades\Request::setFacadeApplication(array('request' => $request));
 
 		$this->assertEquals('json', $stub->format());
 	}