From 59716043db2494df17d9982dd45d49a2eb2be4ce Mon Sep 17 00:00:00 2001 From: Tom Densham Date: Thu, 17 Dec 2015 11:20:29 +0000 Subject: [PATCH 1/5] ADD: Update module to work with SilverStripe 3.2 --- CHANGELOG.md | 2 ++ README.md | 2 +- composer.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0dac27..2b324b0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All Notable changes to `studiobonito/silverstripe-spamprotection-honeypot` will be documented in this file ## [Unreleased] +### Added +- Updated module to work with SilverStripe 3.2. ## [1.1.0] - 2015-09-28 ### Added diff --git a/README.md b/README.md index 0e4e425..739b903 100644 --- 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 diff --git a/composer.json b/composer.json index 2357202..bd642d3 100644 --- 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": { From 54329bc65abb0e59825b089bf0e6691dba767b53 Mon Sep 17 00:00:00 2001 From: Tom Densham Date: Thu, 17 Dec 2015 12:11:05 +0000 Subject: [PATCH 2/5] FIX: Use packagist for version info in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 739b903..447afdf 100644 --- a/README.md +++ b/README.md @@ -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 From 6e3742c893e8f8e42c7cfe8344286b78714f8d96 Mon Sep 17 00:00:00 2001 From: Tom Densham Date: Thu, 17 Dec 2015 15:35:59 +0000 Subject: [PATCH 3/5] ADD: Include .editorconfig file --- .editorconfig | 17 +++++++++++++++++ CHANGELOG.md | 1 + 2 files changed, 18 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..24419fb --- /dev/null +++ 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 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b324b0..f7c35dc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All Notable changes to `studiobonito/silverstripe-spamprotection-honeypot` will ## [Unreleased] ### Added - Updated module to work with SilverStripe 3.2. +- Included `.editorconfig` file. ## [1.1.0] - 2015-09-28 ### Added From c7901dc62d4ea484d32fd62cd2a13582bb79601f Mon Sep 17 00:00:00 2001 From: Tom Densham Date: Thu, 17 Dec 2015 15:57:51 +0000 Subject: [PATCH 4/5] FIX: Correct PSR formatting --- tests/bootstrap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 545b2e3..a0d1b36 100644 --- 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; } \ No newline at end of file From d7f80cc7e2ccc860ef2cfc158c41843fb2127513 Mon Sep 17 00:00:00 2001 From: Tom Densham Date: Thu, 17 Dec 2015 15:59:05 +0000 Subject: [PATCH 5/5] ADD: Update changelog --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7c35dc..0c53dc0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # 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. @@ -36,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 \ No newline at end of file