Skip to content

Commit

Permalink
updated filter to new SS4 beta API
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Dubuisson committed Jul 13, 2017
1 parent 663d6ff commit 3bd75a3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/RequestFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
namespace Heyday\SilverStripeRedirects\Source;

use SilverStripe\Control\Director;
use SilverStripe\ORM\DataModel;
use SilverStripe\Control\RequestFilter as SilverStripeRequestFilter;
use SilverStripe\Control\Session;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse;

/**
* TODO use HTTP Middleware instead of RequestFilter as it is deprecated
* Class RequestFilter
* @package Heyday\SilverStripeRedirects\Source
*/
class RequestFilter implements SilverStripeRequestFilter
{
/**
Expand All @@ -28,11 +31,9 @@ public function __construct(Redirector $redirector)
* Filter executed before a request processes
*
* @param HTTPRequest $request Request container object
* @param Session $session Request session
* @param DataModel $model Current DataModel
* @return boolean Whether to continue processing other filters. Null or true will continue processing (optional)
*/
public function preRequest(HTTPRequest $request, Session $session, DataModel $model)
public function preRequest(HTTPRequest $request)
{
if (!Director::is_cli() && $response = $this->redirector->getResponse($request)) {
$response->output();
Expand All @@ -44,11 +45,10 @@ public function preRequest(HTTPRequest $request, Session $session, DataModel $mo
* Filter executed AFTER a request
*
* @param HTTPRequest $request Request container object
* @param HTTPResponse $response Response output object
* @param DataModel $model Current DataModel
* @param HTTPResponse $response
* @return boolean Whether to continue processing other filters. Null or true will continue processing (optional)
*/
public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
public function postRequest(HTTPRequest $request, HTTPResponse $response)
{
//NOOP
}
Expand Down

0 comments on commit 3bd75a3

Please sign in to comment.