diff --git a/src/Forms/CurrencyField_Disabled.php b/src/Forms/CurrencyField_Disabled.php index 26a5106f8..7e743755e 100644 --- a/src/Forms/CurrencyField_Disabled.php +++ b/src/Forms/CurrencyField_Disabled.php @@ -22,7 +22,7 @@ class CurrencyField_Disabled extends CurrencyField { if ($this->value) { $val = Convert::raw2xml($this->value); - $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.]/', "", $val), 2); + $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2); $valforInput = Convert::raw2att($val); } else { $valforInput = ''; diff --git a/src/Forms/CurrencyField_Readonly.php b/src/Forms/CurrencyField_Readonly.php index 866c09c61..775b9eb6b 100644 --- a/src/Forms/CurrencyField_Readonly.php +++ b/src/Forms/CurrencyField_Readonly.php @@ -20,7 +20,7 @@ class CurrencyField_Readonly extends ReadonlyField { if ($this->value) { $val = Convert::raw2xml($this->value); - $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.]/', "", $val), 2); + $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2); $valforInput = Convert::raw2att($val); } else { $val = '' . _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . '0.00'; diff --git a/src/Forms/HTMLEditor/HTMLEditorSanitiser.php b/src/Forms/HTMLEditor/HTMLEditorSanitiser.php index ca4e5f407..343e8253b 100644 --- a/src/Forms/HTMLEditor/HTMLEditorSanitiser.php +++ b/src/Forms/HTMLEditor/HTMLEditorSanitiser.php @@ -4,7 +4,6 @@ namespace SilverStripe\Forms\HTMLEditor; use DOMAttr; use DOMElement; -use DOMNode; use SilverStripe\Core\Injector\Injectable; use SilverStripe\View\Parsers\HTMLValue; use stdClass; @@ -114,24 +113,20 @@ 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; } // Default value if ($prefix) { - // Default value - if ($prefix === '=') { + if ($prefix === '=') { // Default value $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 +285,7 @@ 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 +295,7 @@ 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 = ' '; diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php index ca4cf309f..f3fbae164 100644 --- a/src/ORM/Connect/PDOConnector.php +++ b/src/ORM/Connect/PDOConnector.php @@ -176,9 +176,11 @@ class PDOConnector extends DBConnector if (!isset($charset)) { $charset = $connCharset; } - $options = array( - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $charset . ' COLLATE ' . $connCollation - ); + + $options = []; + if ($parameters['driver'] === 'mysql') { + $options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $charset . ' COLLATE ' . $connCollation; + } // Set SSL options if they are defined if (array_key_exists('ssl_key', $parameters) && diff --git a/src/ORM/Queries/SQLSelect.php b/src/ORM/Queries/SQLSelect.php index 8eef054e4..50f67c3f3 100644 --- a/src/ORM/Queries/SQLSelect.php +++ b/src/ORM/Queries/SQLSelect.php @@ -622,8 +622,7 @@ 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 { diff --git a/src/View/Parsers/ShortcodeParser.php b/src/View/Parsers/ShortcodeParser.php index 37be5c631..0a70ea089 100644 --- a/src/View/Parsers/ShortcodeParser.php +++ b/src/View/Parsers/ShortcodeParser.php @@ -573,8 +573,7 @@ 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 +592,7 @@ 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', @@ -638,7 +636,6 @@ class ShortcodeParser */ public function parse($content) { - $this->extend('onBeforeParse', $content); $continue = true; @@ -646,11 +643,9 @@ 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; } @@ -659,7 +654,7 @@ class ShortcodeParser // use a proper DOM list($content, $tags) = $this->replaceElementTagsWithMarkers($content); - /** @var HTMLValue $htmlvalue */ + /** @var HTMLValue $htmlvalue */ $htmlvalue = Injector::inst()->create('HTMLValue', $content); // Now parse the result into a DOM diff --git a/tests/php/Control/DirectorTest.php b/tests/php/Control/DirectorTest.php index 590dfc067..e6da8b089 100644 --- a/tests/php/Control/DirectorTest.php +++ b/tests/php/Control/DirectorTest.php @@ -31,7 +31,7 @@ class DirectorTest extends SapphireTest Director::config()->set('alternate_base_url', 'http://www.mysite.com:9090/'); // Ensure redirects enabled on all environments and global state doesn't affect the tests - CanonicalURLMiddleware::singleton() + CanonicalURLMiddleware::singleton() ->setForceSSLDomain(null) ->setForceSSLPatterns([]) ->setEnabledEnvs(true); diff --git a/tests/php/ORM/DataObjectDuplicationTest/Dingo.php b/tests/php/ORM/DataObjectDuplicationTest/Dingo.php index 879ecbd5d..7be607386 100644 --- a/tests/php/ORM/DataObjectDuplicationTest/Dingo.php +++ b/tests/php/ORM/DataObjectDuplicationTest/Dingo.php @@ -30,4 +30,6 @@ class Dingo extends DataObject implements TestOnly private static $belongs_many_many = [ 'Parents' => Dingo::class, ]; + + private static $default_sort = '"ID" ASC'; }