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

FIX Codesniffer style violations with comments

Browse Source
This commit is contained in:
Robbie Averill 2018-06-11 09:55:18 +12:00
parent a8f14f96ed
commit d842225df6
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Forms/HTMLEditor/HTMLEditorSanitiser.php
View File

@ -114,8 +114,8 @@ class HTMLEditorSanitiser
if ($attrType === '!') {
$element->attributesRequired[] = $attrName;
$attr->required = true;
} // Denied from global
elseif ($attrType === '-') {
} elseif ($attrType === '-') {
// Denied from global
unset($element->attributes[$attrName]);
continue;
}
@ -126,12 +126,12 @@ class HTMLEditorSanitiser
if ($prefix === '=') {
$element->attributesDefault[$attrName] = $value;
$attr->defaultValue = $value;
} // Forced value
elseif ($prefix === ':') {
} elseif ($prefix === ':') {
// Forced value
$element->attributesForced[$attrName] = $value;
$attr->forcedValue = $value;
} // Required values
elseif ($prefix === '<') {
} elseif ($prefix === '<') {
// Required values
$attr->validValues = explode('?', $value);
}
}
@ -290,8 +290,8 @@ class HTMLEditorSanitiser
// If it's a script or style, we don't keep contents
if ($el->tagName === 'script' || $el->tagName === 'style') {
$el->parentNode->removeChild($el);
} // Otherwise we replace this node with all it's children
else {
} else {
// Otherwise we replace this node with all it's children
// First, create a new fragment with all of $el's children moved into it
$frag = $doc->createDocumentFragment();
while ($el->firstChild) {
@ -301,8 +301,8 @@ class HTMLEditorSanitiser
// Then replace $el with the frags contents (which used to be it's children)
$el->parentNode->replaceChild($frag, $el);
}
} // Otherwise tidy the element
else {
} else {
// Otherwise tidy the element
// First, if we're supposed to pad & this element is empty, fix that
if ($elementRule->paddEmpty && !$el->firstChild) {
$el->nodeValue = '&nbsp;';

4
src/ORM/Queries/SQLSelect.php
View File

@ -622,8 +622,8 @@ class SQLSelect extends SQLConditionalExpression
if (!empty($this->having)) {
$records = $this->execute();
return $records->numRecords();
} // Choose a default column
elseif ($column == null) {
} elseif ($column == null) {
// Choose a default column
if ($this->groupby) {
$column = 'DISTINCT ' . implode(", ", $this->groupby);
} else {

16
src/View/Parsers/ShortcodeParser.php
View File

@ -573,8 +573,8 @@ class ShortcodeParser
} elseif ($location == self::AFTER) {
// Move after block parent
$this->insertAfter($node, $parent);
} // Split parent at node
elseif ($location == self::SPLIT) {
} elseif ($location == self::SPLIT) {
// Split parent at node
$at = $node;
$splitee = $node->parentNode;
@ -593,8 +593,8 @@ class ShortcodeParser
}
$this->insertAfter($node, $parent);
} // Do nothing
elseif ($location == self::INLINE) {
} elseif ($location == self::INLINE) {
// Do nothing
if (in_array(strtolower($node->tagName), self::$block_level_elements)) {
user_error(
'Requested to insert block tag ' . $node->tagName . ' inline - probably this will break HTML compliance',
@ -646,11 +646,11 @@ class ShortcodeParser
// If no shortcodes defined, don't try and parse any
if (!$this->shortcodes) {
$continue = false;
} // If no content, don't try and parse it
elseif (!trim($content)) {
} elseif (!trim($content)) {
// If no content, don't try and parse it
$continue = false;
} // If no shortcode tag, don't try and parse it
elseif (strpos($content, '[') === false) {
} elseif (strpos($content, '[') === false) {
// If no shortcode tag, don't try and parse it
$continue = false;
}