Merge pull request #25 from giggsey/hhvm

Add support for HHVM

.travis.yml

@@ -3,12 +3,14 @@ language: php
 matrix:
   allow_failures:
     - 5.6
+    - hhvm
 
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
 
 before_script:
  - wget http://getcomposer.org/composer.phar

src/libphonenumber/PhoneNumberUtil.php

@@ -1748,7 +1748,7 @@ public function maybeStripInternationalPrefixAndNormalize(&$number, $possibleIdd
         // Check to see if the number begins with one or more plus signs.
         $match = preg_match('/^' . self::$PLUS_CHARS_PATTERN . '/' . self::REGEX_FLAGS, $number, $matches, PREG_OFFSET_CAPTURE);
         if ($match > 0) {
-            $number = substr($number, $matches[0][1] + mb_strlen($matches[0][0]));
+            $number = mb_substr($number, $matches[0][1] + mb_strlen($matches[0][0]));
             // Can now normalize the rest of the number since we've consumed the "+" sign at the start.
             $number = $this->normalize($number);
             return CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN;