diff --git a/.editorconfig b/.editorconfig index d3832ba..d7cacc3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -19,7 +19,7 @@ trim_trailing_whitespace = false indent_size = 2 indent_style = space -[{.travis.yml,package.json}] +[*.{yml,json}] # The indent size used in the `package.json` file cannot be changed # https://github.com/npm/npm/pull/3180#issuecomment-16336516 indent_size = 2 diff --git a/composer.json b/composer.json index 05b12b2..4b8a32e 100644 --- a/composer.json +++ b/composer.json @@ -1,30 +1,31 @@ { - "name": "silverstripe/installer", - "description": "The SilverStripe Framework Installer", - "require": { - "php": ">=5.6.0", - "silverstripe/cms": "4.0.x-dev", - "silverstripe/framework": "4.0.x-dev", - "silverstripe/config": "1.0.x-dev", - "silverstripe/admin": "1.0.x-dev", - "silverstripe/assets": "1.0.x-dev", - "silverstripe/reports": "4.0.x-dev", - "silverstripe/siteconfig": "4.0.x-dev", - "silverstripe-themes/simple": "~3.2.0", - "silverstripe/asset-admin": "1.0.x-dev", - "silverstripe/graphql": "0.2.x-dev" - }, - "require-dev": { - "phpunit/PHPUnit": "^5.7" - }, - "extra": { - "branch-alias": { - "dev-master": "4.0.x-dev" - } - }, - "config": { - "process-timeout": 600 - }, - "prefer-stable": true, - "minimum-stability": "dev" + "name": "silverstripe/installer", + "description": "The SilverStripe Framework Installer", + "require": { + "php": ">=5.6.0", + "silverstripe/admin": "1.0.x-dev", + "silverstripe/asset-admin": "1.0.x-dev", + "silverstripe/assets": "1.0.x-dev", + "silverstripe/cms": "4.0.x-dev", + "silverstripe/config": "1.0.x-dev", + "silverstripe/framework": "4.0.x-dev", + "silverstripe/graphql": "0.2.x-dev", + "silverstripe/reports": "4.0.x-dev", + "silverstripe/siteconfig": "4.0.x-dev", + "silverstripe/versioned": "1.0.x-dev", + "silverstripe-themes/simple": "~3.2.0" + }, + "require-dev": { + "phpunit/PHPUnit": "^5.7" + }, + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "config": { + "process-timeout": 600 + }, + "prefer-stable": true, + "minimum-stability": "dev" }