tonyair/silverstripe-testsession
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-testsession synced 2024-10-22 14:06:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0' into 2

Browse Source
This commit is contained in:
Damian Mooyman 2017-11-28 13:19:29 +13:00
commit 5413f9182e
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -13,5 +13,8 @@ trim_trailing_whitespace = true
[{*.yml,*.json}] [{*.yml,*.json}]
indent_size = 2 indent_size = 2
[composer.json]
indent_size = 4
# The indent size used in the package.json file cannot be changed: # The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516 # https://github.com/npm/npm/pull/3180#issuecomment-16336516

63
composer.json
View File

@ -1,36 +1,31 @@
{ {
"name": "silverstripe/testsession", "name": "silverstripe/testsession",
"type": "silverstripe-module", "type": "silverstripe-module",
"description": "Support module for browser-based test sessions, e.g. for Behat behaviour testing", "description": "Support module for browser-based test sessions, e.g. for Behat behaviour testing",
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"keywords": [ "keywords": [
"silverstripe", "silverstripe",
"testing" "testing"
], ],
"authors": [ "authors": [
{ {
"name": "SilverStripe", "name": "SilverStripe",
"homepage": "http://silverstripe.com" "homepage": "http://silverstripe.com"
} }
], ],
"require": { "require": {
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "^4@dev" "silverstripe/framework": "^4@dev"
}, },
"extra": { "scripts": {
"branch-alias": { "lint": "phpcs -s src/ tests/"
"dev-master": "2.0.x-dev" },
} "autoload": {
}, "psr-4": {
"scripts": { "SilverStripe\\TestSession\\": "src/",
"lint": "phpcs -s src/ tests/" "SilverStripe\\TestSession\\Tests\\": "tests/"
}, }
"autoload": { },
"psr-4": { "minimum-stability": "dev"
"SilverStripe\\TestSession\\": "src/",
"SilverStripe\\TestSession\\Tests\\": "tests/"
}
},
"minimum-stability": "dev"
} }