WhichBrowser update + PHP7 compability

ThaDafinser · Nov 12, 2015 · e3c70f2 · e3c70f2
1 parent 2cb2ad5
commit e3c70f2
Show file tree

Hide file tree

Showing 4 changed files with 2,257 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,11 +8,6 @@ php:
   - 7.0
   - hhvm
 
-matrix:
-    allow_failures:
-        - php: 7.0
-        - php: hhvm
-
 cache:
   directories:
   - $TRAVIS_BUILD_DIR/resources

diff --git a/composer.json b/composer.json
@@ -36,11 +36,7 @@
     "autoload": {
         "psr-4": {
             "UserAgentParser\\":  "src"
-        },
-
-        "classmap": [
-            "vendor/whichbrowser/whichbrowser/libraries/whichbrowser.php"
-        ]
+        }
     },
 
     "autoload-dev": {
@@ -62,7 +58,7 @@
 
         "ua-parser/uap-php": "^3.4",
 
-        "whichbrowser/whichbrowser": "^1.0",
+        "whichbrowser/whichbrowser": ">=1.0.1039,<1.1",
 
         "woothee/woothee": "^1.2",