Merge pull request #647 from creative-commoners/pulls/5.0/ss4-compat

API Upgrade for SS4 compatibility

.scrutinizer.yml

@@ -1,9 +1,5 @@
 inherit: true
 
-tools:
-  external_code_coverage:
-    timeout: 1800 # 30 minute delay to allow for coverage reporting taking ages!
-
 checks:
   php:
     code_rating: true

.travis.yml

@@ -1,33 +1,33 @@
-# See https://github.com/silverstripe/silverstripe-travis-support for setup details
-
-sudo: false
-
 language: php
 
+env:
+  global:
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
+
 matrix:
   include:
-    - php: 5.3
-      env: DB=MYSQL CORE_RELEASE=3.4
-    - php: 5.4
-      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.5 SECUREASSETS=1
+      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
+    - php: 7.0
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL CORE_RELEASE=3.6
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
-  - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
-  - "if [ \"$SECUREASSETS\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
-  - "if [ \"$SECUREASSETS\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/secureassets; fi"
-  - cd ~/builds/ss
+  # Init PHP
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+  # Install composer dependencies
+  - composer install --prefer-dist
+  - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev silverstripe-themes/simple:~3.2
+  - composer update
 
 script:
-  - vendor/bin/phpunit --coverage-clover coverage.clover userforms/tests
+  - 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 code/ tests/; fi
 
 after_success:
-  - mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/
-  - cd ~/build/$TRAVIS_REPO_SLUG
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

.upgrade.yml

@@ -0,0 +1,57 @@
+mappings:
+  SecureEditableFileField: SilverStripe\UserForms\Extension\SecureEditableFileField
+  UserFormFieldEditorExtension: SilverStripe\UserForms\Extension\UserFormFieldEditorExtension
+  UserFormValidator: SilverStripe\UserForms\Extension\UserFormValidator
+  GridFieldAddClassesButton: SilverStripe\UserForms\Form\GridFieldAddClassesButton
+  UserForm: SilverStripe\UserForms\Form\UserForm
+  UserFormsGridFieldFilterHeader: SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader
+  UserFormsCheckboxSetField: SilverStripe\UserForms\FormField\UserFormsCheckboxSetField
+  UserFormsCompositeField: SilverStripe\UserForms\FormField\UserFormsCompositeField
+  UserFormsFieldContainer: SilverStripe\UserForms\FormField\UserFormsFieldContainer
+  UserFormsFieldList: SilverStripe\UserForms\FormField\UserFormsFieldList
+  UserFormsGroupField: SilverStripe\UserForms\FormField\UserFormsGroupField
+  UserFormsStepField: SilverStripe\UserForms\FormField\UserFormsStepField
+  EditableCustomRule: SilverStripe\UserForms\Model\EditableCustomRule
+  UserDefinedForm: SilverStripe\UserForms\Model\UserDefinedForm
+  UserDefinedFormController: SilverStripe\UserForms\Model\UserDefinedFormController
+  EditableCheckbox: SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox
+  EditableCheckboxGroupField: SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField
+  EditableCountryDropdownField: SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField
+  EditableDateField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField
+  EditableDateField_FormField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField\FormField
+  EditableDropdown: SilverStripe\UserForms\Model\EditableFormField\EditableDropdown
+  EditableEmailField: SilverStripe\UserForms\Model\EditableFormField\EditableEmailField
+  EditableFieldGroup: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup
+  EditableFieldGroupEnd: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd
+  EditableFileField: SilverStripe\UserForms\Model\EditableFormField\EditableFileField
+  EditableFormField: SilverStripe\UserForms\Model\EditableFormField
+  EditableFormFieldValidator: SilverStripe\UserForms\Model\EditableFormField\Validator
+  EditableFormHeading: SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading
+  EditableFormStep: SilverStripe\UserForms\Model\EditableFormField\EditableFormStep
+  EditableLiteralField: SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField
+  EditableMemberListField: SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField
+  EditableMultipleOptionField: SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField
+  EditableNumericField: SilverStripe\UserForms\Model\EditableFormField\EditableNumericField
+  EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption
+  EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField
+  EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField
+  UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
+  UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition
+  UserFormRecipientItemRequest: SilverStripe\UserForms\Model\Recipient\UserFormRecipientItemRequest
+  SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField
+  SubmittedForm: SilverStripe\UserForms\Model\Submission\SubmittedForm
+  SubmittedFormField: SilverStripe\UserForms\Model\Submission\SubmittedFormField
+  DisambiguationSegmentFieldModifier: SilverStripe\UserForms\Modifier\DisambiguationSegmentFieldModifier
+  UnderscoreSegmentFieldModifier: SilverStripe\UserForms\Modifier\UnderscoreSegmentFieldModifier
+  UserFormsColumnCleanTask: SilverStripe\UserForms\Task\UserFormsColumnCleanTask
+  UserFormTest: SilverStripe\UserForms\Tests\Form\UserFormTest
+  UserFormsCheckboxSetFieldTest: SilverStripe\UserForms\Tests\FormField\UserFormsCheckboxSetFieldTest
+  EditableCustomRuleTest: SilverStripe\UserForms\Tests\Model\EditableCustomRuleTest
+  UserDefinedFormControllerTest: SilverStripe\UserForms\Tests\Model\UserDefinedFormControllerTest
+  UserDefinedFormTest: SilverStripe\UserForms\Tests\Model\UserDefinedFormTest
+  EditableDropdownTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableDropdownTest
+  EditableFileFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableFileFieldTest
+  EditableFormFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormFieldTest
+  EditableLiteralFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\EditableLiteralFieldTest
+  SecureEditableFileFieldTest: SilverStripe\UserForms\Tests\Model\EditableFormField\SecureEditableFileFieldTest
+  UserDefinedForm_EmailRecipientConditionTest: SilverStripe\UserForms\Tests\Model\Recipient\EmailRecipientConditionTest

_config.php

@@ -1,7 +1 @@
 <?php
-
-if (!defined('USERFORMS_DIR')) {
-    define('USERFORMS_DIR', basename(__DIR__));
-}
-
-Deprecation::notification_version('3.0', 'userforms');

_config/legacy.yml

@@ -0,0 +1,31 @@
+---
+Name: userformslegacy
+---
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    EditableCheckbox: SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox
+    EditableCheckboxGroupField: SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField
+    EditableCountryDropdownField: SilverStripe\UserForms\Model\EditableFormField\EditableCountryDropdownField
+    EditableDateField: SilverStripe\UserForms\Model\EditableFormField\EditableDateField
+    EditableDropdown: SilverStripe\UserForms\Model\EditableFormField\EditableDropdown
+    EditableEmailField: SilverStripe\UserForms\Model\EditableFormField\EditableEmailField
+    EditableFieldGroup: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup
+    EditableFieldGroupEnd: SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd
+    EditableFileField: SilverStripe\UserForms\Model\EditableFormField\EditableFileField
+    EditableFormHeading: SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading
+    EditableFormStep: SilverStripe\UserForms\Model\EditableFormField\EditableFormStep
+    EditableLiteralField: SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField
+    EditableMemberListField: SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField
+    EditableMultipleOptionField: SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField
+    EditableNumericField: SilverStripe\UserForms\Model\EditableFormField\EditableNumericField
+    EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption
+    EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField
+    EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField
+    EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
+    EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition
+    SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField
+    SubmittedForm: SilverStripe\UserForms\Model\Submission\SubmittedForm
+    SubmittedFormField: SilverStripe\UserForms\Model\Submission\SubmittedFormField
+    EditableCustomRule: SilverStripe\UserForms\Model\EditableCustomRule
+    EditableFormField: SilverStripe\UserForms\Model\EditableFormField
+    UserDefinedForm: SilverStripe\UserForms\Model\UserDefinedForm

_config/routes.yml

@@ -2,6 +2,6 @@
 Name: userformsroutes
 After: framework/routes#coreroutes
 ---
-Director:
+SilverStripe\Control\Director:
   rules:
-    'UserDefinedForm_Controller//$Action' : 'UserDefinedForm_Controller'
+    UserDefinedFormController//$Action: SilverStripe\UserForms\Model\UserDefinedFormController

_config/secureassets.yml

@@ -3,14 +3,13 @@ Name: userformssecurity
 Only:
   ModuleExists: secureassets
 ---
-EditableFileField:
+SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
   extensions:
-    - SecureEditableFileField
-
+    - SilverStripe\UserForms\Extension\SecureEditableFileField
 ---
 Name: userformsnosecurity
 Except:
   ModuleExists: secureassets
 ---
-EditableFileField:
-  hidden: true
+SilverStripe\UserForms\Model\EditableFormField\EditableFileField:
+  hidden: true