Minor improvements

Author: assertchris

code/Filter.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace SilverStripe\Forms;
+
+interface Filter {
+	/**
+	 * Filters a value.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public function filter($value);
+}

code/Filter/SlugFilter.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace SilverStripe\Forms\Filter;
+
+use SilverStripe\Forms\Filter;
+use URLSegmentFilter;
+
+class SlugFilter extends URLSegmentFilter implements Filter {
+	/**
+	 * @inheritdoc
+	 *
+	 * @see URLSegmentFilter::filter
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public function filter($value) {
+		if(!$this->getAllowMultibyte()) {
+			$transliterator = $this->getTransliterator();
+
+			if($transliterator) {
+				$value = $transliterator->toASCII($value);
+			}
+		}
+
+		$replacements = $this->getReplacements();
+
+		if($this->getAllowMultibyte() && isset($replacements['/[^A-Za-z0-9\-]+/u'])) {
+			unset($replacements['/[^A-Za-z0-9\-]+/u']);
+		}
+
+		foreach($replacements as $regex => $replace) {
+			$value = preg_replace($regex, $replace, $value);
+		}
+
+		if($this->getAllowMultibyte()) {
+			$value = rawurlencode($value);
+		}
+
+		return $value;
+	}
+}

code/SegmentField.php

@@ -23,6 +23,11 @@ class SegmentField extends TextField {
 	 */
 	protected $modifiers = array();
 
+	/**
+	 * @var string
+	 */
+	protected $preview = '';
+
 	/**
 	 * @param array $modifiers
 	 *
@@ -41,6 +46,24 @@ public function getModifiers() {
 		return $this->modifiers;
 	}
 
+	/**
+	 * @param string $preview
+	 *
+	 * @return $this
+	 */
+	public function setPreview($preview) {
+		$this->preview = $preview;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Preview() {
+		return $this->preview;
+	}
+
 	/**
 	 * @inheritdoc
 	 *

code/SegmentFieldModifier/SlugSegmentFieldModifier.php

@@ -2,8 +2,8 @@
 
 namespace SilverStripe\Forms\SegmentFieldModifier;
 
+use SilverStripe\Forms\Filter\SlugFilter;
 use SS_HTTPRequest;
-use URLSegmentFilter;
 
 class SlugSegmentFieldModifier extends AbstractSegmentFieldModifier {
 	/**
@@ -41,7 +41,7 @@ public function getPreview($value) {
 	 * @return string
 	 */
 	public function getSuggestion($value) {
-		if($filtered = URLSegmentFilter::create()->filter($this->getValue())) {
+		if($filtered = SlugFilter::create()->filter($this->getValue())) {
 			return $value . $filtered;
 		}
 

tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php

@@ -33,8 +33,8 @@ public function testGetPreview() {
 
 		$modifier->setRequest($this->getNewRequestMock());
 
-		$this->assertEquals('this-is-a-long-value', $modifier->getPreview(''));
-		$this->assertEquals('this-is-a-long-value', $modifier->getSuggestion(''));
+		$this->assertEquals('This-is-a-LONG-value', $modifier->getPreview(''));
+		$this->assertEquals('This-is-a-LONG-value', $modifier->getSuggestion(''));
 	}
 
 	/**