1.7.0

Factorize substr

.gitignore

@@ -1 +1,3 @@
 vendor/
+composer.lock
+.DS_Store

.travis.yml

@@ -1,5 +1,7 @@
 language: php
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
+  - hhvm

CHANGELOG.md

@@ -1,3 +1,32 @@
+### 1.7.0 (2014-10-14)
+
+ * Added containsAll and containsAny
+ * Light cleanup
+
+### 1.6.0 (2014-09-14)
+
+ * Added toTitleCase
+
+### 1.5.2 (2014-07-09)
+
+ * Announced support for HHVM
+
+### 1.5.1 (2014-04-19)
+
+  * Fixed toAscii() failing to remove remaining non-ascii characters
+  * Updated slugify() to treat dash and underscore as delimiters by default
+  * Updated slugify() to remove leading and trailing delimiter, if present
+
+### 1.5.0 (2014-03-19)
+
+  * Made both str and encoding protected, giving property access to subclasses
+  * Added getEncoding()
+  * Fixed isJSON() giving false negatives
+  * Cleaned up and simplified: replace(), collapseWhitespace(), underscored(),
+    dasherize(), pad(), padLeft(), padRight() and padBoth()
+  * Fixed handling consecutive invalid chars in slugify()
+  * Removed conflicting hard sign transliteration in toAscii()
+
 ### 1.4.0 (2014-02-12)
 
   * Implemented the IteratorAggregate interface, added chars()

README.md

