SS4 compat: Update composer and YAML config, rename classes, update readme

This commit is contained in:
Robbie Averill 2017-01-16 18:10:05 +13:00
parent 2b8ff849ed
commit c698632aae
15 changed files with 40 additions and 42 deletions

View File

@ -8,18 +8,17 @@ addons:
- tidy - tidy
php: php:
- 5.3
- 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0 - 7.0
- 7.1
before_install: before_install:
- pip install --user codecov - pip install --user codecov
env: env:
global: global:
- DB=MYSQL CORE_RELEASE=3.1 - DB=MYSQL CORE_RELEASE=4
- MODULE_PATH=comments - MODULE_PATH=comments
# Set to 1 in the matrix to enable code coverage # Set to 1 in the matrix to enable code coverage
@ -29,15 +28,15 @@ matrix:
include: include:
- php: 5.6 - php: 5.6
#CommentsListTest breaks with this env: DB=MYSQL CORE_RELEASE=3.2 COVERAGE=1 #CommentsListTest breaks with this env: DB=MYSQL CORE_RELEASE=3.2 COVERAGE=1
env: DB=SQLITE CORE_RELEASE=3.2 COVERAGE=1 env: DB=SQLITE CORE_RELEASE=4 COVERAGE=1
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=4
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2
allow_failures:
- php: 7.0 - php: 7.0
env: DB=MYSQL CORE_RELEASE=4
- php: 7.1
env: DB=MYSQL CORE_RELEASE=4
- php: 5.6
env: DB=PGSQL CORE_RELEASE=4
before_script: before_script:
- phpenv rehash - phpenv rehash

View File

@ -36,7 +36,7 @@ inside the docs folder.
## Requirements ## Requirements
* SilverStripe 3.1 * SilverStripe ^4.0
## Installation ## Installation

View File

@ -4,6 +4,6 @@ Name: commentssitetree
only: only:
moduleexists: 'cms' moduleexists: 'cms'
--- ---
SiteTree: SilverStripe\CMS\Model\SiteTree:
comments: comments:
enabled_cms: true enabled_cms: true

View File

@ -2,9 +2,9 @@
Name: commentroutes Name: commentroutes
After: framework/routes#coreroutes After: framework/routes#coreroutes
--- ---
Director: SilverStripe\Control\Director:
rules: rules:
# handle old 2.4 style urls # handle old 2.4 style urls
'CommentingController//$Action/$ID/$OtherID': 'CommentingController' 'CommentingController//$Action/$ID/$OtherID': 'SilverStripe\Comments\Controllers\CommentingController'
'PageComments/$Action/$ID/$OtherID': 'CommentingController' 'PageComments/$Action/$ID/$OtherID': 'SilverStripe\Comments\Controllers\CommentingController'
'PageComments_Controller/$Action/$ID/$OtherID': 'CommentingController' 'PageComments_Controller/$Action/$ID/$OtherID': 'SilverStripe\Comments\Controllers\CommentingController'

View File

@ -8,8 +8,7 @@
"email": "will@fullscreen.io" "email": "will@fullscreen.io"
}], }],
"require": { "require": {
"assertchris/hash-compat": "~1.0", "silverstripe/framework": "^4.0@dev",
"silverstripe/framework": "~3.1",
"colymba/gridfield-bulk-editing-tools": "~2.1" "colymba/gridfield-bulk-editing-tools": "~2.1"
}, },
"suggest": { "suggest": {
@ -17,11 +16,11 @@
"silverstripe/cms": "The SilverStripe Content Management System" "silverstripe/cms": "The SilverStripe Content Management System"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7@stable" "phpunit/PHPUnit": "~4.8"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1.x-dev" "dev-master": "3.x-dev"
} }
}, },
"license": "BSD-3-Clause" "license": "BSD-3-Clause"