tonyair/silverstripe-behat-extension
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-behat-extension synced 2024-10-22 17:05:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0' into 3

Browse Source
This commit is contained in:
Damian Mooyman 2017-11-28 13:08:20 +13:00
commit 81a45e2819
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -14,6 +14,9 @@ trim_trailing_whitespace = true
indent_size = 2 indent_size = 2
indent_style = space indent_style = space
[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

99
composer.json
View File

@ -1,55 +1,50 @@
{ {
"name": "silverstripe/behat-extension", "name": "silverstripe/behat-extension",
"type": "behat-extension", "type": "behat-extension",
"description": "SilverStripe framework extension for Behat", "description": "SilverStripe framework extension for Behat",
"keywords": [ "keywords": [
"framework", "framework",
"web", "web",
"bdd", "bdd",
"silverstripe" "silverstripe"
], ],
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
{ {
"name": "Michal Ochman", "name": "Michal Ochman",
"email": "ochman.d.michal@gmail.com" "email": "ochman.d.michal@gmail.com"
},
{
"name": "Ingo Schommer",
"email": "ingo@silverstripe.com"
}
],
"require": {
"php": ">=5.6",
"phpunit/phpunit": "^5.7",
"behat/behat": "^3.2",
"behat/mink": "^1.7",
"behat/mink-extension": "^2.1",
"behat/mink-selenium2-driver": "^1.3",
"symfony/dom-crawler": "^3",
"silverstripe/testsession": "^2.0.0@alpha",
"silverstripe/framework": "^4@dev",
"symfony/finder": "^3.2"
}, },
{ "autoload": {
"name": "Ingo Schommer", "psr-4": {
"email": "ingo@silverstripe.com" "SilverStripe\\BehatExtension\\": "src/"
} }
], },
"require": { "autoload-dev": {
"php": ">=5.6", "psr-4": {
"phpunit/phpunit": "^5.7", "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
"behat/behat": "^3.2", }
"behat/mink": "^1.7", },
"behat/mink-extension": "^2.1", "scripts": {
"behat/mink-selenium2-driver": "^1.3", "lint": "phpcs --standard=PSR2 -n src/ tests/php/"
"symfony/dom-crawler": "^3", },
"silverstripe/testsession": "^2.0.0@alpha", "prefer-stable": true,
"silverstripe/framework": "^4@dev", "minimum-stability": "dev"
"symfony/finder": "^3.2"
},
"autoload": {
"psr-4": {
"SilverStripe\\BehatExtension\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
}
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"scripts": {
"lint": "phpcs --standard=PSR2 -n src/ tests/php/"
},
"prefer-stable": true,
"minimum-stability": "dev"
} }