FIX Update upgrade mapping, add purifier back into composer and travis build

This commit is contained in:
Robbie Averill 2017-01-17 16:56:30 +13:00
parent ab3f35257b
commit 6aeab9f823
3 changed files with 8 additions and 8 deletions

View File

@ -43,7 +43,7 @@ before_script:
- composer self-update || true - composer self-update || true
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
# Install suggested modules in order to maximize test coverage # 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 - cd ~/builds/ss
script: script:

View File

@ -4,13 +4,12 @@ mappings:
CommentsGridField: SilverStripe\Comments\Admin\CommentsGridField CommentsGridField: SilverStripe\Comments\Admin\CommentsGridField
CommentsGridFieldAction: SilverStripe\Comments\Admin\CommentsGridFieldAction CommentsGridFieldAction: SilverStripe\Comments\Admin\CommentsGridFieldAction
CommentsGridFieldBulkAction: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction CommentsGridFieldBulkAction: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction
CommentsGridFieldBulkAction_Handlers: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction_Handlers CommentsGridFieldBulkAction_Handlers: SilverStripe\Comments\Admin\CommentsGridFieldBulkAction\Handlers
CommentsGridFieldConfig: SilverStripe\Comments\Admin\CommentsGridFieldConfig CommentsGridFieldConfig: SilverStripe\Comments\Admin\CommentsGridFieldConfig
CommentingController: SilverStripe\Comments\Controllers\CommentingController CommentingController: SilverStripe\Comments\Controllers\CommentingController
CommentsExtension: SilverStripe\Comments\Extensions\CommentsExtension CommentsExtension: SilverStripe\Comments\Extensions\CommentsExtension
Comment: SilverStripe\Comments\Model\Comment Comment: SilverStripe\Comments\Model\Comment
Comment_SecurityToken: SilverStripe\Comments\Model\Comment_SecurityToken Comment_SecurityToken: SilverStripe\Comments\Model\Comment\SecurityToken
CommentList: SilverStripe\Comments\Model\CommentList
CommentAdminTest: SilverStripe\Comments\Tests\CommentAdminTest CommentAdminTest: SilverStripe\Comments\Tests\CommentAdminTest
CommentingControllerTest: SilverStripe\Comments\Tests\CommentingControllerTest CommentingControllerTest: SilverStripe\Comments\Tests\CommentingControllerTest
CommentingTest: SilverStripe\Comments\Tests\CommentingTest CommentingTest: SilverStripe\Comments\Tests\CommentingTest
@ -21,8 +20,8 @@ mappings:
CommentsGridFieldConfigTest: SilverStripe\Comments\Tests\CommentsGridFieldConfigTest CommentsGridFieldConfigTest: SilverStripe\Comments\Tests\CommentsGridFieldConfigTest
CommentsGridFieldTest: SilverStripe\Comments\Tests\CommentsGridFieldTest CommentsGridFieldTest: SilverStripe\Comments\Tests\CommentsGridFieldTest
CommentsTest: SilverStripe\Comments\Tests\CommentsTest CommentsTest: SilverStripe\Comments\Tests\CommentsTest
CommentableItem: SilverStripe\Comments\Tests\CommentableItem CommentableItem: SilverStripe\Comments\Tests\Stubs\CommentableItem
CommentableItemEnabled: SilverStripe\Comments\Tests\CommentableItemEnabled CommentableItemEnabled: SilverStripe\Comments\Tests\Stubs\CommentableItemEnabled
CommentableItemDisabled: SilverStripe\Comments\Tests\CommentableItemDisabled CommentableItemDisabled: SilverStripe\Comments\Tests\Stubs\CommentableItemDisabled
CommentableItem_Controller: SilverStripe\Comments\Tests\CommentableItem_Controller CommentableItem_Controller: SilverStripe\Comments\Tests\Stubs\CommentableItemController
CommentTestHelper: SilverStripe\Comments\Tests\CommentTestHelper CommentTestHelper: SilverStripe\Comments\Tests\CommentTestHelper

View File

@ -12,6 +12,7 @@
"colymba/gridfield-bulk-editing-tools": "~2.1" "colymba/gridfield-bulk-editing-tools": "~2.1"
}, },
"suggest": { "suggest": {
"ezyang/htmlpurifier": "Standards compliant HTML filter written in PHP",
"silverstripe/cms": "The SilverStripe Content Management System" "silverstripe/cms": "The SilverStripe Content Management System"
}, },
"require-dev": { "require-dev": {