tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9464 from mattclegg/1586149337

Browse Source 
DOCS: Minor changes
This commit is contained in:
Daniel Hensby 2020-04-14 11:42:56 +01:00 committed by GitHub
commit cd1bd2a5a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/FormRequestHandler.php
View File

@ -217,7 +217,7 @@ class FormRequestHandler extends RequestHandler
// Action handlers may throw ValidationExceptions. // Action handlers may throw ValidationExceptions.
try { try {
// Or we can use the Valiator attached to the form // Or we can use the Validator attached to the form
$result = $this->form->validationResult(); $result = $this->form->validationResult();
if (!$result->isValid()) { if (!$result->isValid()) {
return $this->getValidationErrorResponse($result); return $this->getValidationErrorResponse($result);
@ -247,7 +247,7 @@ class FormRequestHandler extends RequestHandler
return $this->invokeFormHandler($field, ...$args); return $this->invokeFormHandler($field, ...$args);
} }
} catch (ValidationException $e) { } catch (ValidationException $e) {
// The ValdiationResult contains all the relevant metadata // The ValidationResult contains all the relevant metadata
$result = $e->getResult(); $result = $e->getResult();
$this->form->loadMessagesFrom($result); $this->form->loadMessagesFrom($result);
return $this->getValidationErrorResponse($result); return $this->getValidationErrorResponse($result);

4
src/ORM/DataList.php
View File

@ -184,7 +184,7 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
* Returns the SQL query that will be used to get this DataList's records. Good for debugging. :-) * Returns the SQL query that will be used to get this DataList's records. Good for debugging. :-)
* *
* @param array $parameters Out variable for parameters required for this query * @param array $parameters Out variable for parameters required for this query
* @return string The resulting SQL query (may be paramaterised) * @return string The resulting SQL query (may be parameterised)
*/ */
public function sql(&$parameters = []) public function sql(&$parameters = [])
{ {
@ -363,7 +363,7 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
} }
/** /**
* Return a copy of this list which only includes items with these charactaristics * Return a copy of this list which only includes items with these characteristics
* *
* @see SS_List::filter() * @see SS_List::filter()
* *

2
src/Security/Permission.php
View File

@ -729,7 +729,7 @@ class Permission extends DataObject implements TemplateGlobalProvider, Resettabl
public function provideI18nEntities() public function provideI18nEntities()
{ {
$keys = parent::provideI18nEntities(); // TODO: Change the autogenerated stub $keys = parent::provideI18nEntities();
// Localise all permission categories // Localise all permission categories
$keys[__CLASS__ . '.AdminGroup'] = 'Administrator'; $keys[__CLASS__ . '.AdminGroup'] = 'Administrator';

2
tests/php/Forms/DatetimeFieldTest.php
View File

@ -30,7 +30,7 @@ class DatetimeFieldTest extends SapphireTest
{ {
DBDatetime::clear_mock_now(); DBDatetime::clear_mock_now();
date_default_timezone_set($this->timezone); date_default_timezone_set($this->timezone);
parent::tearDown(); // TODO: Change the autogenerated stub parent::tearDown();
} }
public function testFormSaveInto() public function testFormSaveInto()