Skip to content

Commit 8e6f70b

Browse files
authored
Merge pull request #1 from nswdpc/feat-upgrade
Update minimum requirements
2 parents e108217 + c8ea162 commit 8e6f70b

5 files changed

Lines changed: 31 additions & 24 deletions

File tree

.gitattributes

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
/tests export-ignore
2-
/docs export-ignore
3-
/.gitattributes export-ignore
4-
/.gitignore export-ignore
5-
/.php_cs.dist export-ignore
6-
/phpunit.xml.dist export-ignore
7-
/.waratah export-ignore
8-
/code-of-conduct.md export-ignore
9-
/CONTRIBUTING.md export-ignore
10-
/README.md export-ignore
1+
/tests export-ignore
2+
/docs export-ignore
3+
/client/src export-ignore
4+
/.editorconfig export-ignore
5+
/.gitattributes export-ignore
6+
/.gitignore export-ignore
7+
/.php-cs-fixer.dist.php export-ignore
8+
/phpunit.xml.dist export-ignore
9+
/.waratah export-ignore
10+
/code-of-conduct.md export-ignore
11+
/CONTRIBUTING.md export-ignore
12+
/README.md export-ignore

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
.DS_Store
2-
/.php_cs.cache
2+
/.php-cs-fixer.cache

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
$finder = PhpCsFixer\Finder::create()
88
->in(__DIR__);
99

10-
return PhpCsFixer\Config::create()
11-
->setRules([
10+
$config = new PhpCsFixer\Config();
11+
return $config->setRules([
1212
'@PSR2' => true,
1313
'array_indentation' => true,
1414
'array_syntax' => ['syntax' => 'short'],

CONTRIBUTING.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Contributing
2+
3+
For simplicity, our contribution process follows the relevant Silverstripe documents.
4+
5+
## Guidelines
6+
27
- Maintenance on this module is a shared effort of those who use it
38
- To contribute improvements to the code, ensure you raise a pull request and discuss with the module maintainers
4-
- Please follow the SilverStripe [code contribution guidelines](https://docs.silverstripe.org/en/contributing/code/) and [Module Standard](https://docs.silverstripe.org/en/developer_guides/extending/modules/#module-standard)
9+
- Please follow the Silverstripe [code contribution guidelines](https://docs.silverstripe.org/en/contributing/code/) and [Module Standard](https://docs.silverstripe.org/en/developer_guides/extending/modules/#module-standard)
510
- Supply documentation that follows the [GitHub Flavored Markdown](https://help.github.com/articles/markdown-basics/) conventions
6-
- When having discussions about this module in issues or pull request please adhere to the [SilverStripe Community Code of Conduct](https://docs.silverstripe.org/en/contributing/code_of_conduct/)
7-
11+
- When having discussions about this module in issues or pull request please adhere to the [Silverstripe Community Code of Conduct](https://docs.silverstripe.org/en/contributing/code_of_conduct/)
812

913
## Contributor license agreement
10-
By supplying code to this module in patches, tickets and pull requests, you agree to assign copyright
11-
of that code to MODULE_COPYRIGHT_HOLDER_HERE., on the condition that these code changes are released under the
12-
same BSD license as the original module. We ask for this so that the ownership in the license is clear
13-
and unambiguous. By releasing this code under a permissive license such as BSD, this copyright assignment
14-
won't prevent you from using the code in any way you see fit.
14+
15+
By supplying code to this module in patches, tickets and pull requests, you agree to assign copyright of that code to New South Wales Department of Premier & Cabinet, on the condition that these code changes are released under the same BSD license as the original module.
16+
17+
We ask for this so that the ownership in the license is clear and unambiguous.
18+
19+
By releasing this code under a permissive license such as BSD, this copyright assignment won't prevent you from using the code in any way you see fit.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
}
2323
],
2424
"require": {
25-
"dnadesign/silverstripe-elemental": "^4.3.0"
25+
"dnadesign/silverstripe-elemental": "^4.9.0"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^5.7",
29-
"friendsofphp/php-cs-fixer": "^2.18"
28+
"phpunit/phpunit": "^9.5",
29+
"friendsofphp/php-cs-fixer": "^3"
3030
}
3131
}

0 commit comments

Comments
 (0)