@@ -1,10 +1,10 @@
-![Stringy](http://danielstjules.com/stringy/logo.png)
+![Stringy](http://danielstjules.com/github/stringy-logo.png)
 
-A PHP library with a variety of string manipulation functions with multibyte
-support. Offers both OO method chaining and a procedural-style static wrapper.
-Compatible with PHP 5.3+. Inspired by underscore.string.js.
+A PHP string manipulation library with multibyte support. Offers both OO method
+chaining and a procedural-style static wrapper. Tested and compatible with
+PHP 5.3+ and HHVM. Inspired by underscore.string.js.
 
-[![Build Status](https://travis-ci.org/danielstjules/Stringy.png)](https://travis-ci.org/danielstjules/Stringy)
+[![Build Status](https://api.travis-ci.org/danielstjules/Stringy.svg?branch=master)](https://travis-ci.org/danielstjules/Stringy)
 
 * [Requiring/Loading](#requiringloading)
 * [OO and Procedural](#oo-and-procedural)
@@ -15,6 +15,8 @@ Compatible with PHP 5.3+. Inspired by underscore.string.js.
     * [chars](#chars)
     * [collapseWhitespace](#collapsewhitespace)
     * [contains](#contains)
+    * [containsAll](#containsall)
+    * [containsAny](#containsany)
     * [countSubstr](#countsubstr)
     * [create](#create)
     * [dasherize](#dasherize)
@@ -22,6 +24,7 @@ Compatible with PHP 5.3+. Inspired by underscore.string.js.
     * [ensureLeft](#ensureleft)
     * [ensureRight](#ensureright)
     * [first](#first)
+    * [getEncoding](#getencoding)
     * [humanize](#humanize)
     * [insert](#insert)
     * [isAlpha](#isalpha)
@@ -60,12 +63,14 @@ Compatible with PHP 5.3+. Inspired by underscore.string.js.
     * [toLowerCase](#tolowercase)
     * [toSpaces](#tospaces)
     * [toTabs](#totabs)
+    * [toTitleCase](#totitlecase)
     * [toUpperCase](#touppercase)
     * [trim](#trim)
     * [truncate](#truncate)
     * [underscored](#underscored)
     * [upperCamelize](#uppercamelize)
     * [upperCaseFirst](#uppercasefirst)
+* [Links](#links)
 * [Tests](#tests)
 * [License](#license)
 
@@ -74,9 +79,13 @@ Compatible with PHP 5.3+. Inspired by underscore.string.js.
 If you're using Composer to manage dependencies, you can include the following
 in your composer.json file:
 
+```json
+{
     "require": {
-        "danielstjules/stringy": "dev-master"
+        "danielstjules/stringy": "~1.7"
     }
+}
+```
 
 Then, after running `composer update` or `php composer.phar update`, you can
 load the class using Composer's autoloading:
@@ -242,6 +251,36 @@ S::create('Ο συγγραφέας είπε', 'UTF-8')->contains('συγγραφ
 S::contains('Ο συγγραφέας είπε', 'συγγραφέας', 'UTF-8');  // true
 ```
 
+#### containsAll
+
+$stringy->containsAll(array $needles [, boolean $caseSensitive = true ])
+
+S::containsAll(string $haystack, array $needles [, boolean $caseSensitive = true [, string $encoding ]])
+
+Returns true if the string contains all $needles, false otherwise. By
+default the comparison is case-sensitive, but can be made insensitive by
+setting $caseSensitive to false.
+
+```php
+S::create('Str contains foo and bar')->containsAll(array('foo', 'bar'));
+S::containsAll('Str contains foo and bar', array('foo', 'bar'));  // true
+```
+
+#### containsAny
+
+$stringy->containsAny(array $needles [, boolean $caseSensitive = true ])
+
+S::containsAny(string $haystack, array $needles [, boolean $caseSensitive = true [, string $encoding ]])
+
+Returns true if the string contains any $needles, false otherwise. By
+default the comparison is case-sensitive, but can be made insensitive by
+setting $caseSensitive to false.
+
+```php
+S::create('Str contains foo')->containsAny(array('foo', 'bar'));
+S::containsAny('Str contains foo', array('foo', 'bar'));  // true
+```
+
 #### countSubstr
 
 $stringy->countSubstr(string $substring [, boolean $caseSensitive = true ])
@@ -340,6 +379,16 @@ S::create('fòô bàř', 'UTF-8')->first(3);
 S::first('fòô bàř', 3, 'UTF-8');  // 'fòô'
 ```
 
+#### getEncoding
+
+$stringy->getEncoding()
+
+Returns the encoding used by the Stringy object.
+
+```php
+S::create('fòô bàř', 'UTF-8')->getEncoding();  // 'UTF-8'
+```
+
 #### humanize
 
 $stringy->humanize()
@@ -869,6 +918,19 @@ S::create('    fòô    bàř')->toTabs();
 S::toTabs('    fòô    bàř');  // '   fòô bàř'
 ```
 
+#### toTitleCase
+
+$stringy->toTitleCase()
+
+S::toTitleCase(string $str [, string $encoding ])
+
+Converts the first character of each word in the string to uppercase.
+
+```php
+S::create('fòô bàř', 'UTF-8')->toTitleCase();
+S::toTitleCase('fòô bàř', 'UTF-8');  // 'Fòô Bàř'
+```
+
 #### toUpperCase
 
 $stringy->toUpperCase()
@@ -954,6 +1016,13 @@ S::create('σ test', 'UTF-8')->upperCaseFirst();
 S::upperCaseFirst('σ test', 'UTF-8');  // 'Σ test'
 ```
 
+## Links
+
+The following is a list of libraries that extend Stringy:
+
+ * [SliceableStringy](https://github.com/danielstjules/SliceableStringy):
+Python-like string slices in PHP
+
 ## Tests
 
 From the project directory, tests can be ran using `phpunit`

composer.json

@@ -17,11 +17,15 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.0.*"
+    },
     "support": {
         "issues": "https://github.com/danielstjules/Stringy/issues",
         "source": "https://github.com/danielstjules/Stringy"
     },
     "autoload": {
-        "psr-4": { "Stringy\\": "src/" }
+        "psr-4": { "Stringy\\": "src/" },
+        "classmap": [ "tests" ]
     }
 }

src/StaticStringy.php

@@ -323,6 +323,18 @@ class StaticStringy
         return (string) Stringy::create($str, $encoding)->toLowerCase();
     }
 
+    /**
+     * Converts the first character of each word in the string to uppercase.
+     *
+     * @param  string $str      String to convert case
+     * @param  string $encoding The character encoding
+     * @return string The title-cased string
+     */
+    public static function toTitleCase($str, $encoding = null)
+    {
+        return (string) Stringy::create($str, $encoding)->toTitleCase();
+    }
+
     /**
      * Converts all characters in the string to uppercase. An alias for PHP's
      * mb_strtoupper().
@@ -370,6 +382,42 @@ class StaticStringy
             ->contains($needle, $caseSensitive);
     }
 
+    /**
+     * Returns true if the string contains any $needles, false otherwise. By
+     * default, the comparison is case-sensitive, but can be made insensitive
+     * by setting $caseSensitive to false.
+     *
+     * @param  string $haystack      String being checked
+     * @param  array  $needles       Substrings to look for
+     * @param  bool   $caseSensitive Whether or not to enforce case-sensitivity
+     * @param  string $encoding      The character encoding
+     * @return bool   Whether or not $haystack contains any $needles
+     */
+    public static function containsAny($haystack, $needles,
+                                       $caseSensitive = true, $encoding = null)
+    {
+        return Stringy::create($haystack, $encoding)
+            ->containsAny($needles, $caseSensitive);
+    }
+
+    /**
+     * Returns true if the string contains all $needles, false otherwise. By
+     * default, the comparison is case-sensitive, but can be made insensitive
+     * by setting $caseSensitive to false.
+     *
+     * @param  string $haystack      String being checked
+     * @param  array  $needles       Substrings to look for
+     * @param  bool   $caseSensitive Whether or not to enforce case-sensitivity
+     * @param  string $encoding      The character encoding
+     * @return bool   Whether or not $haystack contains all $needles
+     */
+    public static function containsAll($haystack, $needles,
+                                       $caseSensitive = true, $encoding = null)
+    {
+        return Stringy::create($haystack, $encoding)
+            ->containsAll($needles, $caseSensitive);
+    }
+
     /**
      * Surrounds a string with the given substring.
      *
@@ -428,7 +476,7 @@ class StaticStringy
      * @return string The resulting string after truncating
      */
     public static function safeTruncate($str, $length, $substring = '',
-                                    $encoding = null)
+                                        $encoding = null)
     {
         return (string) Stringy::create($str, $encoding)
             ->safeTruncate($length, $substring);

src/Stringy.php

@@ -4,9 +4,20 @@ namespace Stringy;
 
 class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
 {
-    private $str;
+    /**
+     * An instance's string.
+     *
+     * @var string
+     */
+    protected $str;
 
-    public $encoding;
+    /**
+     * The string's encoding, which should be one of the mbstring module's
+     * supported encodings.
+     *
+     * @var string
+     */
+    protected $encoding;
 
     /**
      * Initializes a Stringy object and assigns both str and encoding properties
@@ -26,7 +37,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
             throw new \InvalidArgumentException(
                 'Passed value cannot be an array'
             );
-        } else if (is_object($str) && !method_exists($str, '__toString')) {
+        } elseif (is_object($str) && !method_exists($str, '__toString')) {
             throw new \InvalidArgumentException(
                 'Passed object must have a __toString method'
             );
@@ -64,6 +75,16 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
         return $this->str;
     }
 
+    /**
+     * Returns the encoding used by the Stringy object.
+     *
+     * @return string The current value of the $encoding property
+     */
+    public function getEncoding()
+    {
+        return $this->encoding;
+    }
+
     /**
      * Returns the length of the string, implementing the countable interface.
      *
@@ -95,7 +116,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      * @param  mixed   $offset The index to check
      * @return boolean Whether or not the index exists
      */
-    public function offsetExists($offset) {
+    public function offsetExists($offset)
+    {
         $length = $this->length();
         $offset = (int) $offset;
 
@@ -117,7 +139,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      * @throws \OutOfBoundsException If the positive or negative offset does
      *                               not exist
      */
-    public function offsetGet($offset) {
+    public function offsetGet($offset)
+    {
         $offset = (int) $offset;
         $length = $this->length();
 
@@ -136,7 +159,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      * @param  mixed      $value  Value to set
      * @throws \Exception When called
      */
-    public function offsetSet($offset, $value) {
+    public function offsetSet($offset, $value)
+    {
         // Stringy is immutable, cannot directly set char
         throw new \Exception('Stringy object is immutable, cannot modify char');
     }
@@ -148,7 +172,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      * @param  mixed      $offset The index of the character
      * @throws \Exception When called
      */
-    public function offsetUnset($offset) {
+    public function offsetUnset($offset)
+    {
         // Don't allow directly modifying the string
         throw new \Exception('Stringy object is immutable, cannot unset char');
     }
@@ -214,7 +239,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
 
         $camelCase = preg_replace_callback(
             '/[-_\s]+(.)?/u',
-            function($match) use ($encoding) {
+            function ($match) use ($encoding) {
                 return $match[1] ? mb_strtoupper($match[1], $encoding) : '';
             },
             $stringy->trim()->lowerCaseFirst()->str
@@ -222,7 +247,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
 
         $stringy->str = preg_replace_callback(
             '/[\d]+(.)?/u',
-            function($match) use ($encoding) {
+            function ($match) use ($encoding) {
                 return mb_strtoupper($match[0], $encoding);
             },
             $camelCase
@@ -252,17 +277,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function dasherize()
     {
-        // Save current regex encoding so we can reset it after
-        $regexEncoding = mb_regex_encoding();
-        mb_regex_encoding($this->encoding);
-
-        $str = mb_ereg_replace('\B([A-Z])', '-\1', trim($this->str));
-        $str = mb_ereg_replace('[-_\s]+', '-', $str);
-        $str = mb_strtolower($str, $this->encoding);
-
-        mb_regex_encoding($regexEncoding);
-
-        return self::create($str, $this->encoding);
+        return $this->applyDelimeter('-');
     }
 
     /**
@@ -274,13 +289,24 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      * @return Stringy Object with an underscored $str
      */
     public function underscored()
+    {
+        return $this->applyDelimeter('_');
+    }
+
+    /**
+     * Returns a lowercase and trimmed string separated by the given delimiter.
+     *
+     * @param  string  $delimiter Sequence used to separate parts of the string
+     * @return Stringy Object with a delimited $str
+     */
+    protected function applyDelimeter($delimiter)
     {
         // Save current regex encoding so we can reset it after
         $regexEncoding = mb_regex_encoding();
         mb_regex_encoding($this->encoding);
 
-        $str = mb_ereg_replace('\B([A-Z])', '_\1', trim($this->str));
-        $str = mb_ereg_replace('[-_\s]+', '_', $str);
+        $str = mb_ereg_replace('\B([A-Z])', $delimiter .'\1', trim($this->str));
+        $str = mb_ereg_replace('[-_\s]+', $delimiter, $str);
         $str = mb_strtolower($str, $this->encoding);
 
         mb_regex_encoding($regexEncoding);
@@ -350,8 +376,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function humanize()
     {
-        $str = str_replace('_id', '', $this->str);
-        $str = str_replace('_', ' ', $str);
+        $str = str_replace(array('_id', '_'), array('', ' '), $this->str);
 
         return self::create($str, $this->encoding)->trim()->upperCaseFirst();
     }
@@ -365,11 +390,17 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function tidy()
     {
-        $str = $this->str;
-        $str = preg_replace('/\x{2026}/u', '...', $str);
-        $str = preg_replace('/[\x{201C}\x{201D}]/u', '"', $str);
-        $str = preg_replace('/[\x{2018}\x{2019}]/u', "'", $str);
-        $str = preg_replace('/[\x{2013}\x{2014}]/u', '-', $str);
+        $str = preg_replace(array(
+            '/\x{2026}/u',
+            '/[\x{201C}\x{201D}]/u',
+            '/[\x{2018}\x{2019}]/u',
+            '/[\x{2013}\x{2014}]/u',
+        ), array(
+            '...',
+            '"',
+            "'",
+            '-',
+        ), $this->str);
 
         return self::create($str, $this->encoding);
     }
@@ -383,13 +414,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function collapseWhitespace()
     {
-        $regexEncoding = mb_regex_encoding();
-        mb_regex_encoding($this->encoding);
-
-        $str = mb_ereg_replace('[[:space:]]+', ' ', $this->str);
-        mb_regex_encoding($regexEncoding);
-
-        return self::create($str, $this->encoding)->trim();
+        return $this->regexReplace('[[:space:]]+', ' ')->trim();
     }
 
     /**
@@ -405,7 +430,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
             'a'    => array('à', 'á', 'â', 'ã', 'ā', 'ą', 'ă', 'å', 'α', 'ά', 'ἀ',
                             'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ',
                             'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ',
-                            'ᾶ', 'ᾷ', 'а', 'ъ'),
+                            'ᾶ', 'ᾷ', 'а'),
             'b'    => array('б', 'β'),
             'c'    => array('ç', 'ć', 'č', 'ĉ', 'ċ'),
             'd'    => array('ď', 'ð', 'đ', 'ƌ', 'ȡ', 'ɖ', 'ɗ', 'ᵭ', 'ᶁ', 'ᶑ', 'д'),
@@ -444,7 +469,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
             'zh'   => array('ж'),
             'A'    => array('Á', 'Â', 'Ã', 'Å', 'Ā', 'Ą', 'Ă', 'Α', 'Ά', 'Ἀ', 'Ἁ',
                             'Ἂ', 'Ἃ', 'Ἄ', 'Ἅ', 'Ἆ', 'Ἇ', 'ᾈ', 'ᾉ', 'ᾊ', 'ᾋ', 'ᾌ',
-                            'ᾍ', 'ᾎ', 'ᾏ', 'Ᾰ', 'Ᾱ', 'Ὰ', 'Ά', 'ᾼ', 'А', 'Ъ'),
+                            'ᾍ', 'ᾎ', 'ᾏ', 'Ᾰ', 'Ᾱ', 'Ὰ', 'Ά', 'ᾼ', 'А'),
             'B'    => array('Б'),
             'C'    => array('Ć', 'Č', 'Ĉ', 'Ċ'),
             'D'    => array('Ď', 'Ð', 'Đ', 'Ɖ', 'Ɗ', 'Ƌ', 'ᴅ', 'ᴆ', 'Д'),
@@ -483,6 +508,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
             $str = str_replace($value, $key, $str);
         }
 
+        $str = preg_replace('/[^\x20-\x7E]/u', '', $str);
+
         return self::create($str, $this->encoding);
     }
 
@@ -507,44 +534,14 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
                 "to be one of 'left', 'right' or 'both'");
         }
 
-        $stringy = self::create($this->str, $this->encoding);
-        $encoding = $stringy->encoding;
-        $strLength = $stringy->length();
-        $padStrLength = mb_strlen($padStr, $encoding);
-
-        if ($length <= $strLength || $padStrLength <= 0) {
-            return $stringy;
+        switch ($padType) {
+            case 'left':
+                return $this->padLeft($length, $padStr);
+            case 'right':
+                return $this->padRight($length, $padStr);
+            default:
+                return $this->padBoth($length, $padStr);
         }
-
-        // Number of times to repeat the padStr if left or right
-        $times = ceil(($length - $strLength) / $padStrLength);
-        $paddedStr = '';
-
-        if ($padType == 'left') {
-            // Repeat the pad, cut it, and prepend
-            $leftPad = str_repeat($padStr, $times);
-            $leftPad = mb_substr($leftPad, 0, $length - $strLength, $encoding);
-            $stringy->str = $leftPad . $stringy->str;
-        } elseif ($padType == 'right') {
-            // Append the repeated pad and get a substring of the given length
-            $stringy->str = $stringy->str . str_repeat($padStr, $times);
-            $stringy->str = mb_substr($stringy->str, 0, $length, $encoding);
-        } else {
-            // Number of times to repeat the padStr on both sides
-            $paddingSize = ($length - $strLength) / 2;
-            $times = ceil($paddingSize / $padStrLength);
-
-            // Favour right padding over left, as with str_pad()
-            $rightPad = str_repeat($padStr, $times);
-            $rightPad = mb_substr($rightPad, 0, ceil($paddingSize), $encoding);
-
-            $leftPad = str_repeat($padStr, $times);
-            $leftPad = mb_substr($leftPad, 0, floor($paddingSize), $encoding);
-
-            $stringy->str = $leftPad . $stringy->str . $rightPad;
-        }
-
-        return $stringy;
     }
 
     /**
@@ -553,11 +550,11 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      *
      * @param  int     $length Desired string length after padding
      * @param  string  $padStr String used to pad, defaults to space
-     * @return Stringy Object with a left padded $str
+     * @return Stringy String with left padding
      */
     public function padLeft($length, $padStr = ' ')
     {
-        return $this->pad($length, $padStr, 'left');
+        return $this->applyPadding($length - $this->length(), 0, $padStr);
     }
 
     /**
@@ -566,11 +563,11 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      *
      * @param  int     $length Desired string length after padding
      * @param  string  $padStr String used to pad, defaults to space
-     * @return Stringy Object with a right padded $str
+     * @return Stringy String with right padding
      */
     public function padRight($length, $padStr = ' ')
     {
-        return $this->pad($length, $padStr, 'right');
+        return $this->applyPadding(0, $length - $this->length(), $padStr);
     }
 
     /**
@@ -579,11 +576,45 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      *
      * @param  int     $length Desired string length after padding
      * @param  string  $padStr String used to pad, defaults to space
-     * @return Stringy The padded string
+     * @return Stringy String with padding applied
      */
     public function padBoth($length, $padStr = ' ')
     {
-        return $this->pad($length, $padStr, 'both');
+        $padding = $length - $this->length();
+
+        return $this->applyPadding(floor($padding / 2), ceil($padding / 2),
+            $padStr);
+    }
+
+    /**
+     * Adds the specified amount of left and right padding to the given string.
+     * The default character used is a space.
+     *
+     * @param  int     $left   Length of left padding
+     * @param  int     $right  Length of right padding
+     * @param  string  $padStr String used to pad
+     * @return Stringy String with padding applied
+     */
+    private function applyPadding($left = 0, $right = 0, $padStr = ' ')
+    {
+        $stringy = self::create($this->str, $this->encoding);
+        $length = mb_strlen($padStr, $stringy->encoding);
+
+        $strLength = $stringy->length();
+        $paddedLength = $strLength + $left + $right;
+
+        if (!$length || $paddedLength <= $strLength) {
+            return $stringy;
+        }
+
+        $leftPadding = mb_substr(str_repeat($padStr, ceil($left / $length)), 0,
+            $left, $stringy->encoding);
+        $rightPadding = mb_substr(str_repeat($padStr, ceil($right / $length)), 0,
+            $right, $stringy->encoding);
+
+        $stringy->str = $leftPadding . $stringy->str . $rightPadding;
+
+        return $stringy;
     }
 
     /**
@@ -665,6 +696,18 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
         return self::create($str, $this->encoding);
     }
 
+    /**
+     * Converts the first character of each word in the string to uppercase.
+     *
+     * @return Stringy Object with all characters of $str being title-cased
+     */
+    public function toTitleCase()
+    {
+        $str = mb_convert_case($this->str, MB_CASE_TITLE, $this->encoding);
+
+        return self::create($str, $this->encoding);
+    }
+
     /**
      * Converts all characters in the string to lowercase. An alias for PHP's
      * mb_strtolower().
@@ -705,12 +748,12 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
     {
         $stringy = self::create($this->str, $this->encoding);
 
-        $stringy->str = preg_replace("/[^a-zA-Z\d $replacement]/u", '',
-            $stringy->toAscii());
-        $stringy->str = $stringy->collapseWhitespace()->str;
-        $stringy->str = str_replace(' ', $replacement, strtolower($stringy));
+        $quotedReplacement = preg_quote($replacement);
+        $pattern = "/[^a-zA-Z\d\s-_$quotedReplacement]/u";
+        $stringy->str = preg_replace($pattern, '', $stringy->toAscii());
 
-        return $stringy;
+        return $stringy->toLowerCase()->applyDelimeter($replacement)
+                       ->removeLeft($replacement)->removeRight($replacement);
     }
 
     /**
@@ -733,6 +776,54 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
         }
     }
 
+    /**
+     * Returns true if the string contains any $needles, false otherwise. By
+     * default the comparison is case-sensitive, but can be made insensitive by
+     * setting $caseSensitive to false.
+     *
+     * @param  array  $needles       Substrings to look for
+     * @param  bool   $caseSensitive Whether or not to enforce case-sensitivity
+     * @return bool   Whether or not $str contains $needle
+     */
+    public function containsAny($needles, $caseSensitive = true)
+    {
+        if (empty($needles)) {
+            return false;
+        }
+
+        foreach ($needles as $needle) {
+            if ($this->contains($needle, $caseSensitive)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns true if the string contains all $needles, false otherwise. By
+     * default the comparison is case-sensitive, but can be made insensitive by
+     * setting $caseSensitive to false.
+     *
+     * @param  array  $needles       Substrings to look for
+     * @param  bool   $caseSensitive Whether or not to enforce case-sensitivity
+     * @return bool   Whether or not $str contains $needle
+     */
+    public function containsAll($needles, $caseSensitive = true)
+    {
+        if (empty($needles)) {
+            return false;
+        }
+
+        foreach ($needles as $needle) {
+            if (!$this->contains($needle, $caseSensitive)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Surrounds $str with the given substring.
      *
@@ -954,8 +1045,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
         $end = 0;
         $table = array_fill(0, $strLength + 1, array_fill(0, $otherLength + 1, 0));
 
-        for ($i = 1; $i <= $strLength; $i++){
-            for ($j = 1; $j <= $otherLength; $j++){
+        for ($i = 1; $i <= $strLength; $i++) {
+            for ($j = 1; $j <= $otherLength; $j++) {
                 $strChar = mb_substr($stringy->str, $i - 1, 1, $encoding);
                 $otherChar = mb_substr($otherStr, $j - 1, 1, $encoding);
 
@@ -997,17 +1088,10 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function substr($start, $length = null)
     {
-        $stringy = self::create($this->str, $this->encoding);
+        $length = $length === null ? $this->length() : $length;
+        $str = mb_substr($this->str, $start, $length, $this->encoding);
 
-        if ($length === null) {
-            $stringy->str = mb_substr($stringy->str, $start,
-                $stringy->length() - $start, $this->encoding);
-        } else {
-            $stringy->str = mb_substr($stringy->str, $start, $length,
-                $stringy->encoding);
-        }
-
-        return $stringy;
+        return self::create($str, $this->encoding);
     }
 
     /**
@@ -1199,14 +1283,11 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function isJson()
     {
-        if (!$this->endsWith('}') && !$this->endsWith(']')) {
-            return false;
-        }
+        json_decode($this->str);
 
-        return !is_null(json_decode($this->str));
+        return (json_last_error() === JSON_ERROR_NONE);
     }
 
-
     /**
      * Returns true if the string contains only lower case chars, false
      * otherwise.
@@ -1269,17 +1350,7 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
      */
     public function replace($search, $replacement)
     {
-        $regexEncoding = mb_regex_encoding();
-        mb_regex_encoding($this->encoding);
-
-        // Don't want the args being parsed as regex
-        $search = preg_quote($search);
-        $replacement = preg_quote($replacement);
-
-        $str = mb_ereg_replace($search, $replacement, $this->str);
-        mb_regex_encoding($regexEncoding);
-
-        return self::create($str, $this->encoding);
+        return $this->regexReplace(preg_quote($search), $replacement);
     }
 
     /**

tests/CommonTest.php

@@ -2,6 +2,16 @@
 
 abstract class CommonTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Asserts that a variable is of a Stringy instance.
+     *
+     * @param mixed $actual
+     */
+    public function assertStringy($actual)
+    {
+        $this->assertInstanceOf('Stringy\Stringy', $actual);
+    }
+
     public function charsProvider()
     {
         return array(
@@ -174,17 +184,18 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
         return array(
             array('foo bar', 'fòô bàř'),
             array(' TEST ', ' ŤÉŚŢ '),
-            array('φ = z = 3', 'φ = ź = 3'),
+            array(' = z = 3', 'φ = ź = 3'),
             array('perevirka', 'перевірка'),
             array('lysaya gora', 'лысая гора'),
-            array('shchuka', 'щука')
+            array('shchuka', 'щука'),
+            array('', '漢字')
         );
     }
 
     public function padProvider()
     {
         return array(
-            // $length <= $str
+            // length <= str
             array('foo bar', 'foo bar', -1),
             array('foo bar', 'foo bar', 7),
             array('fòô bàř', 'fòô bàř', 7, ' ', 'right', 'UTF-8'),
@@ -192,32 +203,16 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
             // right
             array('foo bar  ', 'foo bar', 9),
             array('foo bar_*', 'foo bar', 9, '_*', 'right'),
-            array('foo bar_*_', 'foo bar', 10, '_*', 'right'),
-            array('fòô bàř  ', 'fòô bàř', 9, ' ', 'right', 'UTF-8'),
-            array('fòô bàř¬ø', 'fòô bàř', 9, '¬ø', 'right', 'UTF-8'),
             array('fòô bàř¬ø¬', 'fòô bàř', 10, '¬ø', 'right', 'UTF-8'),
-            array('fòô bàř¬ø¬ø', 'fòô bàř', 11, '¬ø', 'right', 'UTF-8'),
 
             // left
             array('  foo bar', 'foo bar', 9, ' ', 'left'),
             array('_*foo bar', 'foo bar', 9, '_*', 'left'),
-            array('_*_foo bar', 'foo bar', 10, '_*', 'left'),
-            array('  fòô bàř', 'fòô bàř', 9, ' ', 'left', 'UTF-8'),
-            array('¬øfòô bàř', 'fòô bàř', 9, '¬ø', 'left', 'UTF-8'),
             array('¬ø¬fòô bàř', 'fòô bàř', 10, '¬ø', 'left', 'UTF-8'),
-            array('¬ø¬øfòô bàř', 'fòô bàř', 11, '¬ø', 'left', 'UTF-8'),
 
             // both
             array('foo bar ', 'foo bar', 8, ' ', 'both'),
-            array(' foo bar ', 'foo bar', 9, ' ', 'both'),
-            array('fòô bàř ', 'fòô bàř', 8, ' ', 'both', 'UTF-8'),
-            array(' fòô bàř ', 'fòô bàř', 9, ' ', 'both', 'UTF-8'),
-            array('fòô bàř¬', 'fòô bàř', 8, '¬ø', 'both', 'UTF-8'),
-            array('¬fòô bàř¬', 'fòô bàř', 9, '¬ø', 'both', 'UTF-8'),
             array('¬fòô bàř¬ø', 'fòô bàř', 10, '¬ø', 'both', 'UTF-8'),
-            array('¬øfòô bàř¬ø', 'fòô bàř', 11, '¬ø', 'both', 'UTF-8'),
-            array('¬fòô bàř¬ø', 'fòô bàř', 10, '¬øÿ', 'both', 'UTF-8'),
-            array('¬øfòô bàř¬ø', 'fòô bàř', 11, '¬øÿ', 'both', 'UTF-8'),
             array('¬øfòô bàř¬øÿ', 'fòô bàř', 12, '¬øÿ', 'both', 'UTF-8')
         );
     }
@@ -226,7 +221,11 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
     {
         return array(
             array('  foo bar', 'foo bar', 9),
+            array('_*foo bar', 'foo bar', 9, '_*'),
             array('_*_foo bar', 'foo bar', 10, '_*'),
+            array('  fòô bàř', 'fòô bàř', 9, ' ', 'UTF-8'),
+            array('¬øfòô bàř', 'fòô bàř', 9, '¬ø', 'UTF-8'),
+            array('¬ø¬fòô bàř', 'fòô bàř', 10, '¬ø', 'UTF-8'),
             array('¬ø¬øfòô bàř', 'fòô bàř', 11, '¬ø', 'UTF-8'),
         );
     }
@@ -235,7 +234,11 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
     {
         return array(
             array('foo bar  ', 'foo bar', 9),
+            array('foo bar_*', 'foo bar', 9, '_*'),
             array('foo bar_*_', 'foo bar', 10, '_*'),
+            array('fòô bàř  ', 'fòô bàř', 9, ' ', 'UTF-8'),
+            array('fòô bàř¬ø', 'fòô bàř', 9, '¬ø', 'UTF-8'),
+            array('fòô bàř¬ø¬', 'fòô bàř', 10, '¬ø', 'UTF-8'),
             array('fòô bàř¬ø¬ø', 'fòô bàř', 11, '¬ø', 'UTF-8'),
         );
     }
@@ -245,7 +248,14 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
         return array(
             array('foo bar ', 'foo bar', 8),
             array(' foo bar ', 'foo bar', 9, ' '),
+            array('fòô bàř ', 'fòô bàř', 8, ' ', 'UTF-8'),
+            array(' fòô bàř ', 'fòô bàř', 9, ' ', 'UTF-8'),
+            array('fòô bàř¬', 'fòô bàř', 8, '¬ø', 'UTF-8'),
+            array('¬fòô bàř¬', 'fòô bàř', 9, '¬ø', 'UTF-8'),
+            array('¬fòô bàř¬ø', 'fòô bàř', 10, '¬ø', 'UTF-8'),
+            array('¬øfòô bàř¬ø', 'fòô bàř', 11, '¬ø', 'UTF-8'),
             array('¬fòô bàř¬ø', 'fòô bàř', 10, '¬øÿ', 'UTF-8'),
+            array('¬øfòô bàř¬ø', 'fòô bàř', 11, '¬øÿ', 'UTF-8'),
             array('¬øfòô bàř¬øÿ', 'fòô bàř', 12, '¬øÿ', 'UTF-8')
         );
     }
@@ -318,6 +328,17 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    public function toTitleCaseProvider()
+    {
+        return array(
+            array('Foo Bar', 'foo bar'),
+            array(' Foo_Bar ', ' foo_bar '),
+            array('Fòô Bàř', 'fòô bàř', 'UTF-8'),
+            array(' Fòô_Bàř ', ' fòô_bàř ', 'UTF-8'),
+            array('Αυτοκίνητο Αυτοκίνητο', 'αυτοκίνητο αυτοκίνητο', 'UTF-8'),
+        );
+    }
+
     public function toUpperCaseProvider()
     {
         return array(
@@ -333,6 +354,8 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
     {
         return array(
             array('foo-bar', ' foo  bar '),
+            array('foo-bar', 'foo -.-"-...bar'),
+            array('another-foo-bar', 'another..& foo -.-"-...bar'),
             array('foo-dbar', " Foo d'Bar "),
             array('a-string-with-dashes', 'A string-with-dashes'),
             array('using-strings-like-foo-bar', 'Using strings like fòô bàř'),
@@ -340,39 +363,118 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
             array('numbers-1234', 'numbers 1234'),
             array('perevirka-ryadka', 'перевірка рядка'),
             array('bukvar-s-bukvoy-y', 'букварь с буквой ы'),
-            array('barzi-i-yarostni', 'бързи и яростни'),
+            array('podekhal-k-podezdu-moego-doma', 'подъехал к подъезду моего дома'),
             array('foo:bar:baz', 'Foo bar baz', ':'),
-            array('a_string_with_underscores', 'A_string with_underscores', '_')
+            array('a_string_with_underscores', 'A_string with_underscores', '_'),
+            array('a_string_with_dashes', 'A string-with-dashes', '_'),
+            array('a\string\with\dashes', 'A string-with-dashes', '\\'),
+            array('an_odd_string', '--   An odd__   string-_', '_')
         );
     }
 
     public function containsProvider()
     {
         return array(
-            array(true, 'This string contains foo bar', 'foo bar'),
+            array(true, 'Str contains foo bar', 'foo bar'),
             array(true, '12398!@(*%!@# @!%#*&^%',  ' @!%#*&^%'),
             array(true, 'Ο συγγραφέας είπε', 'συγγραφέας', 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'å´¥©', true, 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'å˚ ∆', true, 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'øœ¬', true, 'UTF-8'),
-            array(false, 'This string contains foo bar', 'Foo bar'),
-            array(false, 'This string contains foo bar', 'foobar'),
-            array(false, 'This string contains foo bar', 'foo bar '),
+            array(false, 'Str contains foo bar', 'Foo bar'),
+            array(false, 'Str contains foo bar', 'foobar'),
+            array(false, 'Str contains foo bar', 'foo bar '),
             array(false, 'Ο συγγραφέας είπε', '  συγγραφέας ', true, 'UTF-8'),
             array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', ' ßå˚', true, 'UTF-8'),
-            array(true, 'This string contains foo bar', 'Foo bar', false),
+            array(true, 'Str contains foo bar', 'Foo bar', false),
             array(true, '12398!@(*%!@# @!%#*&^%',  ' @!%#*&^%', false),
             array(true, 'Ο συγγραφέας είπε', 'ΣΥΓΓΡΑΦΈΑΣ', false, 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'Å´¥©', false, 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'Å˚ ∆', false, 'UTF-8'),
             array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', 'ØŒ¬', false, 'UTF-8'),
-            array(false, 'This string contains foo bar', 'foobar', false),
-            array(false, 'This string contains foo bar', 'foo bar ', false),
+            array(false, 'Str contains foo bar', 'foobar', false),
+            array(false, 'Str contains foo bar', 'foo bar ', false),
             array(false, 'Ο συγγραφέας είπε', '  συγγραφέας ', false, 'UTF-8'),
             array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', ' ßÅ˚', false, 'UTF-8')
         );
     }
 
+    public function containsAnyProvider()
+    {
+        // One needle
+        $singleNeedle = array_map(function ($array) {
+            $array[2] = array($array[2]);
+            return $array;
+        }, $this->containsProvider());
+
+        $provider = array(
+            // No needles
+            array(false, 'Str contains foo bar', array()),
+            // Multiple needles
+            array(true, 'Str contains foo bar', array('foo', 'bar')),
+            array(true, '12398!@(*%!@# @!%#*&^%', array(' @!%#*', '&^%')),
+            array(true, 'Ο συγγραφέας είπε', array('συγγρ', 'αφέας'), 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('å´¥', '©'), true, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('å˚ ', '∆'), true, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('øœ', '¬'), true, 'UTF-8'),
+            array(false, 'Str contains foo bar', array('Foo', 'Bar')),
+            array(false, 'Str contains foo bar', array('foobar', 'bar ')),
+            array(false, 'Str contains foo bar', array('foo bar ', '  foo')),
+            array(false, 'Ο συγγραφέας είπε', array('  συγγραφέας ', '  συγγραφ '), true, 'UTF-8'),
+            array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array(' ßå˚', ' ß '), true, 'UTF-8'),
+            array(true, 'Str contains foo bar', array('Foo bar', 'bar'), false),
+            array(true, '12398!@(*%!@# @!%#*&^%', array(' @!%#*&^%', '*&^%'), false),
+            array(true, 'Ο συγγραφέας είπε', array('ΣΥΓΓΡΑΦΈΑΣ', 'ΑΦΈΑ'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('Å´¥©', '¥©'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('Å˚ ∆', ' ∆'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('ØŒ¬', 'Œ'), false, 'UTF-8'),
+            array(false, 'Str contains foo bar', array('foobar', 'none'), false),
+            array(false, 'Str contains foo bar', array('foo bar ', ' ba '), false),
+            array(false, 'Ο συγγραφέας είπε', array('  συγγραφέας ', ' ραφέ '), false, 'UTF-8'),
+            array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array(' ßÅ˚', ' Å˚ '), false, 'UTF-8'),
+        );
+
+        return array_merge($singleNeedle, $provider);
+    }
+
+    public function containsAllProvider()
+    {
+        // One needle
+        $singleNeedle = array_map(function ($array) {
+            $array[2] = array($array[2]);
+            return $array;
+        }, $this->containsProvider());
+
+        $provider = array(
+            // One needle
+            array(false, 'Str contains foo bar', array()),
+            // Multiple needles
+            array(true, 'Str contains foo bar', array('foo', 'bar')),
+            array(true, '12398!@(*%!@# @!%#*&^%', array(' @!%#*', '&^%')),
+            array(true, 'Ο συγγραφέας είπε', array('συγγρ', 'αφέας'), 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('å´¥', '©'), true, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('å˚ ', '∆'), true, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('øœ', '¬'), true, 'UTF-8'),
+            array(false, 'Str contains foo bar', array('Foo', 'bar')),
+            array(false, 'Str contains foo bar', array('foobar', 'bar')),
+            array(false, 'Str contains foo bar', array('foo bar ', 'bar')),
+            array(false, 'Ο συγγραφέας είπε', array('  συγγραφέας ', '  συγγραφ '), true, 'UTF-8'),
+            array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array(' ßå˚', ' ß '), true, 'UTF-8'),
+            array(true, 'Str contains foo bar', array('Foo bar', 'bar'), false),
+            array(true, '12398!@(*%!@# @!%#*&^%', array(' @!%#*&^%', '*&^%'), false),
+            array(true, 'Ο συγγραφέας είπε', array('ΣΥΓΓΡΑΦΈΑΣ', 'ΑΦΈΑ'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('Å´¥©', '¥©'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('Å˚ ∆', ' ∆'), false, 'UTF-8'),
+            array(true, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array('ØŒ¬', 'Œ'), false, 'UTF-8'),
+            array(false, 'Str contains foo bar', array('foobar', 'none'), false),
+            array(false, 'Str contains foo bar', array('foo bar ', ' ba'), false),
+            array(false, 'Ο συγγραφέας είπε', array('  συγγραφέας ', ' ραφέ '), false, 'UTF-8'),
+            array(false, 'å´¥©¨ˆßå˚ ∆∂˙©å∑¥øœ¬', array(' ßÅ˚', ' Å˚ '), false, 'UTF-8'),
+        );
+
+        return array_merge($singleNeedle, $provider);
+    }
+
     public function surroundProvider()
     {
         return array(
@@ -730,14 +832,14 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
     public function isJsonProvider()
     {
         return array(
-            array(false, ''),
-            array(false, '123'),
+            array(true, ''),
+            array(true, '123'),
             array(true, '{"foo": "bar"}'),
             array(false, '{"foo":"bar",}'),
             array(false, '{"foo"}'),
             array(true, '["foo"]'),
             array(false, '{"foo": "bar"]'),
-            array(false, '123', 'UTF-8'),
+            array(true, '123', 'UTF-8'),
             array(true, '{"fòô": "bàř"}', 'UTF-8'),
             array(false, '{"fòô":"bàř",}', 'UTF-8'),
             array(false, '{"fòô"}', 'UTF-8'),
@@ -835,6 +937,8 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
             array('foo', '', '', 'foo'),
             array('foo', '\s', '\s', 'foo'),
             array('foo bar', 'foo bar', '', ''),
+            array('foo bar', 'foo bar', 'f(o)o', '\1'),
+            array('\1 bar', 'foo bar', 'foo', '\1'),
             array('bar', 'foo bar', 'foo ', ''),
             array('far bar', 'foo bar', 'foo', 'far'),
             array('bar bar', 'foo bar foo bar', 'foo ', ''),
@@ -853,6 +957,7 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
         return array(
             array('', '', '', ''),
             array('bar', 'foo', 'f[o]+', 'bar'),
+            array('o bar', 'foo bar', 'f(o)o', '\1'),
             array('bar', 'foo bar', 'f[O]+\s', '', 'i'),
             array('foo', 'bar', '[[:alpha:]]{3}', 'foo'),
             array('', '', '', '', 'msr', 'UTF-8'),

tests/StaticStringyTest.php

@@ -1,7 +1,6 @@
 <?php
 
-$base = realpath(dirname(__FILE__) . '/..');
-require("$base/src/StaticStringy.php");
+require __DIR__ . '/../src/StaticStringy.php';
 
 use Stringy\StaticStringy as S;
 
@@ -245,6 +244,16 @@ class StaticStringyTestCase extends CommonTest
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * @dataProvider toTitleCaseProvider()
+     */
+    public function testToTitleCase($expected, $str, $encoding = null)
+    {
+        $result = S::toTitleCase($str, $encoding);
+        $this->assertInternalType('string', $result);
+        $this->assertEquals($expected, $result);
+    }
+
     /**
      * @dataProvider toUpperCaseProvider()
      */
@@ -276,6 +285,28 @@ class StaticStringyTestCase extends CommonTest
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * @dataProvider containsAnyProvider()
+     */
+    public function testcontainsAny($expected, $haystack, $needles,
+                                    $caseSensitive = true, $encoding = null)
+    {
+        $result = S::containsAny($haystack, $needles, $caseSensitive, $encoding);
+        $this->assertInternalType('boolean', $result);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @dataProvider containsAllProvider()
+     */
+    public function testContainsAll($expected, $haystack, $needles,
+                                    $caseSensitive = true, $encoding = null)
+    {
+        $result = S::containsAll($haystack, $needles, $caseSensitive, $encoding);
+        $this->assertInternalType('boolean', $result);
+        $this->assertEquals($expected, $result);
+    }
+
     /**
      * @dataProvider surroundProvider()
      */

tests/StringyTest.php

@@ -1,7 +1,6 @@
 <?php
 
-$base = realpath(dirname(__FILE__) . '/..');
-require("$base/src/Stringy.php");
+require __DIR__ . '/../src/Stringy.php';
 
 use Stringy\Stringy as S;
 
@@ -10,9 +9,9 @@ class StringyTestCase extends CommonTest
     public function testConstruct()
     {
         $stringy = new S('foo bar', 'UTF-8');
-        $this->assertInstanceOf('Stringy\Stringy', $stringy);
+        $this->assertStringy($stringy);
         $this->assertEquals('foo bar', (string) $stringy);
-        $this->assertEquals('UTF-8', $stringy->encoding);
+        $this->assertEquals('UTF-8', $stringy->getEncoding());
     }
 
     /**
@@ -57,15 +56,15 @@ class StringyTestCase extends CommonTest
     public function testCreate()
     {
         $stringy = S::create('foo bar', 'UTF-8');
-        $this->assertInstanceOf('Stringy\Stringy', $stringy);
+        $this->assertStringy($stringy);
         $this->assertEquals('foo bar', (string) $stringy);
-        $this->assertEquals('UTF-8', $stringy->encoding);
+        $this->assertEquals('UTF-8', $stringy->getEncoding());
     }
 
     public function testChaining()
     {
         $stringy = S::create("Fòô     Bàř", 'UTF-8');
-        $this->assertInstanceOf('Stringy\Stringy', $stringy);
+        $this->assertStringy($stringy);
         $result = $stringy->collapseWhitespace()->swapCase()->upperCaseFirst();
         $this->assertEquals('FÒÔ bÀŘ', $result);
     }
@@ -173,7 +172,7 @@ class StringyTestCase extends CommonTest
     public function testUpperCaseFirst($expected, $str, $encoding = null)
     {
         $result = S::create($str, $encoding)->upperCaseFirst();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
     }
 
@@ -184,7 +183,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->lowerCaseFirst();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -196,7 +195,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->camelize();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -208,7 +207,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->upperCamelize();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -220,7 +219,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->dasherize();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -232,7 +231,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->underscored();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -244,7 +243,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->swapCase();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -257,7 +256,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->titleize($ignore);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -269,7 +268,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->humanize();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -281,7 +280,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->tidy();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -293,7 +292,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->collapseWhitespace();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -305,7 +304,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->toAscii();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -318,7 +317,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->pad($length, $padStr, $padType);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -340,7 +339,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->padLeft($length, $padStr);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -353,7 +352,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->padRight($length, $padStr);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -366,7 +365,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->padBoth($length, $padStr);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -404,7 +403,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->toSpaces($tabLength);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -416,7 +415,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->toTabs($tabLength);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -428,7 +427,19 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->toLowerCase();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($str, $stringy);
+    }
+
+    /**
+     * @dataProvider toTitleCaseProvider()
+     */
+    public function testToTitleCase($expected, $str, $encoding = null)
+    {
+        $stringy = S::create($str, $encoding);
+        $result = $stringy->toTitleCase();
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -440,7 +451,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->toUpperCase();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -452,7 +463,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->slugify($replacement);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -470,6 +481,32 @@ class StringyTestCase extends CommonTest
         $this->assertEquals($haystack, $stringy);
     }
 
+    /**
+     * @dataProvider containsAnyProvider()
+     */
+    public function testcontainsAny($expected, $haystack, $needles,
+                                    $caseSensitive = true, $encoding = null)
+    {
+        $stringy = S::create($haystack, $encoding);
+        $result = $stringy->containsAny($needles, $caseSensitive);
+        $this->assertInternalType('boolean', $result);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($haystack, $stringy);
+    }
+
+    /**
+     * @dataProvider containsAllProvider()
+     */
+    public function testContainsAll($expected, $haystack, $needles,
+                                    $caseSensitive = true, $encoding = null)
+    {
+        $stringy = S::create($haystack, $encoding);
+        $result = $stringy->containsAll($needles, $caseSensitive);
+        $this->assertInternalType('boolean', $result);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($haystack, $stringy);
+    }
+
     /**
      * @dataProvider surroundProvider()
      */
@@ -477,7 +514,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->surround($substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -490,7 +527,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->insert($substring, $index);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -503,7 +540,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->truncate($length, $substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -515,7 +552,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->reverse();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -529,7 +566,7 @@ class StringyTestCase extends CommonTest
         $encoding = $encoding ?: mb_internal_encoding();
         $result = $stringy->shuffle();
 
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($str, $stringy);
         $this->assertEquals(mb_strlen($str, $encoding),
             mb_strlen($result, $encoding));
@@ -550,7 +587,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str);
         $result = $stringy->trim();
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -563,7 +600,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->longestCommonPrefix($otherStr);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -576,7 +613,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->longestCommonSubstring($otherStr);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -601,7 +638,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->substr($start, $length);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -613,7 +650,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->at($index);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -625,7 +662,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->first($n);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -637,7 +674,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->last($n);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -649,7 +686,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->ensureLeft($substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -661,7 +698,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->ensureRight($substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -673,7 +710,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->removeLeft($substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -685,7 +722,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->removeRight($substring);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -807,7 +844,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->replace($search, $replacement);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }
@@ -820,7 +857,7 @@ class StringyTestCase extends CommonTest
     {
         $stringy = S::create($str, $encoding);
         $result = $stringy->regexReplace($pattern, $replacement, $options);
-        $this->assertInstanceOf('Stringy\Stringy', $result);
+        $this->assertStringy($result);
         $this->assertEquals($expected, $result);
         $this->assertEquals($str, $stringy);
     }