Merge pull request #39 from sminnee/fix-alpha2

FIX: Fixes for final 4.0-alpha2 class names.
silverstripe · Sep 11, 2016 · 81d4b73 · 81d4b73
2 parents 7b91881 + 9b85c80
commit 81d4b73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,4 +25,4 @@ before_script:
  - cd ~/builds/ss
 
 script:
- - phpunit testsession/tests/unit/
+ - vendor/bin/phpunit testsession/tests/unit/
diff --git a/code/TestSessionController.php b/code/TestSessionController.php
@@ -3,7 +3,7 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Session;
-use SilverStripe\Control\SS_HTTPRequest;
+use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\Deprecation;
 use SilverStripe\Dev\SapphireTest;
@@ -163,7 +163,7 @@ public function start()
     /**
      * Set $_SESSION state for the current browser session.
      *
-     * @param SS_HTTPRequest $request
+     * @param HTTPRequest $request
      */
     public function browsersessionstate($request)
     {

diff --git a/code/TestSessionRequestFilter.php b/code/TestSessionRequestFilter.php
@@ -4,12 +4,13 @@
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\DB;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Control\SS_HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Control\Director;
-use SilverStripe\Control\SS_HTTPResponse;
 use SilverStripe\Control\RequestFilter;
+use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Control\HTTPResponse;
+
 
 
 /**
@@ -28,7 +29,7 @@ public function __construct()
         $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()) {
             return;
@@ -66,7 +67,7 @@ public function preRequest(SS_HTTPRequest $request, Session $session, DataModel
         }
     }
 
-    public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model)
+    public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
     {
         if (!$this->testSessionEnvironment->isRunningTests()) {
             return;