mirror/stringy
1
0
Fork 0
mirror of https://github.com/danielstjules/Stringy.git synced 2025-08-12 08:14:06 +02:00
Code Issues Releases Wiki Activity

Merge pull request #75 from vlakoff/tweak

Browse Source 
Minor improvements
This commit is contained in:
Daniel St. Jules
2015-01-16 18:50:54 -08:00
parent 40974608d4 36c3fd05d2
commit 66c2a98e83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Stringy.php
View File

@@ -277,7 +277,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
*/ */
public function dasherize() public function dasherize()
{ {
return $this->applyDelimeter('-'); return $this->applyDelimiter('-');
} }
/** /**
@@ -290,7 +290,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
*/ */
public function underscored() public function underscored()
{ {
return $this->applyDelimeter('_'); return $this->applyDelimiter('_');
} }
/** /**
@@ -299,13 +299,13 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
* @param string $delimiter Sequence used to separate parts of the string * @param string $delimiter Sequence used to separate parts of the string
* @return Stringy Object with a delimited $str * @return Stringy Object with a delimited $str
*/ */
protected function applyDelimeter($delimiter) protected function applyDelimiter($delimiter)
{ {
// Save current regex encoding so we can reset it after // Save current regex encoding so we can reset it after
$regexEncoding = mb_regex_encoding(); $regexEncoding = mb_regex_encoding();
mb_regex_encoding($this->encoding); mb_regex_encoding($this->encoding);
$str = mb_ereg_replace('\B([A-Z])', $delimiter .'\1', trim($this->str)); $str = mb_ereg_replace('\B([A-Z])', $delimiter .'\1', $this->trim());
$str = mb_ereg_replace('[-_\s]+', $delimiter, $str); $str = mb_ereg_replace('[-_\s]+', $delimiter, $str);
$str = mb_strtolower($str, $this->encoding); $str = mb_strtolower($str, $this->encoding);
@@ -354,7 +354,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
$buffer = preg_replace_callback( $buffer = preg_replace_callback(
'/([\S]+)/u', '/([\S]+)/u',
function ($match) use (&$encoding, &$ignore) { function ($match) use ($encoding, $ignore) {
if ($ignore && in_array($match[0], $ignore)) { if ($ignore && in_array($match[0], $ignore)) {
return $match[0]; return $match[0];
} else { } else {
@@ -776,7 +776,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
$pattern = "/[^a-zA-Z\d\s-_$quotedReplacement]/u"; $pattern = "/[^a-zA-Z\d\s-_$quotedReplacement]/u";
$stringy->str = preg_replace($pattern, '', $stringy->toAscii()); $stringy->str = preg_replace($pattern, '', $stringy->toAscii());
return $stringy->toLowerCase()->applyDelimeter($replacement) return $stringy->toLowerCase()->applyDelimiter($replacement)
->removeLeft($replacement)->removeRight($replacement); ->removeLeft($replacement)->removeRight($replacement);
} }