From 6aeab9f823fe77252432ca960e78bfd6decd726b Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 17 Jan 2017 16:56:30 +1300
Subject: [PATCH] FIX Update upgrade mapping, add purifier back into composer
 and travis build

---
 .travis.yml   |  2 +-
 .upgrade.yml  | 13 ++++++-------
 composer.json |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00b0a82..86bfbb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ before_script:
   - composer self-update || true
   - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
   # Install suggested modules in order to maximize test coverage
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "silverstripe/cms:^4.0@dev"
+  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "ezyang/htmlpurifier:4.*,silverstripe/cms:^4.0@dev"
   - cd ~/builds/ss
 
 script:
diff --git a/.upgrade.yml b/.upgrade.yml
index 42fd6b0..948f795 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -4,13 +4,12 @@ mappings:
   CommentsGridField: SilverStripe\Comments\Admin\CommentsGridField
   CommentsGridFieldAction: SilverStripe\Comments\Admin\CommentsGridFieldAction
   CommentsGridFieldBulkAction: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction
-  CommentsGridFieldBulkAction_Handlers: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction_Handlers
+  CommentsGridFieldBulkAction_Handlers: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction\Handlers
   CommentsGridFieldConfig: SilverStripe\Comments\Admin\CommentsGridFieldConfig
   CommentingController: SilverStripe\Comments\Controllers\CommentingController
   CommentsExtension: SilverStripe\Comments\Extensions\CommentsExtension
   Comment: SilverStripe\Comments\Model\Comment
-  Comment_SecurityToken: SilverStripe\Comments\Model\Comment_SecurityToken
-  CommentList: SilverStripe\Comments\Model\CommentList
+  Comment_SecurityToken: SilverStripe\Comments\Model\Comment\SecurityToken
   CommentAdminTest: SilverStripe\Comments\Tests\CommentAdminTest
   CommentingControllerTest: SilverStripe\Comments\Tests\CommentingControllerTest
   CommentingTest: SilverStripe\Comments\Tests\CommentingTest
@@ -21,8 +20,8 @@ mappings:
   CommentsGridFieldConfigTest: SilverStripe\Comments\Tests\CommentsGridFieldConfigTest
   CommentsGridFieldTest: SilverStripe\Comments\Tests\CommentsGridFieldTest
   CommentsTest: SilverStripe\Comments\Tests\CommentsTest
-  CommentableItem: SilverStripe\Comments\Tests\CommentableItem
-  CommentableItemEnabled: SilverStripe\Comments\Tests\CommentableItemEnabled
-  CommentableItemDisabled: SilverStripe\Comments\Tests\CommentableItemDisabled
-  CommentableItem_Controller: SilverStripe\Comments\Tests\CommentableItem_Controller
+  CommentableItem: SilverStripe\Comments\Tests\Stubs\CommentableItem
+  CommentableItemEnabled: SilverStripe\Comments\Tests\Stubs\CommentableItemEnabled
+  CommentableItemDisabled: SilverStripe\Comments\Tests\Stubs\CommentableItemDisabled
+  CommentableItem_Controller: SilverStripe\Comments\Tests\Stubs\CommentableItemController
   CommentTestHelper: SilverStripe\Comments\Tests\CommentTestHelper
diff --git a/composer.json b/composer.json
index 62c31bf..4afc8b5 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,7 @@
         "colymba/gridfield-bulk-editing-tools": "~2.1"
     },
     "suggest": {
+        "ezyang/htmlpurifier": "Standards compliant HTML filter written in PHP",
         "silverstripe/cms": "The SilverStripe Content Management System"
     },
     "require-dev": {