Merge pull request #63 from creative-commoners/pulls/3.0/upgrade-upgr…

…ade-upgrade

FIX Check and make updates for SS4 compatibility

.travis.yml

@@ -25,7 +25,7 @@ before_script:
 script:
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist code/ tests/ ; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs code/ tests/ ; fi
 
 after_success:
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

README.md

@@ -1,6 +1,7 @@
 # SpamProtection Module
 
-[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-spamprotection.png?branch=master)](http://travis-ci.org/silverstripe/silverstripe-spamprotection)
+[![Build Status](https://travis-ci.org/silverstripe/silverstripe-spamprotection.svg?)](https://travis-ci.org/silverstripe/silverstripe-spamprotection)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-spamprotection/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-spamprotection/?branch=master)
 [![Code Coverage](https://codecov.io/gh/silverstripe/silverstripe-spamprotection/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-spamprotection)
 
 ## Maintainer Contact
@@ -13,7 +14,13 @@
 
 ## Requirements
 
-SilverStripe 4.0 or greater
+SilverStripe 4.0+
+
+**Note:** For SilverStripe 3.x, please use the [2.x release line](https://github.com/silverstripe/silverstripe-spamprotection/tree/2.0).
+
+## Install
+
+To install run `composer require silverstripe/spamprotection`.
 
 ## Documentation
 
@@ -41,7 +48,7 @@ spam protection hooks with that protector.
 
 ```yaml
 ---
-name: spamprotection
+name: mycustomspamprotection
 ---
 SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
   default_spam_protector: MollomSpamProtector

lang/fi.yml

@@ -1,5 +1,5 @@
 fi:
-  EditableSpamProtectionField:
+  SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Roskapostisuojauksen kentät'
     SINGULARNAME: 'Roskapostisuojauksen kenttä'
     SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'

lang/fi_FI.yml

@@ -1,5 +1,5 @@
 fi_FI:
-  EditableSpamProtectionField:
+  SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Roskapostisuotimen kentät'
     SINGULARNAME: 'Roskapostisuotimen kenttä'
     SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'

phpcs.xml.dist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="SilverStripe">
+    <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
+
+    <rule ref="PSR2" >
+        <!-- Current exclusions -->
+        <exclude name="PSR1.Methods.CamelCapsMethodName" />
+        <exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
+    </rule>
+</ruleset>