From 1743ed155603a2eb322ce1f7e72928d4e1ff0365 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 14 Dec 2016 10:45:42 +1300
Subject: [PATCH 1/2] BUG Fix issue with UserFormsCheckboxSetField Fixes #533

---
 code/formfields/UserFormsCheckboxSetField.php | 12 --------
 tests/UserFormsCheckboxSetFieldTest.php       | 29 +++++++++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 tests/UserFormsCheckboxSetFieldTest.php

diff --git a/code/formfields/UserFormsCheckboxSetField.php b/code/formfields/UserFormsCheckboxSetField.php
index 32ccb9b..d484105 100644
--- a/code/formfields/UserFormsCheckboxSetField.php
+++ b/code/formfields/UserFormsCheckboxSetField.php
@@ -23,18 +23,6 @@ class UserFormsCheckboxSetField extends CheckboxSetField
         return $options;
     }
 
-    /**
-     * @inheritdoc
-     *
-     * @return array
-     */
-    public function getSourceAsArray()
-    {
-        $array = parent::getSourceAsArray();
-
-        return array_values($array);
-    }
-
     /**
      * @inheritdoc
      *
diff --git a/tests/UserFormsCheckboxSetFieldTest.php b/tests/UserFormsCheckboxSetFieldTest.php
new file mode 100644
index 0000000..de2ede6
--- /dev/null
+++ b/tests/UserFormsCheckboxSetFieldTest.php
@@ -0,0 +1,29 @@
+<?php
+
+class UserFormsCheckboxSetFieldTest extends SapphireTest
+{
+    public function testValidate() {
+        $field = new UserFormsCheckboxSetField('Field', 'My field', array('One' => 'One', 'Two' => 'Two'));
+        $validator = new RequiredFields();
+
+        // String values
+        $field->setValue('One');
+        $this->assertTrue($field->validate($validator));
+        $field->setValue('One,Two');
+        $this->assertTrue($field->validate($validator));
+        $field->setValue('Three,Four');
+        $this->assertFalse($field->validate($validator));
+
+        // Array values
+        $field->setValue(array('One'));
+        $this->assertTrue($field->validate($validator));
+        $field->setValue(array('One', 'Two'));
+        $this->assertTrue($field->validate($validator));
+
+        // Invalid
+        $field->setValue('Three');
+        $this->assertFalse($field->validate($validator));
+        $field->setValue(array('Three', 'Four'));
+        $this->assertFalse($field->validate($validator));
+    }
+}
\ No newline at end of file

From 26380e71358d31c6b9c296e4583ef97510a58b7d Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 16 Dec 2016 10:15:36 +1300
Subject: [PATCH 2/2] Update .travis.yl

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6367e79..633ef98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,13 @@ language: php
 matrix:
   include:
     - php: 5.3
-      env: DB=MYSQL CORE_RELEASE=3.1
+      env: DB=MYSQL CORE_RELEASE=3.4
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3.2
-    - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=3.3
+      env: DB=MYSQL CORE_RELEASE=3.5
     - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.1 SECUREASSETS=1
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.3
+      env: DB=MYSQL CORE_RELEASE=3.5 SECUREASSETS=1
 
 before_script:
   - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@@ -28,6 +24,7 @@ before_script:
 script:
   - vendor/bin/phpunit --coverage-clover coverage.clover userforms/tests
   - wget https://scrutinizer-ci.com/ocular.phar
+  - cd ./userforms
   - git remote rm origin
   - git remote add origin git@github.com:silverstripe/silverstripe-userforms.git
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover