From cd314d3a3c7da6a616f18d8396ead750c1b989da Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 11 Aug 2017 12:36:28 +1200 Subject: [PATCH] FIX Namespacing errors and method incompatibilities with parent classes --- code/Extension/UserFormFieldEditorExtension.php | 2 +- code/Extension/UserFormValidator.php | 2 +- code/FormField/UserFormsCompositeField.php | 2 +- code/FormField/UserFormsFieldContainer.php | 2 +- code/FormField/UserFormsFieldList.php | 2 +- code/FormField/UserFormsGroupField.php | 2 +- code/Model/EditableCustomRule.php | 4 ++-- code/Model/EditableFormField.php | 5 ++--- .../EditableFormField/EditableCountryDropdownField.php | 1 + code/Model/EditableFormField/EditableFieldGroup.php | 1 + .../EditableFormField/EditableMultipleOptionField.php | 2 +- code/Model/EditableFormField/EditableOption.php | 2 +- code/Model/Recipient/EmailRecipient.php | 4 ++-- code/Model/Recipient/EmailRecipientCondition.php | 4 ++-- code/Model/Recipient/UserFormRecipientEmail.php | 7 +++++-- code/Model/Submission/SubmittedForm.php | 2 +- code/Model/Submission/SubmittedFormField.php | 2 +- code/Model/UserDefinedForm.php | 2 -- code/Task/UserFormsColumnCleanTask.php | 2 +- tests/Model/EditableFormFieldTest.php | 2 +- tests/Model/UserDefinedFormTest.php | 4 ++-- 21 files changed, 29 insertions(+), 27 deletions(-) diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php index 9ed674c..de0205c 100644 --- a/code/Extension/UserFormFieldEditorExtension.php +++ b/code/Extension/UserFormFieldEditorExtension.php @@ -15,7 +15,7 @@ use SilverStripe\ORM\DataExtension; use SilverStripe\UserForms\Form\GridFieldAddClassesButton; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep; use SilverStripe\UserForms\Model\EditableFormField\EditableTextField; use SilverStripe\Versioned\Versioned; diff --git a/code/Extension/UserFormValidator.php b/code/Extension/UserFormValidator.php index 504d496..d0306bb 100644 --- a/code/Extension/UserFormValidator.php +++ b/code/Extension/UserFormValidator.php @@ -5,7 +5,7 @@ namespace SilverStripe\UserForms\Extension; use SilverStripe\Forms\RequiredFields; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep; class UserFormValidator extends RequiredFields diff --git a/code/FormField/UserFormsCompositeField.php b/code/FormField/UserFormsCompositeField.php index ff70c89..bef9624 100644 --- a/code/FormField/UserFormsCompositeField.php +++ b/code/FormField/UserFormsCompositeField.php @@ -3,7 +3,7 @@ namespace SilverStripe\UserForms\FormField; use SilverStripe\Forms\CompositeField; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep; /** diff --git a/code/FormField/UserFormsFieldContainer.php b/code/FormField/UserFormsFieldContainer.php index c07a2a6..0a21037 100644 --- a/code/FormField/UserFormsFieldContainer.php +++ b/code/FormField/UserFormsFieldContainer.php @@ -2,7 +2,7 @@ namespace SilverStripe\UserForms\FormField; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; /** * Represents a field container which can iteratively process nested fields, converting it into a fieldset diff --git a/code/FormField/UserFormsFieldList.php b/code/FormField/UserFormsFieldList.php index 7999856..ae9948c 100644 --- a/code/FormField/UserFormsFieldList.php +++ b/code/FormField/UserFormsFieldList.php @@ -3,7 +3,7 @@ namespace SilverStripe\UserForms\FormField; use SilverStripe\Forms\FieldList; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; /** * A list of formfields which allows for iterative processing of nested composite fields diff --git a/code/FormField/UserFormsGroupField.php b/code/FormField/UserFormsGroupField.php index 7fc9358..643f779 100644 --- a/code/FormField/UserFormsGroupField.php +++ b/code/FormField/UserFormsGroupField.php @@ -3,7 +3,7 @@ namespace SilverStripe\UserForms\FormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; /** * Front end composite field for userforms diff --git a/code/Model/EditableCustomRule.php b/code/Model/EditableCustomRule.php index eaf2294..8cca3c9 100644 --- a/code/Model/EditableCustomRule.php +++ b/code/Model/EditableCustomRule.php @@ -7,7 +7,7 @@ use SilverStripe\CMS\Controllers\CMSMain; use SilverStripe\Control\Controller; use SilverStripe\Core\Convert; use SilverStripe\ORM\DataObject; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use Silverstripe\Versioned\Versioned; /** @@ -112,7 +112,7 @@ class EditableCustomRule extends DataObject * @param array $context Virtual parameter to allow context to be passed in to check * @return bool */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { // Check parent page $parent = $this->getCanCreateContext(func_get_args()); diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php index 87dba34..322e197 100755 --- a/code/Model/EditableFormField.php +++ b/code/Model/EditableFormField.php @@ -1,6 +1,6 @@ getCanCreateContext(func_get_args()); diff --git a/code/Model/EditableFormField/EditableCountryDropdownField.php b/code/Model/EditableFormField/EditableCountryDropdownField.php index ddf0314..ba2451f 100644 --- a/code/Model/EditableFormField/EditableCountryDropdownField.php +++ b/code/Model/EditableFormField/EditableCountryDropdownField.php @@ -4,6 +4,7 @@ namespace SilverStripe\UserForms\Model\EditableFormField; use CountryDropdownField; // @todo use SilverStripe\UserForms\Model\EditableCustomRule; +use SilverStripe\UserForms\Model\EditableFormField; /** * A dropdown field which allows the user to select a country diff --git a/code/Model/EditableFormField/EditableFieldGroup.php b/code/Model/EditableFormField/EditableFieldGroup.php index 5162161..dd893af 100644 --- a/code/Model/EditableFormField/EditableFieldGroup.php +++ b/code/Model/EditableFormField/EditableFieldGroup.php @@ -5,6 +5,7 @@ namespace SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\Core\Convert; use SilverStripe\Forms\LabelField; use SilverStripe\UserForms\FormField\UserFormsGroupField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; /** diff --git a/code/Model/EditableFormField/EditableMultipleOptionField.php b/code/Model/EditableFormField/EditableMultipleOptionField.php index 9039afd..3cfbf2a 100644 --- a/code/Model/EditableFormField/EditableMultipleOptionField.php +++ b/code/Model/EditableFormField/EditableMultipleOptionField.php @@ -194,7 +194,7 @@ class EditableMultipleOptionField extends EditableFormField * * @return DataObject */ - public function duplicate($doWrite = true) + public function duplicate($doWrite = true, $manyMany = 'many_many') { $clonedNode = parent::duplicate(); diff --git a/code/Model/EditableFormField/EditableOption.php b/code/Model/EditableFormField/EditableOption.php index 297bdfb..202ffc3 100644 --- a/code/Model/EditableFormField/EditableOption.php +++ b/code/Model/EditableFormField/EditableOption.php @@ -110,7 +110,7 @@ class EditableOption extends DataObject * @param array $context Virtual parameter to allow context to be passed in to check * @return bool */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { // Check parent page $parent = $this->getCanCreateContext(func_get_args()); diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php index 52abf83..c63fb09 100644 --- a/code/Model/Recipient/EmailRecipient.php +++ b/code/Model/Recipient/EmailRecipient.php @@ -26,7 +26,7 @@ use SilverStripe\Forms\TextField; use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField; use SilverStripe\UserForms\Model\EditableFormField\EditableTextField; use SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition; @@ -376,7 +376,7 @@ class EmailRecipient extends DataObject * @param array $context Virtual parameter to allow context to be passed in to check * @return bool */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { // Check parent page $parent = $this->getCanCreateContext(func_get_args()); diff --git a/code/Model/Recipient/EmailRecipientCondition.php b/code/Model/Recipient/EmailRecipientCondition.php index 06b82ed..d934002 100644 --- a/code/Model/Recipient/EmailRecipientCondition.php +++ b/code/Model/Recipient/EmailRecipientCondition.php @@ -7,7 +7,7 @@ use SilverStripe\CMS\Controllers\CMSMain; use SilverStripe\Control\Controller; use SilverStripe\ORM\DataObject; use SilverStripe\UserForms\Model\Recipient\EmailRecipient; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; /** * Declares a condition that determines whether an email can be sent to a given recipient @@ -109,7 +109,7 @@ class EmailRecipientCondition extends DataObject * @param array $context Virtual parameter to allow context to be passed in to check * @return bool */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { // Check parent page $parent = $this->getCanCreateContext(func_get_args()); diff --git a/code/Model/Recipient/UserFormRecipientEmail.php b/code/Model/Recipient/UserFormRecipientEmail.php index a20d938..7547fd6 100644 --- a/code/Model/Recipient/UserFormRecipientEmail.php +++ b/code/Model/Recipient/UserFormRecipientEmail.php @@ -26,10 +26,13 @@ class UserFormRecipientEmail extends Email * Set the "Reply-To" header with an email address rather than append as * {@link Email::replyTo} does. * - * @param string $email The email address to set the "Reply-To" header to + * @param string|array $address + * @param string|null $name + * @return $this */ - public function setReplyTo($email) + public function setReplyTo($address, $name = null) { $this->customHeaders['Reply-To'] = $email; + return $this; } } diff --git a/code/Model/Submission/SubmittedForm.php b/code/Model/Submission/SubmittedForm.php index b1a6579..e3d7b7d 100755 --- a/code/Model/Submission/SubmittedForm.php +++ b/code/Model/Submission/SubmittedForm.php @@ -117,7 +117,7 @@ class SubmittedForm extends DataObject * * @return boolean */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { $extended = $this->extendedCan(__FUNCTION__, $member); if ($extended !== null) { diff --git a/code/Model/Submission/SubmittedFormField.php b/code/Model/Submission/SubmittedFormField.php index 3f71a2c..d876169 100755 --- a/code/Model/Submission/SubmittedFormField.php +++ b/code/Model/Submission/SubmittedFormField.php @@ -34,7 +34,7 @@ class SubmittedFormField extends DataObject * * @return boolean */ - public function canCreate($member = null) + public function canCreate($member = null, $context = []) { return $this->Parent()->canCreate(); } diff --git a/code/Model/UserDefinedForm.php b/code/Model/UserDefinedForm.php index 2e6997a..273d664 100755 --- a/code/Model/UserDefinedForm.php +++ b/code/Model/UserDefinedForm.php @@ -5,7 +5,6 @@ namespace SilverStripe\UserForms\Model; use Page; use Colymba\BulkManager\BulkManager; use SilverStripe\Core\Injector\Injector; - use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\FieldList; @@ -33,7 +32,6 @@ use SilverStripe\ORM\DB; use SilverStripe\UserForms\Extension\UserFormFieldEditorExtension; use SilverStripe\UserForms\Extension\UserFormValidator; use SilverStripe\UserForms\Form\UserFormsGridFieldFilterHeader; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; use SilverStripe\UserForms\Model\Recipient\EmailRecipient; use SilverStripe\UserForms\Model\Recipient\UserFormRecipientItemRequest; use SilverStripe\UserForms\Model\Submission\SubmittedForm; diff --git a/code/Task/UserFormsColumnCleanTask.php b/code/Task/UserFormsColumnCleanTask.php index 697c962..2ec8a52 100644 --- a/code/Task/UserFormsColumnCleanTask.php +++ b/code/Task/UserFormsColumnCleanTask.php @@ -5,7 +5,7 @@ namespace SilverStripe\UserForms\Task; use SilverStripe\Dev\MigrationTask; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; /** * UserForms Column Clean Task diff --git a/tests/Model/EditableFormFieldTest.php b/tests/Model/EditableFormFieldTest.php index f18e2bf..76b48c3 100644 --- a/tests/Model/EditableFormFieldTest.php +++ b/tests/Model/EditableFormFieldTest.php @@ -10,7 +10,7 @@ use SilverStripe\Security\Member; use SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox; use SilverStripe\UserForms\Model\EditableFormField\EditableDropdown; use SilverStripe\UserForms\Model\EditableFormField\EditableFileField; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableOption; use SilverStripe\UserForms\Model\EditableFormField\EditableRadioField; use SilverStripe\UserForms\Model\EditableFormField\EditableTextField; diff --git a/tests/Model/UserDefinedFormTest.php b/tests/Model/UserDefinedFormTest.php index c1a1376..0954da0 100644 --- a/tests/Model/UserDefinedFormTest.php +++ b/tests/Model/UserDefinedFormTest.php @@ -16,7 +16,7 @@ use SilverStripe\UserForms\Extension\UserFormValidator; use SilverStripe\UserForms\Model\EditableCustomRule; use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField; use SilverStripe\UserForms\Model\EditableFormField\EditableDropdown; -use SilverStripe\UserForms\Model\EditableFormField\EditableFormField; +use SilverStripe\UserForms\Model\EditableFormField; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup; use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd; use SilverStripe\UserForms\Model\Recipient\EmailRecipient; @@ -50,7 +50,7 @@ class UserDefinedFormTest extends FunctionalTest $form->doPublish(); // check published site - $updated = Versioned::get_one_by_stage(UserDefinedForm::class, 'Stage', \"UserDefinedForm\".\"ID\" = $form->ID"); + $updated = Versioned::get_one_by_stage(UserDefinedForm::class, 'Stage', "\"UserDefinedForm\".\"ID\" = $form->ID"); $this->assertEquals($updated->SubmitButtonText, 'Updated Button Text'); $form->doRollbackTo($origVersion);