Merge pull request #20 from woothee/remove_dead_code_for_ios

Remove daed code for iOS iPhone/iPod/iPad detection is implemented in src/AgentCategory/Os/SmartPhone.php. So remove from src/AgentCategory/Os/Osx.php.
woothee · Feb 1, 2015 · aa8313e · aa8313e
2 parents 88aa4fe + d504d20
commit aa8313e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/AgentCategory/Os/Osx.php b/src/AgentCategory/Os/Osx.php
@@ -16,17 +16,7 @@ public static function challenge($ua, &$result)
         $version = null;
 
         if (strpos($ua, 'like Mac OS X') !== false) {
-            if (strpos($ua, 'iPhone;') !== false) {
-                $data = DataSet::get('iPhone');
-            } elseif (strpos($ua, 'iPad') !== false) {
-                $data = DataSet::get('iPad');
-            } elseif (strpos($ua, 'iPod') !== false) {
-                $data = DataSet::get('iPod');
-            }
-
-            if (preg_match('/; CPU(?: iPhone)? OS (\\d+_\\d+(?:_\\d+)?) like Mac OS X/', $ua, $matches) === 1) {
-                $version = str_replace('_', '.', $matches[1]);
-            }
+            return false;
         } else {
             if (preg_match('/Mac OS X (10[._]\\d+(?:[._]\\d+)?)(?:\\)|;)/', $ua, $matches) === 1) {
                 $version = str_replace('_', '.', $matches[1]);

diff --git a/src/AgentCategory/Os/SmartPhone.php b/src/AgentCategory/Os/SmartPhone.php
@@ -11,12 +11,15 @@ public static function challenge($ua, &$result)
         $data = null;
         $version = null;
 
-        if (strpos($ua, 'iPhone') !== false) {
-            $data = DataSet::get('iPhone');
+        if (strpos($ua, 'iPod') !== false) {
+            $data = DataSet::get('iPod');
+            $version = static::parseIosVersion($ua);
         } elseif (strpos($ua, 'iPad') !== false) {
             $data = DataSet::get('iPad');
-        } elseif (strpos($ua, 'iPod') !== false) {
-            $data = DataSet::get('iPod');
+            $version = static::parseIosVersion($ua);
+        } elseif (strpos($ua, 'iPhone') !== false) {
+            $data = DataSet::get('iPhone');
+            $version = static::parseIosVersion($ua);
         } elseif (strpos($ua, 'Android') !== false) {
             $data = DataSet::get('Android');
         } elseif (strpos($ua, 'CFNetwork') !== false) {
@@ -48,4 +51,11 @@ public static function challenge($ua, &$result)
 
         return true;
     }
+
+    private static function parseIosVersion($ua)
+    {
+        if (preg_match('/; CPU(?: iPhone)? OS (\\d+_\\d+(?:_\\d+)?) like Mac OS X/', $ua, $matches) === 1) {
+            return str_replace('_', '.', $matches[1]);
+        }
+    }
 }