serbanghita / Mobile-Detect

lib/MobileDetect.php

Doc Comments +7 added lines, -3 removed lines

@@ -536,6 +536,10 @@ 
         return null;
     }
 
+    /**
+     * @param string $entity
+     * @param string|null $against
+     */
     protected function matchEntity($entity, $tests, $against)
     {
         if ($entity == 'version') {
@@ -805,7 +809,7 @@ 
     }
 
     /**
-     * @param $regex
+     * @param string $regex
      * @param $against
      * @param null $matches
      * @return int
@@ -883,7 +887,7 @@ 
     /**
      * Try to get the device from cache if available.
      *
-     * @param $key string The key.
+     * @param string|null $key string The key.
      *
      * @return DeviceInterface|null
      */
@@ -901,7 +905,7 @@ 
     /**
      * Try to save the detected device in cache.
      *
-     * @param $key string The key.
+     * @param string|null $key string The key.
      * @param DeviceInterface $obj The device.
      *
      * @return bool false if not succeeded.

Spacing +2 added lines, -2 removed lines

@@ -610,7 +610,7 @@ 
     public function detect($deviceClass = null)
     {
         if ($deviceClass) {
-            if (!is_subclass_of($deviceClass, __NAMESPACE__ . '\Device\DeviceInterface')) {
+            if (!is_subclass_of($deviceClass, __NAMESPACE__.'\Device\DeviceInterface')) {
                 $type = gettype($deviceClass);
                 if ($type == 'object') {
                     $type = get_class($deviceClass);
@@ -623,7 +623,7 @@ 
             }
         } else {
             // default implementation
-            $deviceClass = __NAMESPACE__ . '\Device\Device';
+            $deviceClass = __NAMESPACE__.'\Device\Device';
         }
 
         // Cache check.

lib/Providers/Browsers.php

Indentation +107 added lines, -107 removed lines

@@ -191,115 +191,115 @@
     // Updated from https://en.wikipedia.org/wiki/Safari_version_history
     public function getSafariVersions()
     {
-          return array(
-              // On Mac OS.
-              '0.8' => array('version' => '48', 'codename' => ''),
-              '73' => array('version' => '0.9', 'codename' => ''),
-              // v. 1.0
-              '85' => array('version' => '1.0', 'codename' => ''),
-              '85.8.5' => array('version' => '1.0.3', 'codename' => ''),
-              '100' => array('version' => '1.1', 'codename' => ''),
-              '125' => array('version' => '1.2', 'codename' => ''),
-              '312' => array('version' => '1.3', 'codename' => ''),
-              '312.3' => array('version' => '1.3.1', 'codename' => ''),
-              '312.5' => array('version' => '1.3.2', 'codename' => ''),
-              '312.6' => array('version' => '1.3.2', 'codename' => ''),
-              '412' => array('version' => '2.0', 'codename' => ''),
-              '416.11' => array('version' => '2.0.2', 'codename' => ''),
-              '419.3' => array('version' => '2.0.4', 'codename' => ''),
-              '522.11' => array('version' => '3.0', 'codename' => ''),
-              '522.12' => array('version' => '3.0.2', 'codename' => ''),
-              '522.12.1' => array('version' => '3.0.3', 'codename' => ''),
-              '523.10' => array('version' => '3.0.4', 'codename' => ''),
-              '525.13' => array('version' => '3.1', 'codename' => ''),
-              '525.17' => array('version' => '3.1.1', 'codename' => ''),
-              '525.20' => array('version' => '3.1.1', 'codename' => ''),
-              '525.21' => array('version' => '3.1.2', 'codename' => ''),
-              '525.26' => array('version' => '3.2', 'codename' => ''),
-              '525.27' => array('version' => '3.2.1', 'codename' => ''),
-              '525.28' => array('version' => '3.2.3', 'codename' => ''),
-              '526.11.2' => array('version' => '4.0 Beta', 'codename' => ''),
-              '528.16' => array('version' => array('4.0', '4.0 Beta'), 'codename' => ''),
-              '528.17' => array('version' => array('4.0', '4.0 Beta'), 'codename' => ''),
-              '530.17' => array('version' => array('4.0', '4.0.1'), 'codename' => ''),
-              '530.18' => array('version' => '4.0.1', 'codename' => ''),
-              '530.19' => array('version' => '4.0.2', 'codename' => ''),
-              '531.9' => array('version' => '4.0.3', 'codename' => ''),
-              '531.21.10' => array('version' => '4.0.4', 'codename' => ''),
-              '531.22.7' => array('version' => '4.0.5', 'codename' => ''),
-              '533.16' => array('version' => array('4.1', '5.0'), 'codename' => ''),
-              '533.17.8' => array('version' => array('4.1.1', '5.0.1'), 'codename' => ''),
-              '533.18.5' => array('version' => array('4.1.2', '5.0.2'), 'codename' => ''),
-              '533.19.4' => array('version' => array('4.1.3', '5.0.3'), 'codename' => ''),
-              '533.20.27' => array('version' => '5.0.4', 'codename' => ''),
-              '533.21.1' => array('version' => '5.0.5', 'codename' => ''),
-              '533.22.3' => array('version' => '5.0.6', 'codename' => ''),
+            return array(
+                // On Mac OS.
+                '0.8' => array('version' => '48', 'codename' => ''),
+                '73' => array('version' => '0.9', 'codename' => ''),
+                // v. 1.0
+                '85' => array('version' => '1.0', 'codename' => ''),
+                '85.8.5' => array('version' => '1.0.3', 'codename' => ''),
+                '100' => array('version' => '1.1', 'codename' => ''),
+                '125' => array('version' => '1.2', 'codename' => ''),
+                '312' => array('version' => '1.3', 'codename' => ''),
+                '312.3' => array('version' => '1.3.1', 'codename' => ''),
+                '312.5' => array('version' => '1.3.2', 'codename' => ''),
+                '312.6' => array('version' => '1.3.2', 'codename' => ''),
+                '412' => array('version' => '2.0', 'codename' => ''),
+                '416.11' => array('version' => '2.0.2', 'codename' => ''),
+                '419.3' => array('version' => '2.0.4', 'codename' => ''),
+                '522.11' => array('version' => '3.0', 'codename' => ''),
+                '522.12' => array('version' => '3.0.2', 'codename' => ''),
+                '522.12.1' => array('version' => '3.0.3', 'codename' => ''),
+                '523.10' => array('version' => '3.0.4', 'codename' => ''),
+                '525.13' => array('version' => '3.1', 'codename' => ''),
+                '525.17' => array('version' => '3.1.1', 'codename' => ''),
+                '525.20' => array('version' => '3.1.1', 'codename' => ''),
+                '525.21' => array('version' => '3.1.2', 'codename' => ''),
+                '525.26' => array('version' => '3.2', 'codename' => ''),
+                '525.27' => array('version' => '3.2.1', 'codename' => ''),
+                '525.28' => array('version' => '3.2.3', 'codename' => ''),
+                '526.11.2' => array('version' => '4.0 Beta', 'codename' => ''),
+                '528.16' => array('version' => array('4.0', '4.0 Beta'), 'codename' => ''),
+                '528.17' => array('version' => array('4.0', '4.0 Beta'), 'codename' => ''),
+                '530.17' => array('version' => array('4.0', '4.0.1'), 'codename' => ''),
+                '530.18' => array('version' => '4.0.1', 'codename' => ''),
+                '530.19' => array('version' => '4.0.2', 'codename' => ''),
+                '531.9' => array('version' => '4.0.3', 'codename' => ''),
+                '531.21.10' => array('version' => '4.0.4', 'codename' => ''),
+                '531.22.7' => array('version' => '4.0.5', 'codename' => ''),
+                '533.16' => array('version' => array('4.1', '5.0'), 'codename' => ''),
+                '533.17.8' => array('version' => array('4.1.1', '5.0.1'), 'codename' => ''),
+                '533.18.5' => array('version' => array('4.1.2', '5.0.2'), 'codename' => ''),
+                '533.19.4' => array('version' => array('4.1.3', '5.0.3'), 'codename' => ''),
+                '533.20.27' => array('version' => '5.0.4', 'codename' => ''),
+                '533.21.1' => array('version' => '5.0.5', 'codename' => ''),
+                '533.22.3' => array('version' => '5.0.6', 'codename' => ''),
 
-              // From https://bugs.webkit.org/show_bug.cgi?id=44230
-              '534.6+' => array('version' => '5.0.1', 'codename' => ''),
-              // From https://bugs.webkit.org/show_bug.cgi?id=45632
-              '534.8' => array('version' => '5.0.2', 'codename' => ''),
-              '534.8+' => array('version' => '5.0.2', 'codename' => ''),
-              // From https://bugs.webkit.org/show_bug.cgi?id=48312
-              '534.11' => array('version' => '5.0.2', 'codename' => ''),
-              '534.11+' => array('version' => '5.0.2', 'codename' => ''),
-              '534.48.3' => array('version' => '5.1', 'codename' => ''),
-              '534.51.22' => array('version' => '5.1.1', 'codename' => ''),
-              '534.52.7' => array('version' => '5.1.2', 'codename' => ''),
-              '534.53.10' => array('version' => '5.1.3', 'codename' => ''),
-              '534.54.16' => array('version' => '5.1.4', 'codename' => ''),
-              '534.55.3' => array('version' => '5.1.5', 'codename' => ''),
-              '534.56.5' => array('version' => '5.1.6', 'codename' => ''),
-              '534.57.2' => array('version' => '5.1.7', 'codename' => ''),
-              '534.58.2' => array('version' => '5.1.8', 'codename' => ''),
-              '534.59.8' => array('version' => '5.1.9', 'codename' => ''),
-              '534.59.10' => array('version' => '5.1.10', 'codename' => ''),
-              '536.2+' => array('version' => '5.1.2', 'codename' => ''),
-              '536.25' => array('version' => '6.0', 'codename' => ''),
-              '536.26' => array('version' => '6.0.1', 'codename' => ''),
-              '536.26.17' => array('version' => '6.0.2', 'codename' => ''),
-              '536.28.10' => array('version' => '6.0.3', 'codename' => ''),
-              '536.29.13' => array('version' => '6.0.4', 'codename' => ''),
-              '536.30.1' => array('version' => '6.0.5', 'codename' => ''),
-              // From https://gist.github.com/rniwa/2721861
-              '537.1+' => array('version' => '5.1.5', 'codename' => ''),
-              '537.10+' => array('version' => '5.1', 'codename' => ''),
-              '537.43.58' => array('version' => '6.1', 'codename' => ''),
-              '537.73.11' => array('version' => array('6.1.1', '7.0.1'), 'codename' => ''),
-              // @todo fill gaps here from 6.1.2 to 6.2.7
-              '537.85.17' => array('version' => array('6.2.8', '7.1.8'), 'codename' => ''),
-              '537.71' => array('version' => '7.0', 'codename' => ''),
-              // @todo fill gaps here for 7.0.2
-              '537.75.14' => array('version' => '7.0.3', 'codename' => ''),
-              '537.76.4' => array('version' => '7.0.4', 'codename' => ''),
-              '537.77.4' => array('version' => '7.0.5', 'codename' => ''),
-              '537.78.2' => array('version' => '7.0.6', 'codename' => ''),
-              // @todo fill gaps here for 7.1 to 7.1.7
-              '538.35.8' => array('version' => '8.0', 'codename' => ''),
-              // @todo fill gaps here for 8.0.1 to 8.0.5
-              '600.6.3' => array('version' => '8.0.6', 'codename' => ''),
-              '600.7.12' => array('version' => '8.0.7', 'codename' => ''),
-              // @todo fill gap here for 8.0.8
+                // From https://bugs.webkit.org/show_bug.cgi?id=44230
+                '534.6+' => array('version' => '5.0.1', 'codename' => ''),
+                // From https://bugs.webkit.org/show_bug.cgi?id=45632
+                '534.8' => array('version' => '5.0.2', 'codename' => ''),
+                '534.8+' => array('version' => '5.0.2', 'codename' => ''),
+                // From https://bugs.webkit.org/show_bug.cgi?id=48312
+                '534.11' => array('version' => '5.0.2', 'codename' => ''),
+                '534.11+' => array('version' => '5.0.2', 'codename' => ''),
+                '534.48.3' => array('version' => '5.1', 'codename' => ''),
+                '534.51.22' => array('version' => '5.1.1', 'codename' => ''),
+                '534.52.7' => array('version' => '5.1.2', 'codename' => ''),
+                '534.53.10' => array('version' => '5.1.3', 'codename' => ''),
+                '534.54.16' => array('version' => '5.1.4', 'codename' => ''),
+                '534.55.3' => array('version' => '5.1.5', 'codename' => ''),
+                '534.56.5' => array('version' => '5.1.6', 'codename' => ''),
+                '534.57.2' => array('version' => '5.1.7', 'codename' => ''),
+                '534.58.2' => array('version' => '5.1.8', 'codename' => ''),
+                '534.59.8' => array('version' => '5.1.9', 'codename' => ''),
+                '534.59.10' => array('version' => '5.1.10', 'codename' => ''),
+                '536.2+' => array('version' => '5.1.2', 'codename' => ''),
+                '536.25' => array('version' => '6.0', 'codename' => ''),
+                '536.26' => array('version' => '6.0.1', 'codename' => ''),
+                '536.26.17' => array('version' => '6.0.2', 'codename' => ''),
+                '536.28.10' => array('version' => '6.0.3', 'codename' => ''),
+                '536.29.13' => array('version' => '6.0.4', 'codename' => ''),
+                '536.30.1' => array('version' => '6.0.5', 'codename' => ''),
+                // From https://gist.github.com/rniwa/2721861
+                '537.1+' => array('version' => '5.1.5', 'codename' => ''),
+                '537.10+' => array('version' => '5.1', 'codename' => ''),
+                '537.43.58' => array('version' => '6.1', 'codename' => ''),
+                '537.73.11' => array('version' => array('6.1.1', '7.0.1'), 'codename' => ''),
+                // @todo fill gaps here from 6.1.2 to 6.2.7
+                '537.85.17' => array('version' => array('6.2.8', '7.1.8'), 'codename' => ''),
+                '537.71' => array('version' => '7.0', 'codename' => ''),
+                // @todo fill gaps here for 7.0.2
+                '537.75.14' => array('version' => '7.0.3', 'codename' => ''),
+                '537.76.4' => array('version' => '7.0.4', 'codename' => ''),
+                '537.77.4' => array('version' => '7.0.5', 'codename' => ''),
+                '537.78.2' => array('version' => '7.0.6', 'codename' => ''),
+                // @todo fill gaps here for 7.1 to 7.1.7
+                '538.35.8' => array('version' => '8.0', 'codename' => ''),
+                // @todo fill gaps here for 8.0.1 to 8.0.5
+                '600.6.3' => array('version' => '8.0.6', 'codename' => ''),
+                '600.7.12' => array('version' => '8.0.7', 'codename' => ''),
+                // @todo fill gap here for 8.0.8
 
-              // On Windows
-              '522.11.3' => array('version' => '3.0', 'codename' => ''),
-              '522.12.2' => array('version' => '3.0.1', 'codename' => ''),
-              '522.13.1' => array('version' => '3.0.2', 'codename' => ''),
-              '522.15.5' => array('version' => '3.0.3', 'codename' => ''),
-              '523.12.9' => array('version' => '3.0.4', 'codename' => ''),
-              '523.13' => array('version' => '3.0.4', 'codename' => ''),
-              '523.15' => array('version' => '3.0.4', 'codename' => ''),
-              '525.26.13' => array('version' => '3.2', 'codename' => ''),
-              '525.27.1' => array('version' => '3.2.1', 'codename' => ''),
-              '525.28.1' => array('version' => '3.2.2', 'codename' => ''),
-              '525.29.1' => array('version' => '3.2.3', 'codename' => ''),
-              '526.12.2' => array('version' => '4.0', 'codename' => ''),
-              '528.1.1' => array('version' => '4.0', 'codename' => ''),
-              '530.19.1' => array('version' => '4.0.2', 'codename' => ''),
-              '531.9.1' => array('version' => '4.0.3', 'codename' => ''),
-              '534.30' => array('version' => '5.1', 'codename' => ''),
-              '534.50' => array('version' => '5.1', 'codename' => ''),
-          );
+                // On Windows
+                '522.11.3' => array('version' => '3.0', 'codename' => ''),
+                '522.12.2' => array('version' => '3.0.1', 'codename' => ''),
+                '522.13.1' => array('version' => '3.0.2', 'codename' => ''),
+                '522.15.5' => array('version' => '3.0.3', 'codename' => ''),
+                '523.12.9' => array('version' => '3.0.4', 'codename' => ''),
+                '523.13' => array('version' => '3.0.4', 'codename' => ''),
+                '523.15' => array('version' => '3.0.4', 'codename' => ''),
+                '525.26.13' => array('version' => '3.2', 'codename' => ''),
+                '525.27.1' => array('version' => '3.2.1', 'codename' => ''),
+                '525.28.1' => array('version' => '3.2.2', 'codename' => ''),
+                '525.29.1' => array('version' => '3.2.3', 'codename' => ''),
+                '526.12.2' => array('version' => '4.0', 'codename' => ''),
+                '528.1.1' => array('version' => '4.0', 'codename' => ''),
+                '530.19.1' => array('version' => '4.0.2', 'codename' => ''),
+                '531.9.1' => array('version' => '4.0.3', 'codename' => ''),
+                '534.30' => array('version' => '5.1', 'codename' => ''),
+                '534.50' => array('version' => '5.1', 'codename' => ''),
+            );
     }
     
     

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
                 'model' => 'Opera Desktop',
                 'isMobile' => false,
                 'identityMatches' => '\bOpera\b| OPR/',
-                'versionMatches' => array('Opera/[VER]', ' OPR/[VER]', 'Version/[VER]' ),
+                'versionMatches' => array('Opera/[VER]', ' OPR/[VER]', 'Version/[VER]'),
             ),
         ),
         /**

lib/Providers/OperatingSystems.php

Spacing +9 added lines, -9 removed lines

@@ -231,15 +231,15 @@
             'GRH78C' => array('version' => '2.3.2_r1', 'codename' =>  'Gingerbread'),
             'GRH78' => array('version' => '2.3.1_r1', 'codename' =>  'Gingerbread'),
             'GRH55' => array('version' => '2.3_r1', 'codename' =>  'Gingerbread'),
-            'FRK76C' => array('version' => '2.2.3_r2' , 'codename' => 'Froyo'),
-            'FRK76' => array('version' => '2.2.3_r1' , 'codename' => 'Froyo'),
-            'FRG83G' => array('version' => '2.2.2_r1' , 'codename' => 'Froyo'),
-            'FRG83D' => array('version' => '2.2.1_r2' , 'codename' => 'Froyo'),
-            'FRG83' => array('version' => '2.2.1_r1' , 'codename' => 'Froyo'),
-            'FRG22D' => array('version' => '2.2_r1.3' , 'codename' => 'Froyo'),
-            'FRG01B' => array('version' => '2.2_r1.2' , 'codename' => 'Froyo'),
-            'FRF91' => array('version' => '2.2_r1.1' , 'codename' => 'Froyo'),
-            'FRF85B' => array('version' => '2.2_r1' , 'codename' => 'Froyo'),
+            'FRK76C' => array('version' => '2.2.3_r2', 'codename' => 'Froyo'),
+            'FRK76' => array('version' => '2.2.3_r1', 'codename' => 'Froyo'),
+            'FRG83G' => array('version' => '2.2.2_r1', 'codename' => 'Froyo'),
+            'FRG83D' => array('version' => '2.2.1_r2', 'codename' => 'Froyo'),
+            'FRG83' => array('version' => '2.2.1_r1', 'codename' => 'Froyo'),
+            'FRG22D' => array('version' => '2.2_r1.3', 'codename' => 'Froyo'),
+            'FRG01B' => array('version' => '2.2_r1.2', 'codename' => 'Froyo'),
+            'FRF91' => array('version' => '2.2_r1.1', 'codename' => 'Froyo'),
+            'FRF85B' => array('version' => '2.2_r1', 'codename' => 'Froyo'),
             'EPF21B' => array('version' => '2.1_r2.1p2', 'codename' => 'Eclair'),
             'ESE81' => array('version' => '2.1_r2.1s', 'codename' => 'Eclair'),
             'EPE54B' => array('version' => '2.1_r2.1p', 'codename' => 'Eclair'),