Skip to content

Commit

Permalink
Update configuration, CI, readme, composer for SS4 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
robbieaverill committed Jan 25, 2017
1 parent 877fbd2 commit 0542d37
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ checks:
argument_type_checks: true

filter:
paths: [code/*, tests/*]
paths: [src/*, tests/*]
25 changes: 8 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,29 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0

sudo: false
- 7.1

env:
- DB=MYSQL CORE_RELEASE=3.3
- DB=MYSQL CORE_RELEASE=4

matrix:
include:
- php: 5.5
env: DB=PGSQL CORE_RELEASE=3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.3
allow_failures:
- php: 7.0
env: DB=PGSQL CORE_RELEASE=3

before_script:
- composer self-update || true
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
- composer install

script:
- vendor/bin/phpunit --coverage-clover coverage.clover sharedraftcontent/tests

after_success:
- wget https://scrutinizer-ci.com/ocular.phar
- git remote rm origin
- git remote add origin [email protected]:silverstripe-labs/silverstripe-sharedraftcontent.git
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover

branches:
only:
- master
17 changes: 8 additions & 9 deletions _config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
Name: sharedraftcontent
After: framework/routes#coreroutes
---
SiteTree:
SilverStripe\CMS\Model\SiteTree:
extensions:
- ShareDraftContentSiteTreeExtension
CMSMain:
- SilverStripe\ShareDraftContent\Extensions\ShareDraftContentSiteTreeExtension
SilverStripe\CMS\Controllers\CMSMain:
extensions:
- ShareDraftContentRequirementsExtension
Controller:
- SilverStripe\ShareDraftContent\Extensions\ShareDraftContentRequirementsExtension
SilverStripe\Control\Controller:
extensions:
- ShareDraftContentControllerExtension
Director:
- SilverStripe\ShareDraftContent\Controllers\ShareDraftContentControllerExtension
SilverStripe\Core\Director:
rules:
'preview': 'ShareDraftController'
---
'preview': 'SilverStripe\ShareDraftContent\Controllers\ShareDraftController'
2 changes: 1 addition & 1 deletion code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct

https://docs.silverstripe.org/en/3.1/contributing/code_of_conduct/
https://docs.silverstripe.org/en/4/contributing/code_of_conduct/
71 changes: 35 additions & 36 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
{
"name": "silverstripe/sharedraftcontent",
"type": "silverstripe-module",
"description": "Share draft page content with non-CMS users",
"license": "BSD-3-Clause",
"keywords": ["silverstripe"],
"authors": [
{
"name": "Damian Mooyman",
"email": "[email protected]"
},
{
"name": "Christopher Pitt",
"email": "[email protected]"
},
{
"name": "David Craig",
"email": "[email protected]"
}
],
"require": {
"silverstripe/framework": "^3.3",
"silverstripe/cms": "^3.3",
"assertchris/hash-compat": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^4.7"
},
"extra":
{
"branch-alias":
{
"dev-master": "1.1.x-dev"
}
},
"minimum-stability": "dev",
"prefer-stable": true
"name": "silverstripe/sharedraftcontent",
"type": "silverstripe-module",
"description": "Share draft page content with non-CMS users",
"license": "BSD-3-Clause",
"keywords": ["silverstripe"],
"authors": [
{
"name": "Damian Mooyman",
"email": "[email protected]"
},
{
"name": "Christopher Pitt",
"email": "[email protected]"
},
{
"name": "David Craig",
"email": "[email protected]"
}
],
"require": {
"silverstripe/framework": "^4.0@dev",
"silverstripe/cms": "^4.0@dev"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
},
"extra":
{
"branch-alias":
{
"dev-master": "2.x-dev"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
12 changes: 6 additions & 6 deletions license.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015, SilverStripe Limited
Copyright (c) 2017, SilverStripe Limited
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand All @@ -8,9 +8,9 @@ Redistribution and use in source and binary forms, with or without modification,

* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sharedraftcontent",
"version": "1.0.0",
"version": "2.0.0",
"description": "Share draft page content with non-CMS users",
"devDependencies": {
"clean-css": "^3.2.8",
Expand All @@ -14,14 +14,14 @@
},
"repository": {
"type": "git",
"url": "https://github.com/silverstripe-labs/silverstripe-sharedraftcontent.git"
"url": "https://github.com/silverstripe/silverstripe-sharedraftcontent.git"
},
"keywords": [
"SilverStripe"
],
"license": "BSD-3-Clause",
"bugs": {
"url": "https://github.com/silverstripe-labs/silverstripe-sharedraftcontent/issues"
"url": "https://github.com/silverstripe/silverstripe-sharedraftcontent/issues"
},
"homepage": "https://github.com/silverstripe-labs/silverstripe-sharedraftcontent"
"homepage": "https://github.com/silverstripe/silverstripe-sharedraftcontent"
}
10 changes: 5 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Share Draft Content

[![Build Status](http://img.shields.io/travis/silverstripe-labs/silverstripe-sharedraftcontent.svg?style=flat-square)](https://travis-ci.org/silverstripe-labs/silverstripe-sharedraftcontent)
[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe-labs/silverstripe-sharedraftcontent.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-sharedraftcontent)
[![Code Coverage](http://img.shields.io/scrutinizer/coverage/g/silverstripe-labs/silverstripe-sharedraftcontent.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-sharedraftcontent)
[![Build Status](http://img.shields.io/travis/silverstripe/silverstripe-sharedraftcontent.svg?style=flat-square)](https://travis-ci.org/silverstripe/silverstripe-sharedraftcontent)
[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-sharedraftcontent.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-sharedraftcontent)
[![Code Coverage](http://img.shields.io/scrutinizer/coverage/g/silverstripe/silverstripe-sharedraftcontent.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-sharedraftcontent)
[![Version](http://img.shields.io/packagist/v/silverstripe/sharedraftcontent.svg?style=flat-square)](https://packagist.org/packages/silverstripe/silverstripe-sharedraftcontent)
[![License](http://img.shields.io/packagist/l/silverstripe/sharedraftcontent.svg?style=flat-square)](LICENSE.md)
![helpfulrobot](https://helpfulrobot.io/silverstripe/sharedraftcontent/badge)
Expand All @@ -15,7 +15,7 @@ This module adds a 'Share draft' action menu to the CMS. This enables Content Au

## Requirements

- SilverStripe ^3.1
- SilverStripe ^4.0

## Installation

Expand All @@ -37,4 +37,4 @@ All methods, with `public` visibility, are part of the public API. All other met

## Reporting Issues

Please [create an issue](http://github.com/silverstripe-labs/silverstripe-sharedraftcontent/issues) for any bugs you've found, or features you're missing.
Please [create an issue](http://github.com/silverstripe/silverstripe-sharedraftcontent/issues) for any bugs you've found, or features you're missing.

0 comments on commit 0542d37

Please sign in to comment.