DeviceDetector Feature: Based on structure of Chrome for Android UA

src/Device.php

@@ -9,6 +9,7 @@ class Device
     const IPAD = 'iPad';
     const IPHONE = 'iPhone';
     const WINDOWS_PHONE = 'Windows Phone';
+    const ANDROID_PHONE = 'Android Phone';
 
     /**
      * @var string

src/DeviceDetector.php

@@ -19,7 +19,8 @@ public static function detect(Device $device, UserAgent $userAgent)
             self::checkIpad($device, $userAgent) ||
             self::checkIphone($device, $userAgent) ||
             self::checkWindowsPhone($device, $userAgent) ||
-            self::checkSamsungPhone($device, $userAgent)
+            self::checkSamsungPhone($device, $userAgent) ||
+            self::checkAndroidPhone($device, $userAgent)
         );
     }
 
@@ -79,16 +80,39 @@ private static function checkWindowsPhone(Device $device, UserAgent $userAgent)
     }
 
     /**
-     * Determine if the device is Windows Phone.
+     * Determine if the device is Samsung Phone.
      *
      * @param Device $device
      * @param UserAgent $userAgent
      * @return bool
      */
     private static function checkSamsungPhone(Device $device, UserAgent $userAgent)
     {
-        if (preg_match('/SAMSUNG SM-([^ ]*)/i', $userAgent->getUserAgentString(), $matches)) {
-            $device->setName(str_ireplace('SAMSUNG', 'Samsung', $matches[0]));
+            if (preg_match('/SAMSUNG SM-([^ ]*)/i', $userAgent->getUserAgentString(), $matches)) {
+                $device->setName(str_ireplace('SAMSUNG', 'Samsung', $matches[0]));
+                return true;
+            }
+
+        return false;
+    }
+
+
+    /**
+     * Determine if the device is an Android Phone if Chrome is in use, and returns the Model-Code in $device setName
+     *
+     * @param Device $device
+     * @param UserAgent $userAgent
+     * @return bool
+     */
+    private static function checkAndroidPhone(Device $device, UserAgent $userAgent)
+    {
+        if (stripos($userAgent->getUserAgentString(), 'Android') !== false) {
+            if (preg_match('/Linux; (Android [0-9\.]*); (?<modell>.*)\) AppleWebKit/', $userAgent->getUserAgentString(), $matches)) {
+                $device->setName("Android_".preg_replace('/ Build.*$/', '', $matches["modell"]));
+                return true;
+            }
+
+            $device->setName($device::ANDROID_PHONE);
             return true;
         }
         return false;