mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-57273 core: Migrating the persistent form class to core

Browse Source
This commit is contained in:
Frederic Massart 2016-12-16 12:21:56 +08:00 committed by Damyon Wiese
parent 4bc68a416e
commit b505a9e4e0
9 changed files with 289 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/tool/lp/classes/form/competency.php
View File

@ -26,6 +26,7 @@ namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use stdClass;
use core\form\persistent;
/**
* Competency framework form.

1
admin/tool/lp/classes/form/competency_framework.php
View File

@ -26,6 +26,7 @@ namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use stdClass;
use core\form\persistent;
/**
* Competency framework form.

246
admin/tool/lp/classes/form/persistent.php
View File

@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Persistent form abstract.
* Legacy persistent form abstract.
*
* @package tool_lp
* @copyright 2015 Frédéric Massart - FMCorz.net
@ -25,251 +25,15 @@
namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use coding_exception;
use moodleform;
use stdClass;
require_once($CFG->libdir.'/formslib.php');
debugging('The class tool_lp\\form\\persistent is deprecated. Please use core\\form\\persistent instead.', DEBUG_DEVELOPER);
/**
* Persistent form abstract class.
*
* This provides some shortcuts to validate objects based on the persistent model.
*
* Note that all mandatory fields (non-optional) of your model should be included in the
* form definition. Mandatory fields which are not editable by the user should be
* as hidden and constant.
*
* $mform->addElement('hidden', 'userid');
* $mform->setType('userid', PARAM_INT);
* $mform->setConstant('userid', $this->_customdata['userid']);
*
* You may exclude some fields from the validation should your form include other
* properties such as files. To do so use the $foreignfields property.
* Legacy persistent form abstract class.
*
* @package tool_lp
* @copyright 2015 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @deprecated since Moodle 3.3
*/
abstract class persistent extends moodleform {
/** @var string The fully qualified classname. */
protected static $persistentclass = null;
/** @var array Fields to remove when getting the final data. */
protected static $fieldstoremove = array('submitbutton');
/** @var array Fields to remove from the persistent validation. */
protected static $foreignfields = array();
/** @var \tool_lp\peristent Reference to the persistent. */
private $persistent = null;
/**
* Constructor.
*
* The 'persistent' has to be passed as custom data when 'editing'.
*
* Note that in order for your persistent to be reloaded after form submission you should
* either override the URL to include the ID to your resource, or add the ID to the form
* fields.
*
* @param mixed $action
* @param mixed $customdata
* @param string $method
* @param string $target
* @param mixed $attributes
* @param bool $editable
*/
public function __construct($action = null, $customdata = null, $method = 'post', $target = '',
$attributes = null, $editable = true) {
if (empty(static::$persistentclass)) {
throw new coding_exception('Static property $persistentclass must be set.');
} else if (!is_subclass_of(static::$persistentclass, 'core_competency\\persistent')) {
throw new coding_exception('Static property $persistentclass is not valid.');
} else if (!array_key_exists('persistent', $customdata)) {
throw new coding_exception('The custom data \'persistent\' key must be set, even if it is null.');
}
// Make a copy of the persistent passed, this ensures validation and object reference issues.
$persistendata = new stdClass();
$persistent = isset($customdata['persistent']) ? $customdata['persistent'] : null;
if ($persistent) {
if (!($persistent instanceof static::$persistentclass)) {
throw new coding_exception('Invalid persistent');
}
$persistendata = $persistent->to_record();
unset($persistent);
}
$this->persistent = new static::$persistentclass();
$this->persistent->from_record($persistendata);
unset($customdata['persistent']);
parent::__construct($action, $customdata, $method, $target, $attributes, $editable);
// Load the defaults.
$this->set_data($this->get_default_data());
}
/**
* Convert some fields.
*
* @param stdClass $data The whole data set.
* @return stdClass The amended data set.
*/
protected static function convert_fields(stdClass $data) {
$class = static::$persistentclass;
$properties = $class::get_formatted_properties();
foreach ($data as $field => $value) {
// Replace formatted properties.
if (isset($properties[$field])) {
$formatfield = $properties[$field];
$data->$formatfield = $data->{$field}['format'];
$data->$field = $data->{$field}['text'];
}
}
return $data;
}
/**
* Define extra validation mechanims.
*
* The data here:
* - does not include {@link self::$fieldstoremove}.
* - does include {@link self::$foreignfields}.
* - was converted to map persistent-like data, e.g. array $description to string $description + int $descriptionformat.
*
* You can modify the $errors parameter in order to remove some validation errors should you
* need to. However, the best practice is to return new or overriden errors. Only modify the
* errors passed by reference when you have no other option.
*
* Do not add any logic here, it is only intended to be used by child classes.
*
* @param stdClass $data Data to validate.
* @param array $files Array of files.
* @param array $errors Currently reported errors.
* @return array of additional errors, or overridden errors.
*/
protected function extra_validation($data, $files, array &$errors) {
return array();
}
/**
* Filter out the foreign fields of the persistent.
*
* This can be overridden to filter out more complex fields.
*
* @param stdClass $data The data to filter the fields out of.
* @return stdClass.
*/
protected function filter_data_for_persistent($data) {
return (object) array_diff_key((array) $data, array_flip((array) static::$foreignfields));
}
/**
* Get the default data.
*
* This is the data that is prepopulated in the form at it loads, we automatically
* fetch all the properties of the persistent however some needs to be converted
* to map the form structure.
*
* Extend this class if you need to add more conversion.
*
* @return stdClass
*/
protected function get_default_data() {
$data = $this->get_persistent()->to_record();
$class = static::$persistentclass;
$properties = $class::get_formatted_properties();
foreach ($data as $field => $value) {
// Convert formatted properties.
if (isset($properties[$field])) {
$data->$field = array(
'text' => $data->$field,
'format' => $data->{$properties[$field]}
);
unset($data->{$properties[$field]});
}
}
return $data;
}
/**
* Get form data.
*
* Conveniently removes non-desired properties and add the ID property.
*
* @return object|null
*/
public function get_data() {
$data = parent::get_data();
if (is_object($data)) {
foreach (static::$fieldstoremove as $field) {
unset($data->{$field});
}
$data = static::convert_fields($data);
// Ensure that the ID is set.
$data->id = $this->persistent->get_id();
}
return $data;
}
/**
* Return the persistent object associated with this form instance.
*
* @return tool_lp\persistent
*/
final protected function get_persistent() {
return $this->persistent;
}
/**
* Get the submitted form data.
*
* Conveniently removes non-desired properties.
*
* @return object|null
*/
public function get_submitted_data() {
$data = parent::get_submitted_data();
if (is_object($data)) {
foreach (static::$fieldstoremove as $field) {
unset($data->{$field});
}
$data = static::convert_fields($data);
}
return $data;
}
/**
* Form validation.
*
* If you need extra validation, use {@link self::extra_validation()}.
*
* @param array $data
* @param array $files
* @return array
*/
public final function validation($data, $files) {
$errors = parent::validation($data, $files);
$data = $this->get_submitted_data();
// Only validate compatible fields.
$persistentdata = $this->filter_data_for_persistent($data);
$persistent = $this->get_persistent();
$persistent->from_record((object) $persistentdata);
$errors = array_merge($errors, $persistent->get_errors());
// Apply extra validation.
$extraerrors = $this->extra_validation($data, $files, $errors);
$errors = array_merge($errors, (array) $extraerrors);
return $errors;
}
abstract class persistent extends \core\form\persistent {
}

1
admin/tool/lp/classes/form/plan.php
View File

@ -25,6 +25,7 @@
namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use core\form\persistent;
use core_competency\plan as planpersistent;
use required_capability_exception;

2
admin/tool/lp/classes/form/template.php
View File

@ -25,6 +25,8 @@
namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use core\form\persistent;
/**
* Learning plan template form.
*

1
admin/tool/lp/classes/form/template_cohorts.php
View File

@ -26,6 +26,7 @@ namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use moodleform;
use core\form\persistent;
require_once($CFG->libdir . '/formslib.php');

1
admin/tool/lp/classes/form/template_plans.php
View File

@ -26,6 +26,7 @@ namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use moodleform;
use core\form\persistent;
require_once($CFG->libdir . '/formslib.php');

2
admin/tool/lp/classes/form/user_evidence.php
View File

@ -25,6 +25,8 @@
namespace tool_lp\form;
defined('MOODLE_INTERNAL') || die();
use core\form\persistent;
/**
* User evidence form class.
*

275
lib/classes/form/persistent.php Normal file
View File

@ -0,0 +1,275 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Persistent form abstract.
*
* @package core
* @copyright 2015 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core\form;
defined('MOODLE_INTERNAL') || die();
use coding_exception;
use moodleform;
use stdClass;
require_once($CFG->libdir.'/formslib.php');
/**
* Persistent form abstract class.
*
* This provides some shortcuts to validate objects based on the persistent model.
*
* Note that all mandatory fields (non-optional) of your model should be included in the
* form definition. Mandatory fields which are not editable by the user should be
* as hidden and constant.
*
* $mform->addElement('hidden', 'userid');
* $mform->setType('userid', PARAM_INT);
* $mform->setConstant('userid', $this->_customdata['userid']);
*
* You may exclude some fields from the validation should your form include other
* properties such as files. To do so use the $foreignfields property.
*
* @package core
* @copyright 2015 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class persistent extends moodleform {
/** @var string The fully qualified classname. */
protected static $persistentclass = null;
/** @var array Fields to remove when getting the final data. */
protected static $fieldstoremove = array('submitbutton');
/** @var array Fields to remove from the persistent validation. */
protected static $foreignfields = array();
/** @var \core\peristent Reference to the persistent. */
private $persistent = null;
/**
* Constructor.
*
* The 'persistent' has to be passed as custom data when 'editing'.
*
* Note that in order for your persistent to be reloaded after form submission you should
* either override the URL to include the ID to your resource, or add the ID to the form
* fields.
*
* @param mixed $action
* @param mixed $customdata
* @param string $method
* @param string $target
* @param mixed $attributes
* @param bool $editable
*/
public function __construct($action = null, $customdata = null, $method = 'post', $target = '',
$attributes = null, $editable = true) {
if (empty(static::$persistentclass)) {
throw new coding_exception('Static property $persistentclass must be set.');
} else if (!is_subclass_of(static::$persistentclass, 'core\\persistent')) {
throw new coding_exception('Static property $persistentclass is not valid.');
} else if (!array_key_exists('persistent', $customdata)) {
throw new coding_exception('The custom data \'persistent\' key must be set, even if it is null.');
}
// Make a copy of the persistent passed, this ensures validation and object reference issues.
$persistendata = new stdClass();
$persistent = isset($customdata['persistent']) ? $customdata['persistent'] : null;
if ($persistent) {
if (!($persistent instanceof static::$persistentclass)) {
throw new coding_exception('Invalid persistent');
}
$persistendata = $persistent->to_record();
unset($persistent);
}
$this->persistent = new static::$persistentclass();
$this->persistent->from_record($persistendata);
unset($customdata['persistent']);
parent::__construct($action, $customdata, $method, $target, $attributes, $editable);
// Load the defaults.
$this->set_data($this->get_default_data());
}
/**
* Convert some fields.
*
* @param stdClass $data The whole data set.
* @return stdClass The amended data set.
*/
protected static function convert_fields(stdClass $data) {
$class = static::$persistentclass;
$properties = $class::get_formatted_properties();
foreach ($data as $field => $value) {
// Replace formatted properties.
if (isset($properties[$field])) {
$formatfield = $properties[$field];
$data->$formatfield = $data->{$field}['format'];
$data->$field = $data->{$field}['text'];
}
}
return $data;
}
/**
* Define extra validation mechanims.
*
* The data here:
* - does not include {@link self::$fieldstoremove}.
* - does include {@link self::$foreignfields}.
* - was converted to map persistent-like data, e.g. array $description to string $description + int $descriptionformat.
*
* You can modify the $errors parameter in order to remove some validation errors should you
* need to. However, the best practice is to return new or overriden errors. Only modify the
* errors passed by reference when you have no other option.
*
* Do not add any logic here, it is only intended to be used by child classes.
*
* @param stdClass $data Data to validate.
* @param array $files Array of files.
* @param array $errors Currently reported errors.
* @return array of additional errors, or overridden errors.
*/
protected function extra_validation($data, $files, array &$errors) {
return array();
}
/**
* Filter out the foreign fields of the persistent.
*
* This can be overridden to filter out more complex fields.
*
* @param stdClass $data The data to filter the fields out of.
* @return stdClass.
*/
protected function filter_data_for_persistent($data) {
return (object) array_diff_key((array) $data, array_flip((array) static::$foreignfields));
}
/**
* Get the default data.
*
* This is the data that is prepopulated in the form at it loads, we automatically
* fetch all the properties of the persistent however some needs to be converted
* to map the form structure.
*
* Extend this class if you need to add more conversion.
*
* @return stdClass
*/
protected function get_default_data() {
$data = $this->get_persistent()->to_record();
$class = static::$persistentclass;
$properties = $class::get_formatted_properties();
foreach ($data as $field => $value) {
// Convert formatted properties.
if (isset($properties[$field])) {
$data->$field = array(
'text' => $data->$field,
'format' => $data->{$properties[$field]}
);
unset($data->{$properties[$field]});
}
}
return $data;
}
/**
* Get form data.
*
* Conveniently removes non-desired properties and add the ID property.
*
* @return object|null
*/
public function get_data() {
$data = parent::get_data();
if (is_object($data)) {
foreach (static::$fieldstoremove as $field) {
unset($data->{$field});
}
$data = static::convert_fields($data);
// Ensure that the ID is set.
$data->id = $this->persistent->get_id();
}
return $data;
}
/**
* Return the persistent object associated with this form instance.
*
* @return core\persistent
*/
final protected function get_persistent() {
return $this->persistent;
}
/**
* Get the submitted form data.
*
* Conveniently removes non-desired properties.
*
* @return object|null
*/
public function get_submitted_data() {
$data = parent::get_submitted_data();
if (is_object($data)) {
foreach (static::$fieldstoremove as $field) {
unset($data->{$field});
}
$data = static::convert_fields($data);
}
return $data;
}
/**
* Form validation.
*
* If you need extra validation, use {@link self::extra_validation()}.
*
* @param array $data
* @param array $files
* @return array
*/
public final function validation($data, $files) {
$errors = parent::validation($data, $files);
$data = $this->get_submitted_data();
// Only validate compatible fields.
$persistentdata = $this->filter_data_for_persistent($data);
$persistent = $this->get_persistent();
$persistent->from_record((object) $persistentdata);
$errors = array_merge($errors, $persistent->get_errors());
// Apply extra validation.
$extraerrors = $this->extra_validation($data, $files, $errors);
$errors = array_merge($errors, (array) $extraerrors);
return $errors;
}
}