tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39 from sminnee/fix-alpha2 

FIX: Fixes for final 4.0-alpha2 class names.
This commit is contained in:
Daniel Hensby 2016-09-12 00:48:22 +01:00 committed by GitHub
parent 7b918814ba 9b85c80178
commit 81d4b73c2a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -25,4 +25,4 @@ before_script:
- cd ~/builds/ss - cd ~/builds/ss
script: script:
- phpunit testsession/tests/unit/ - vendor/bin/phpunit testsession/tests/unit/

4
code/TestSessionController.php
View File

@ -3,7 +3,7 @@
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\Control\SS_HTTPRequest; use SilverStripe\Control\HTTPRequest;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\Deprecation; use SilverStripe\Dev\Deprecation;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
@ -163,7 +163,7 @@ class TestSessionController extends Controller
/** /**
* Set $_SESSION state for the current browser session. * Set $_SESSION state for the current browser session.
* *
* @param SS_HTTPRequest $request * @param HTTPRequest $request
*/ */
public function browsersessionstate($request) public function browsersessionstate($request)
{ {

9
code/TestSessionRequestFilter.php
View File

@ -4,12 +4,13 @@ use SilverStripe\ORM\DataModel;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Control\SS_HTTPRequest;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Control\SS_HTTPResponse;
use SilverStripe\Control\RequestFilter; use SilverStripe\Control\RequestFilter;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse;
/** /**
@ -28,7 +29,7 @@ class TestSessionRequestFilter implements RequestFilter
$this->testSessionEnvironment = Injector::inst()->get('TestSessionEnvironment'); $this->testSessionEnvironment = Injector::inst()->get('TestSessionEnvironment');
} }
public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model) public function preRequest(HTTPRequest $request, Session $session, DataModel $model)
{ {
if (!$this->testSessionEnvironment->isRunningTests()) { if (!$this->testSessionEnvironment->isRunningTests()) {
return; return;
@ -66,7 +67,7 @@ class TestSessionRequestFilter implements RequestFilter
} }
} }
public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
{ {
if (!$this->testSessionEnvironment->isRunningTests()) { if (!$this->testSessionEnvironment->isRunningTests()) {
return; return;