Merge pull request #112 from liip/rawkode-bugfix/windows-phone-user-a…

…gent-detection Rawkode bugfix/windows phone user agent detection
liip · Jan 21, 2015 · 7e7756f · 7e7756f
2 parents 3a4dbf2 + 4e8dc50
commit 7e7756f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,19 +10,9 @@ php:
 env:
   - SYMFONY_VERSION=2.3.*
 
-before_script:
-  - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
-  - composer update
-
-script: phpunit --coverage-text
-
-notifications:
-  slack: liip:3QOs1QKt3aCFxpJvRzpJCbVZ
-
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
-    - php: hhvm
   include:
     - php: 5.5
       env: SYMFONY_VERSION=2.0.*
@@ -35,4 +25,15 @@ matrix:
     - php: 5.5
       env: SYMFONY_VERSION=2.5.*
     - php: 5.5
-      env: SYMFONY_VERSION=dev-master
+      env: SYMFONY_VERSION=2.6.*
+    - php: 5.5
+      env: SYMFONY_VERSION='2.7.*@dev'
+
+before_script:
+  - composer self-update
+  - composer require symfony/framework-bundle:${SYMFONY_VERSION}
+
+script: phpunit --coverage-text
+
+notifications:
+  slack: liip:3QOs1QKt3aCFxpJvRzpJCbVZ
diff --git a/Helper/DeviceDetection.php b/Helper/DeviceDetection.php
@@ -30,7 +30,7 @@ class DeviceDetection implements DeviceDetectionInterface
             "iphone" => "(iphone|ipod)",
             "palm" => "(avantgo|blazer|elaine|hiptop|palm|plucker|xiino|webOS)",
             "windows" => "windows ce; (iemobile|ppc|smartphone)",
-            "windowsphone" => "windows phone os",
+            "windowsphone" => "windows phone",
             "generic" => "(mobile|mmp|midp|o2|pda|pocket|psp|symbian|smartphone|treo|up.browser|up.link|vodafone|wap|opera mini|opera mobi|opera mini)",
         ),
         "desktop" => array(

diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
         "symfony/framework-bundle": "~2.0"
     },
     "require-dev":{
-        "symfony/console": "~2.0"
+        "symfony/console": "~2.0",
+        "symfony/expression-language": "~2.6"
     },
     "extra": {
         "branch-alias": {