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

Merge 4 into master

Browse Source
This commit is contained in:
Damian Mooyman 2017-10-12 13:28:52 +13:00
commit 6112ae6ac7
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -14,5 +14,8 @@ 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

11
composer.json
View File

@ -1,6 +1,6 @@
{ {
"name": "silverstripe/reports", "name": "silverstripe/reports",
"type": "silverstripe-module", "type": "silverstripe-vendormodule",
"description": "Reports module for SilverStripe CMS", "description": "Reports module for SilverStripe CMS",
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
@ -24,16 +24,19 @@
"silverstripe/admin": "^1.0@dev", "silverstripe/admin": "^1.0@dev",
"silverstripe/versioned": "^1.0@dev", "silverstripe/versioned": "^1.0@dev",
"silverstripe/config": "^1.0@dev", "silverstripe/config": "^1.0@dev",
"silverstripe/assets": "^1.0@dev" "silverstripe/assets": "^1.0@dev",
"silverstripe/vendor-plugin": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"4.x-dev": "4.0.x-dev",
"dev-master": "5.x-dev" "dev-master": "5.x-dev"
} },
"expose": [
"javascript"
]
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
phpunit.xml.dist
View File

@ -1,4 +1,4 @@
<phpunit bootstrap="framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>tests</directory> <directory>tests</directory>