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

Remove some useless else.

Browse Source
This commit is contained in:
Lucas Michot
2015-12-26 06:04:19 +01:00
parent 54cf92c89c
commit 59ce593086
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Stringy.php
View File

@@ -141,9 +141,9 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
function ($match) use ($encoding) { function ($match) use ($encoding) {
if (isset($match[1])) { if (isset($match[1])) {
return mb_strtoupper($match[1], $encoding); return mb_strtoupper($match[1], $encoding);
} else {
return '';
} }
return '';
}, },
$stringy->str $stringy->str
); );
@@ -201,9 +201,9 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
if ($caseSensitive) { if ($caseSensitive) {
return (mb_strpos($this->str, $needle, 0, $encoding) !== false); return (mb_strpos($this->str, $needle, 0, $encoding) !== false);
} else {
return (mb_stripos($this->str, $needle, 0, $encoding) !== false);
} }
return (mb_stripos($this->str, $needle, 0, $encoding) !== false);
} }
/** /**
@@ -394,11 +394,10 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
if ($n < 0) { if ($n < 0) {
$stringy->str = ''; $stringy->str = '';
} else { return $stringy;
return $stringy->substr(0, $n);
} }
return $stringy; return $stringy->substr(0, $n);
} }
/** /**
@@ -661,11 +660,10 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
if ($n <= 0) { if ($n <= 0) {
$stringy->str = ''; $stringy->str = '';
} else { return $stringy;
return $stringy->substr(-$n);
} }
return $stringy; return $stringy->substr(-$n);
} }
/** /**
@@ -1279,9 +1277,9 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
function ($match) use ($encoding) { function ($match) use ($encoding) {
if ($match[0] == mb_strtoupper($match[0], $encoding)) { if ($match[0] == mb_strtoupper($match[0], $encoding)) {
return mb_strtolower($match[0], $encoding); return mb_strtolower($match[0], $encoding);
} else {
return mb_strtoupper($match[0], $encoding);
} }
return mb_strtoupper($match[0], $encoding);
}, },
$stringy->str $stringy->str
); );
@@ -1331,10 +1329,11 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
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 {
$stringy = new Stringy($match[0], $encoding);
return (string) $stringy->toLowerCase()->upperCaseFirst();
} }
$stringy = new Stringy($match[0], $encoding);
return (string) $stringy->toLowerCase()->upperCaseFirst();
}, },
$stringy->str $stringy->str
); );
@@ -1395,9 +1394,9 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
return $map[$key]; return $map[$key];
} elseif (is_numeric($this->str)) { } elseif (is_numeric($this->str)) {
return (intval($this->str) > 0); return (intval($this->str) > 0);
} else {
return (bool) $this->regexReplace('[[:space:]]', '')->str;
} }
return (bool) $this->regexReplace('[[:space:]]', '')->str;
} }
/** /**