Merge branch 'release/1.1.1'

studiobonito · Dec 17, 2015 · 3186b5b · 3186b5b
2 parents 7a55ab7 + d7f80cc
commit 3186b5b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# For more information about the properties used in this file,
+# please see the EditorConfig documentation:
+# http://editorconfig.org
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.yml,package.json}]
+indent_size = 2
+
+# The indent size used in the package.json file cannot be changed:
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
-All Notable changes to `studiobonito/silverstripe-spamprotection-honeypot` will be documented in this file
+All Notable changes to `studiobonito/silverstripe-spamprotection-honeypot` will be documented in this file.
 
 ## [Unreleased]
 
+## [1.1.1] - 2015-12-17
+### Added
+- Updated module to work with SilverStripe 3.2.
+- Included `.editorconfig` file.
+
 ## [1.1.0] - 2015-09-28
 ### Added
 - Included changelog.
@@ -33,6 +38,7 @@ All Notable changes to `studiobonito/silverstripe-spamprotection-honeypot` will
 ### Changed
 - Excluded methods from code coverage calculations.
 
-[Unreleased]: https://github.com/studiobonito/silverstripe-spamprotection-honeypot/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/studiobonito/silverstripe-spamprotection-honeypot/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/studiobonito/silverstripe-spamprotection-honeypot/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/studiobonito/silverstripe-spamprotection-honeypot/compare/1.0.1...1.1.0
 [1.0.1]: https://github.com/studiobonito/silverstripe-spamprotection-honeypot/compare/1.0.0...1.0.1
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Also invalidate submissions that respond to quickly.
 
 ## Requirements
 
-- SilverStripe 3.1 or newer.
+- SilverStripe 3.1.0 and newer or 3.2 and newer.
 - SilverStripe [SpamProtection](https://github.com/silverstripe/silverstripe-spamprotection) 1.2 or newer.
 
 ## Install
@@ -80,7 +80,7 @@ If you discover any security related issues, please email support@studiobonito.c
 
 The BSD-2-Clause License. Please see [License File](LICENSE.md) for more information.
 
-[ico-version]: https://img.shields.io/github/release/studiobonito/silverstripe-spamprotection-honeypot.svg?style=flat-square
+[ico-version]: https://img.shields.io/packagist/v/studiobonito/silverstripe-spamprotection-honeypot.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/studiobonito/silverstripe-spamprotection-honeypot/master.svg?style=flat-square
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/studiobonito/silverstripe-spamprotection-honeypot.svg?style=flat-square

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
  ],
  "require": {
  "php": ">=5.3.0",
- "silverstripe/framework": "~3.1.0",
+ "silverstripe/framework": ">=3.1,<3.3",
  "silverstripe/spamprotection": "~1.2.0"
  },
  "require-dev": {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -16,6 +16,7 @@
 $loader->addClassMap($classMap);
 
 //TODO: Find a nicer way to mock global methods
-function _t($entity, $string = "", $context = "", $injection = "") {
+function _t($entity, $string = "", $context = "", $injection = "")
+{
  return $string;
 }