UserAgentParserEnhanced is now required and used from it's own compos…

…er package (piwik/device-detector); additionally Spyc library is required as composer package and removed from piwik source
d19dotca · Apr 3, 2014 · cde0263 · cde0263
1 parent 47cd0bb
commit cde0263
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 27,004 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,6 @@ tests/javascript/enable_sqlite
 tests/javascript/unittest.dbf
 tests/lib/geoip-files/*.dat*
 tests/lib/xhprof*
-tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml.new
 tests/PHPUnit/Integration/processed/
 tests/PHPUnit/phpunit.xml
 tests/results/

diff --git a/composer.json b/composer.json
@@ -23,6 +23,8 @@
         "twig/twig": "1.*",
         "leafo/lessphp": "~0.3",
         "symfony/console": ">=v2.3.5",
-        "tedivm/jshrink": "v0.5.1"
+        "tedivm/jshrink": "v0.5.1",
+        "mustangostang/spyc": "*",
+        "piwik/device-detector": "dev-master"
     }
 }
diff --git a/libs/UserAgentParser/UserAgentParser.php b/libs/UserAgentParser/UserAgentParser.php
@@ -655,9 +655,9 @@ static public function getBrowserNameFromId($browserId)
         if (isset(self::$browserIdToName[$browserId])) {
             return self::$browserIdToName[$browserId];
         }
-        if(class_exists('UserAgentParserEnhanced')) {
-            if( !empty(UserAgentParserEnhanced::$browsers[$browserId])) {
-                return UserAgentParserEnhanced::$browsers[$browserId];
+        if(class_exists('DeviceDetector')) {
+            if( !empty(DeviceDetector::$browsers[$browserId])) {
+                return DeviceDetector::$browsers[$browserId];
             }
         }
         return false;
@@ -692,8 +692,8 @@ static public function getOperatingSystemNameFromId($osId)
             return self::$operatingSystemsIdToName[$osId];
         }
 
-        if(class_exists('UserAgentParserEnhanced')) {
-            return UserAgentParserEnhanced::getOsNameFromId($osId);
+        if(class_exists('DeviceDetector')) {
+            return DeviceDetector::getOsNameFromId($osId);
         }
         return false;
     }