tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 07:59:31 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Renames Transliterator to SS_Transliterator

Browse Source 
The intl extension in PHP 5.4 provides a Transliterator class, which
conflicts with the SilverStripe one. This leads to some really weird
ReflectionExceptions about Transliterator's constructor being
private.
This commit is contained in:
Simon Welsh 2012-06-15 15:54:47 +12:00
parent e3e15e4007
commit 9bd7765272
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filesystem/FileNameFilter.php
View File

@ -91,22 +91,22 @@ class FileNameFilter extends Object {
}
/**
* @var Transliterator
* @var SS_Transliterator
*/
protected $transliterator;
/**
* @return Transliterator|NULL
* @return SS_Transliterator|NULL
*/
function getTransliterator() {
if($this->transliterator === null && self::$default_use_transliterator) {
$this->transliterator = Transliterator::create();
$this->transliterator = SS_Transliterator::create();
}
return $this->transliterator;
}
/**
* @param Transliterator|FALSE
* @param SS_Transliterator|FALSE
*/
function setTransliterator($t) {
$this->transliterator = $t;

4
model/Transliterator.php
View File

@ -6,14 +6,14 @@
* Usage:
*
* <code>
* $tr = new Transliterator();
* $tr = new SS_Transliterator();
* $ascii = $tr->toASCII($unicode);
* </code>
*
* @package framework
* @subpackage model
*/
class Transliterator extends Object {
class SS_Transliterator extends Object {
/**
* Allow the use of iconv() to perform transliteration. Set to false to disable.
* Even if this variable is true, iconv() won't be used if it's not installed.

10
model/URLSegmentFilter.php
View File

@ -6,7 +6,7 @@
/**
* Filter certain characters from "URL segments" (also called "slugs"), for nicer (more SEO-friendly) URLs.
* Uses {@link Transliterator} to convert non-ASCII characters to meaningful ASCII representations.
* Uses {@link SS_Transliterator} to convert non-ASCII characters to meaningful ASCII representations.
* Use {@link $default_allow_multibyte} to allow a broader range of characters without transliteration.
*
* Caution: Should not be used on full URIs with domains or query parameters.
@ -94,22 +94,22 @@ class URLSegmentFilter extends Object {
}
/**
* @var Transliterator
* @var SS_Transliterator
*/
protected $transliterator;
/**
* @return Transliterator|NULL
* @return SS_Transliterator|NULL
*/
function getTransliterator() {
if($this->transliterator === null && self::$default_use_transliterator) {
$this->transliterator = Transliterator::create();
$this->transliterator = SS_Transliterator::create();
}
return $this->transliterator;
}
/**
* @param Transliterator|FALSE
* @param SS_Transliterator|FALSE
*/
function setTransliterator($t) {
$this->transliterator = $t;

4
tests/filesystem/FileNameFilterTest.php
View File

@ -18,7 +18,7 @@ class FileNameFilterTest extends SapphireTest {
function testFilterWithTransliterator() {
$name = 'Brötchen für allë-mit_Unterstrich!.jpg';
$filter = new FileNameFilter();
$filter->setTransliterator(new Transliterator());
$filter->setTransliterator(new SS_Transliterator());
$this->assertEquals(
'Broetchen-fuer-alle-mit-Unterstrich.jpg',
$filter->filter($name)
@ -39,7 +39,7 @@ class FileNameFilterTest extends SapphireTest {
function testFilterWithEmptyString() {
$name = 'ö ö ö.jpg';
$filter = new FileNameFilter();
$filter->setTransliterator(new Transliterator());
$filter->setTransliterator(new SS_Transliterator());
$result = $filter->filter($name);
$this->assertFalse(
empty($result)