Merge branch 'master' of github.com:vierbergenlars/php-semver

# By Jonathan Chan (1) and others
# Via Lars Vierbergen (3) and Tom Rochette (1)
* 'master' of github.com:vierbergenlars/php-semver:
  Update travis.yml configuration.
  Typo fixed in variable
  Make sure to throw the right exception (fixes #39)
  fixed reference in bin/semver to latest version of code - fixes #35

Author: vierbergenlars

.travis.yml

@@ -1,6 +1,19 @@
 language: php
+
 php:
   - 5.3
   - 5.4
-before_script: composer install --dev --prefer-source
-script: php tests/all_tests.php
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+   - php: 7.0
+
+before_script:
+  - composer install --dev --prefer-source
+
+script:
+  - php tests/all_tests.php

bin/semver

@@ -107,7 +107,7 @@ function filter($versions, $ranges) {
         try {
             $v = new version($version);
             foreach ($ranges as $range) {
-                if ($v->satisfies(new versionExpression($range)))
+                if ($v->satisfies(new expression($range)))
                     continue;
                 $ok = false;
                 break;

src/vierbergenlars/LibJs/RegExp.php

@@ -67,7 +67,7 @@ public function __construct($regex, $flags = '')
     public function exec($str)
     {
         if($this->global) {
-            if(!preg_match_all($this->_pregSource, (string)$src, $matches))
+            if(!preg_match_all($this->_pregSource, (string)$str, $matches))
                 return null;
         } else {
             if(!preg_match($this->_pregSource, (string)$str, $matches))
@@ -93,4 +93,4 @@ public function valueOf()
     {
         return $this->regex;
     }
-}
+}

src/vierbergenlars/SemVer/version.php

@@ -21,7 +21,11 @@ class version
      */
     public function __construct($version, $loose = false)
     {
-        $this->version = new SemVer($version, $loose);
+        try {
+            $this->version = new SemVer($version, $loose);
+        } catch(\RuntimeException $ex) {
+            throw new SemVerException($ex->getMessage(), $version);
+        }
     }
 
     /**
@@ -92,7 +96,7 @@ public function valid()
      * Increment the version number
      * @param  string                         $what One of 'major', 'minor', 'patch' or 'prerelease'
      * @return \vierbergenlars\SemVer\version
-     * @throws SemVerException                When an invalid increment value is given
+     * @throws LogicException                When an invalid increment value is given
      */
     public function inc($what)
     {
@@ -122,7 +126,7 @@ public function __toString()
      * @param  string                   $v2  The second version
      * @param  bool                     $loose
      * @return bool
-     * @throws UnexpectedValueException
+     * @throws LogicException
      */
     public static function cmp($v1, $cmp, $v2, $loose = false)
     {