Version 2, I will not stfu ;)

Author: frankdejonge

.gitignore

@@ -0,0 +1 @@
+vendor

README.markdown

@@ -11,23 +11,23 @@ Holmes is an easy to use mobile detection library based on php-mobile-detect
 ## Usage
 
     // Determine if request is from a mobile device
-    Holmes::is_mobile(); // returns boolean
+    Holmes\Holmes::is_mobile(); // returns boolean
 
     // Determine the type of device
-    $device = Holmes::get_device(); // returns string (or default)
+    $device = Holmes\Holmes::get_device(); // returns string (or default)
 
-    // Holmes::get_device() will throw a DeviceNotDetectedException exception if no default is passed
+    // Holmes\Holmes::get_device() will throw a DeviceNotDetectedException exception if no default is passed
     // and could not detect a mobile device. Passing a default will return the default in lieu of an
     // exception
 
     // Determine if a specific device is being used
     // Any supported device below is acceptable
     // lowercased no spaces, obviously. <3
-    Holmes::is_ipad();
-    Holmes::is_blackberrytablet();
+    Holmes\Holmes::is_ipad();
+    Holmes\Holmes::is_blackberrytablet();
 
     // Modern (Android/iPad) tablet
-    Holmes::is_tablet();
+    Holmes\Holmes::is_tablet();
 ## Supported Device Types
 
 * Android

composer.json

@@ -0,0 +1,11 @@
+{
+    "name": "holmes/holmes",
+    "description": "Mobile device detection",
+    "minimum-stability": "dev",
+    "require": {
+		"php": ">=5.3.3"
+	},
+	"autoload": {
+		"classmap": ["Holmes.php"]
+	}
+}

holmes.php

@@ -1,7 +1,10 @@
 <?php
 
-class InvalidMethodException extends Exception {}
-class DeviceNotDetectedException extends Exception {}
+namespace Holmes;
+
+use BadMethodCallException;
+
+class DeviceNotDetectedException extends \Exception {}
 
 /**
 * Holmes
@@ -10,10 +13,12 @@ class DeviceNotDetectedException extends Exception {}
 */
 class Holmes
 {
-    // regex and patterns from php-mobile-detect
-    private static $devices = array(
+    /**
+     * @var  array  $devices  regex and patterns from php-mobile-detect
+     */
+    protected static $devices = array(
         "android"           => "android.*mobile",
-        "androidtablet"     => "android' + 'chrome/[.0-9]* (?!mobile)",
+        "androidtablet"     => "android' + 'chrome\/[.0-9]* (?!mobile)",
         "blackberry"        => "blackberry",
         "blackberrytablet"  => "rim tablet os",
         "iphone"            => "(iphone|ipod)",
@@ -27,25 +32,44 @@ class Holmes
         "generic"           => "(kindle|mobile|mmp|midp|pocket|psp|symbian|smartphone|treo|up.browser|up.link|vodafone|wap|opera mini)"
     );
 
+    /**
+     * Magic tester method.
+     *
+     * @param   string   $name       method name
+     * @param   array    $arguments  method arguments
+     * @return  boolean  static::isDevice result
+     */
     public static function __callStatic($name, $arguments)
     {
-        $device = array_pop(explode('_', $name));
-        if (array_key_exists($device, self::$devices))
+        $parts = preg_split('/(?=[A-Z])/', $name);
+        $device = strtolower(array_pop($parts));
+
+        if (array_key_exists($device, static::$devices))
         {
-            return self::is_device($device);
+            return static::isDevice($device);
         }
         else
         {
-            throw new InvalidMethodException('Invalid method called.');
+            throw new BadMethodCallException('Invalid method called.');
         }
     }
 
-    public static function is_tablet()
+    /**
+     * Detect wether it's a tablet device
+     *
+     * @return  boolean  wether it's a tablet device
+     */
+    public static function isTablet()
     {
-        return static::is_androidtablet() || static::is_ipad();
+        return static::isAndroidtablet() || static::isIpad();
     }
 
-    public static function is_mobile()
+    /**
+     * Detect wether it's a mobile device
+     *
+     * @return  boolean  wether it's a mobile device
+     */
+    public static function isMobile()
     {
         $accept = $_SERVER['HTTP_ACCEPT'];
 
@@ -57,21 +81,33 @@ public static function is_mobile()
         {
             return true;
         }
-        else
+
+        foreach (array_keys(static::$devices) as $device)
         {
-            foreach (array_keys(self::$devices) as $device)
+            if (static::isDevice($device))
             {
-                if (self::is_device($device)) return true;
+                return true;
             }
         }
+
         return false;
     }
 
-    public static function get_device($default = false)
+    /**
+     * Retrieve the device type
+     *
+     * @param   boolean  $default  default device
+     * @return  string   device name
+     * @throws  Holmes\DeviceNotDetectedException
+     */
+    public static function getDevice($default = false)
     {
-        foreach (array_keys(self::$devices) as $device)
+        foreach (array_keys(static::$devices) as $device)
         {
-            if (self::is_device($device)) return $device;
+            if (static::isDevice($device))
+            {
+                return $device;
+            }
         }
 
         if ($default === false)
@@ -82,9 +118,16 @@ public static function get_device($default = false)
         return $default;
     }
 
-    protected static function is_device($device)
+    /**
+     * Detect wether it's a certaim device
+     *
+     * @param   string   $device  device name
+     * @return  boolean  wether it's a device
+     */
+    protected static function isDevice($device)
     {
         $ua = $_SERVER['HTTP_USER_AGENT'];
-        return (bool)preg_match("/" . self::$devices[$device] . "/i", $ua);
+
+        return (bool) preg_match('/' . static::$devices[$device] . '/i', $ua);
     }
 }