tonyair
/
silverstripe-comments
mirror of https://github.com/silverstripe/silverstripe-comments
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tidy up phpcs violations, use short array syntax, optimise class imports

This commit is contained in:
Robbie Averill 2018-09-24 17:57:31 +02:00
parent 747d4f4402
commit 94950ee79c
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Forms/CommentForm.php
View File

@ -2,7 +2,11 @@
namespace SilverStripe\Comments\Forms; namespace SilverStripe\Comments\Forms;
use SilverStripe\Comments\Controllers\CommentingController;
use SilverStripe\Comments\Model\Comment;
use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Core\Convert;
use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\CompositeField;
use SilverStripe\Forms\EmailField; use SilverStripe\Forms\EmailField;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
@ -14,12 +18,7 @@ use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\TextareaField; use SilverStripe\Forms\TextareaField;
use SilverStripe\Forms\TextField; use SilverStripe\Forms\TextField;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Core\Convert;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\Comments\Model\Comment;
use SilverStripe\Control\Controller;
use SilverStripe\Comments\Controllers\CommentingController;
use SilverStripe\Core\Config\Config;
class CommentForm extends Form class CommentForm extends Form
{ {
@ -121,11 +120,11 @@ class CommentForm extends Form
// we do not want to read a new URL when the form has already been submitted // we do not want to read a new URL when the form has already been submitted
// which in here, it hasn't been. // which in here, it hasn't been.
$this->loadDataFrom(array( $this->loadDataFrom([
'ParentID' => $record->ID, 'ParentID' => $record->ID,
'ReturnURL' => $controller->getRequest()->getURL(), 'ReturnURL' => $controller->getRequest()->getURL(),
'ParentClassName' => $controller->getParentClass() 'ParentClassName' => $controller->getParentClass()
)); ]);
} }
// Set it so the user gets redirected back down to the form upon form fail // Set it so the user gets redirected back down to the form upon form fail
@ -133,26 +132,27 @@ class CommentForm extends Form
// load any data from the session // load any data from the session
$data = $this->getSessionData(); $data = $this->getSessionData();
if (is_array($data)) { if (!is_array($data)) {
return;
}
// load user data from previous form request back into form. // load user data from previous form request back into form.
if (array_key_exists('UserData', $data)) { if (array_key_exists('UserData', $data)) {
$formData = Convert::json2array($data['UserData']); $formData = Convert::json2array($data['UserData']);
$this->loadDataFrom(array( $this->loadDataFrom([
'Name' => isset($formData['Name']) ? $formData['Name'] : '', 'Name' => isset($formData['Name']) ? $formData['Name'] : '',
'URL' => isset($formData['URL']) ? $formData['URL'] : '', 'URL' => isset($formData['URL']) ? $formData['URL'] : '',
'Email' => isset($formData['Email']) ? $formData['Email'] : '' 'Email' => isset($formData['Email']) ? $formData['Email'] : ''
)); ]);
} }
// allow previous value to fill if comment // allow previous value to fill if comment
if (array_key_exists('Comment', $data)) { if (array_key_exists('Comment', $data)) {
$prevComment = $data['Comment']; $prevComment = $data['Comment'];
if ($prevComment && $prevComment != '') { if ($prevComment && $prevComment != '') {
$this->loadDataFrom(array('Comment' => $prevComment)); $this->loadDataFrom(['Comment' => $prevComment]);
}
} }
} }
} }
@ -190,10 +190,10 @@ class CommentForm extends Form
} }
// cache users data // cache users data
$form->setSessionData(array( $form->setSessionData([
'UserData' => Convert::raw2json($data), 'UserData' => Convert::raw2json($data),
'Comment' => $data['Comment'] 'Comment' => $data['Comment']
)); ]);
// extend hook to allow extensions. Also see onAfterPostComment // extend hook to allow extensions. Also see onAfterPostComment
$this->controller->extend('onBeforePostComment', $form); $this->controller->extend('onBeforePostComment', $form);
@ -255,15 +255,15 @@ class CommentForm extends Form
} }
// clear the users comment since the comment was successful. // clear the users comment since the comment was successful.
if($comment->exists()){ if ($comment->exists()) {
// Remove the comment data as it's been saved already. // Remove the comment data as it's been saved already.
unset($data['Comment']); unset($data['Comment']);
} }
// cache users data (name, email, etc to prepopulate on other forms). // cache users data (name, email, etc to prepopulate on other forms).
$form->setSessionData(array( $form->setSessionData([
'UserData' => Convert::raw2json($data), 'UserData' => Convert::raw2json($data),
)); ]);
// Find parent link // Find parent link
if (!empty($data['ReturnURL'])) { if (!empty($data['ReturnURL'])) {