Merge pull request #1 from ornicar/master

Latest updates from Ornicar

Author: 4levels

.gitignore

@@ -1 +1,3 @@
 nbproject
+
+/.idea

CHANGELOG

@@ -0,0 +1,13 @@
+# CHANGELOG
+
+### 1.0.1 (????-??-??)
+
+ * f1b82e5 - [Composer] Add branch alias support
+
+### 1.0.0 (2013-08-09)
+
+ * Add a version following semver spec.
+
+### v1.0 (2010-04-13)
+
+ * Create initial 1.0 version

CHANGELOG.md

@@ -5,12 +5,14 @@ Uses a simple and fast algorithm to recognize major browsers.
 
 ## Overview
 
-    $userAgent = new phpUserAgent();
+``` php
+$userAgent = new phpUserAgent();
 
-    $userAgent->getBrowserName()      // firefox
-    $userAgent->getBrowserVersion()   // 3.6
-    $userAgent->getOperatingSystem()  // linux
-    $userAgent->getEngine()           // gecko
+$userAgent->getBrowserName()      // firefox
+$userAgent->getBrowserVersion()   // 3.6
+$userAgent->getOperatingSystem()  // linux
+$userAgent->getEngine()           // gecko
+```
 
 ### Why you should use it
 
@@ -26,17 +28,20 @@ It is performant as well, since it doesn't do any iteration or recursion.
 
 ## Usage
 
-    // include the class
-    require_once '/path/to/php-user-agent/phpUserAgent.php';
+``` php
+// include classes or rely on Composer autoloader
+require_once '/path/to/php-user-agent/phpUserAgent.php';
+require_once '/path/to/php-user-agent/phpUserAgentStringParser.php';
 
-    // Create a user agent
-    $userAgent = new phpUserAgent();
+// Create a user agent
+$userAgent = new phpUserAgent();
 
-    // Interrogate the user agent
-    $userAgent->getBrowserName()      // firefox
-    $userAgent->getBrowserVersion()   // 3.6
-    $userAgent->getOperatingSystem()  // linux
-    $userAgent->getEngine()           // gecko
+// Interrogate the user agent
+$userAgent->getBrowserName()      // firefox
+$userAgent->getBrowserVersion()   // 3.6
+$userAgent->getOperatingSystem()  // linux
+$userAgent->getEngine()           // gecko
+```
 
 ## Advanced
 
@@ -45,34 +50,40 @@ It is performant as well, since it doesn't do any iteration or recursion.
 When you create a phpUserAgent object, the current user agent string is used.
 You can specify another user agent string:
 
-    // use another user agent string
-    $userAgent = new phpUserAgent('msnbot/2.0b (+http://search.msn.com/msnbot.htm)');
-    $userAgent->getBrowserName() // msnbot
+``` php
+// use another user agent string
+$userAgent = new phpUserAgent('msnbot/2.0b (+http://search.msn.com/msnbot.htm)');
+$userAgent->getBrowserName() // msnbot
 
-    // use current user agent string
-    $userAgent = new phpUserAgent($_SERVER['HTTP_USER_AGENT');
-    // this is equivalent to:
-    $userAgent = new phpUserAgent();
+// use current user agent string
+$userAgent = new phpUserAgent($_SERVER['HTTP_USER_AGENT');
+// this is equivalent to:
+$userAgent = new phpUserAgent();
+```
 
 ### Custom parser class
 
 By default, phpUserAgentStringParser is used to analyse the user agent string.
 You can replace the parser instance and customize it to match your needs:
 
-    // create a custom user agent string parser
-    class myUserAgentStringParser extends phpUserAgentStringParser
-    {
-      // override methods
-    }
+``` php
+// create a custom user agent string parser
+class myUserAgentStringParser extends phpUserAgentStringParser
+{
+  // override methods
+}
 
-    // inject the custom parser when creating a user agent:
-    $userAgent = new phpUserAgent(null, new myUserAgentStringParser());
+// inject the custom parser when creating a user agent:
+$userAgent = new phpUserAgent(null, new myUserAgentStringParser());
+```
 
 ## Run tests
 
 You can run the unit tests on your server:
 
-    php prove.php
+``` bash
+$ php prove.php
+```
 
 ## Contribute
 

README.markdown renamed to README.md

@@ -0,0 +1,26 @@
+{
+    "name": "ornicar/php-user-agent",
+    "type": "library",
+    "keywords": [ "user-agent" ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Thibault Duplessis",
+            "email": "thibault.duplessis@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "files": [
+            "lib/phpUserAgent.php",
+            "lib/phpUserAgentStringParser.php"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
+}

composer.json

@@ -12,8 +12,6 @@
  * Tickets:       http://github.com/ornicar/php-user-agent/issues
  */
 
-require_once(dirname(__FILE__).'/phpUserAgentStringParser.php');
-
 class phpUserAgent
 {
   protected $userAgentString;

lib/phpUserAgent.php

@@ -27,6 +27,7 @@ public function parse($userAgentString = null)
     // parse quickly (with medium accuracy)
     $informations = $this->doParse($userAgentString);
 
+
     // run some filters to increase accuracy
     foreach($this->getFilters() as $filter)
     {
@@ -136,11 +137,12 @@ public function cleanUserAgentString($userAgentString)
   public function getFilters()
   {
     return array(
+      'filterAndroid',
       'filterGoogleChrome',
       'filterSafariVersion',
       'filterOperaVersion',
       'filterYahoo',
-      'filterMsie'
+      'filterMsie',
     );
   }
 
@@ -305,4 +307,15 @@ protected function filterMsie(array &$userAgent)
       $userAgent['engine'] = 'trident';
     }
   }
+
+    /**
+     * Android has a safari like signature
+     */
+    protected function filterAndroid(array &$userAgent) {
+        if ('safari' === $userAgent['browser_name'] && strpos($userAgent['string'], 'android ')) {
+            $userAgent['browser_name'] = 'android';
+            $userAgent['operating_system'] = 'android';
+            $userAgent['browser_version'] = preg_replace('|.+android ([0-9]+(?:\.[0-9]+)+).+|', '$1', $userAgent['string']);
+        }
+    }
 }

lib/phpUserAgentStringParser.php

@@ -78,7 +78,31 @@
 
   // Iphone
   'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; de-de) AppleWebKit/528.18 (KHTML, like Gecko) Mobile/7D11'
-  => array('applewebkit', '528.18', 'iphone', 'webkit')
+  => array('applewebkit', '528.18', 'iphone', 'webkit'),
+
+    // Motorola Xoom
+    'Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'                                 =>
+    array('android', '3.0', 'android', 'webkit'),
+
+    // Samsung Galaxy Tab
+    'Mozilla/5.0 (Linux U Android 2.2 es-es GT-P1000 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'                            =>
+    array('android', '2.2', 'android', 'webkit'),
+
+    // Google Nexus
+    'Mozilla/5.0 (Linux; U; Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'                       =>
+    array('android', '2.2', 'android', 'webkit'),
+
+    // HTC Desire
+
+    'Mozilla/5.0 (Linux; U; Android 2.1-update1; de-de; HTC Desire 1.19.161.5 Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17' =>
+    array('android', '2.1', 'android', 'webkit'),
+
+    'Mozilla/5.0 (Linux; U; Android 2.3.6; ru-ru; GT-B5512 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1' =>
+    array('android', '2.3.6', 'android', 'webkit'),
+
+    // Nexus 7
+    'Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166  Safari/535.19' =>
+    array('android', '4.1.1', 'android', 'webkit'),
 );
 
 $t = new lime_test(count($tests));

test/StringParserTest.php

@@ -2,6 +2,7 @@
 
 require_once dirname(__FILE__).'/vendor/lime.php';
 require_once dirname(__FILE__).'/../lib/phpUserAgent.php';
+require_once dirname(__FILE__).'/../lib/phpUserAgentStringParser.php';
 
 $t = new lime_test(12);