endorphin-studio / browser-detector

src/Detector.php

Doc Comments +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
     }
 
     /**
-     * @param $version Windows number version
+     * @param string $version Windows number version
      * @return string Windows version
      */
     private static function getWindowsVersion($version)

Spacing +23 added lines, -23 removed lines

@@ -53,26 +53,26 @@ 
      * Detector constructor.
      * @param string $pathToData Path to directory with xml data files
      */
-    private function __construct($pathToData='auto')
+    private function __construct($pathToData = 'auto')
     {
-        if($pathToData == 'auto')
+        if ($pathToData == 'auto')
         {
-            $this->setPathToData(str_replace('src','data',__DIR__).'/');
+            $this->setPathToData(str_replace('src', 'data', __DIR__).'/');
         }
 
-        $xml = array('robot','browser','device','os');
+        $xml = array('robot', 'browser', 'device', 'os');
         $xmlData = array();
-        foreach($xml as $name)
+        foreach ($xml as $name)
         {
             $xmlData[$name] = simplexml_load_file($this->getPathToData().$name.'.xml');
         }
         $this->setXmlData($xmlData);
     }
 
-    public static function analyse($uaString='UA', $pathToData='auto')
+    public static function analyse($uaString = 'UA', $pathToData = 'auto')
     {
         $ua = $uaString;
-        if($uaString == 'UA')
+        if ($uaString == 'UA')
         {
             $ua = $_SERVER['HTTP_USER_AGENT'];
         }
@@ -80,23 +80,23 @@ 
         $detector = new Detector($pathToData);
         $xml = $detector->getXmlData();
         $data = array();
-        foreach($xml as $key => $item)
+        foreach ($xml as $key => $item)
         {
-            $data[$key] = self::analysePart($xml,$key,$ua);
+            $data[$key] = self::analysePart($xml, $key, $ua);
         }
 
         $detectorResult = new DetectorResult();
         $detectorResult->uaString = $ua;
         $isRobot = false;
 
-        foreach($data as $key => $result)
+        foreach ($data as $key => $result)
         {
-            if(!$isRobot)
+            if (!$isRobot)
             {
                 switch ($key)
                 {
                     case 'robot':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $robot = new Robot($result);
                             $detectorResult->Robot = $robot;
@@ -106,7 +106,7 @@ 
                         }
                         break;
                     case 'os':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $os = new OS($result);
                             $os->setVersion(self::getVersion($result, $ua));
@@ -114,14 +114,14 @@ 
                         }
                         break;
                     case 'device':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $device = new Device($result);
                             $detectorResult->Device = $device;
                         }
                         break;
                     case 'browser':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $browser = new Browser($result);
                             $browser->setVersion(self::getVersion($result, $ua));
@@ -141,13 +141,13 @@ 
      * @param string $uaString User agent
      * @return \SimpleXMLElement xml element
      */
-    private static function analysePart($xmlData,$key,$uaString)
+    private static function analysePart($xmlData, $key, $uaString)
     {
         $data = $xmlData[$key]->data;
-        foreach($data as $xmlItem)
+        foreach ($data as $xmlItem)
         {
             $pattern = '/'.$xmlItem->pattern.'/';
-            if(preg_match($pattern,$uaString))
+            if (preg_match($pattern, $uaString))
             {
                 return $xmlItem;
             }
@@ -160,19 +160,19 @@ 
      * @param string $uaString User agent
      * @return string Version
      */
-    private static function getVersion(\SimpleXMLElement $xmlItem,$uaString)
+    private static function getVersion(\SimpleXMLElement $xmlItem, $uaString)
     {
-        if($xmlItem !== null)
+        if ($xmlItem !== null)
         {
-            if(isset($xmlItem->versionPattern))
+            if (isset($xmlItem->versionPattern))
             {
                 $vPattern = $xmlItem->versionPattern;
-                $version = '/' . $vPattern . '(\/| )[\w-._]{1,15}/';
+                $version = '/'.$vPattern.'(\/| )[\w-._]{1,15}/';
                 $uaString = str_replace(' NT', '', $uaString);
                 if (preg_match($version, $uaString)) {
                     preg_match($version, $uaString, $v);
                     $version = $v[0];
-                    $version = preg_replace('/' . $vPattern . '/', '', $version);
+                    $version = preg_replace('/'.$vPattern.'/', '', $version);
                     $version = str_replace(';', '', $version);
                     $version = str_replace(' ', '', $version);
                     $version = str_replace('/', '', $version);

src/Device.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
         {
             $this->Name = 'Desktop';
             $this->Type = 'desktop';
-        }
-        else
+        } else
         {
             parent::__construct($xmlData);
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData === null)
+        if ($xmlData === null)
         {
             $this->Name = 'Desktop';
             $this->Type = 'desktop';

src/Data.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child) {
                 switch ($child->getName()) {

src/OS.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
     public function __construct(\SimpleXMLElement $xmlData)
     {
         parent::__construct($xmlData);
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child) {
                 switch ($child->getName()) {
@@ -46,6 +46,6 @@ 
 
 }
 
-define('UNX','unix');
-define('WIN','windows');
-define('MC','mac');
+define('UNX', 'unix');
+define('WIN', 'windows');
+define('MC', 'mac');

src/Robot.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     {
         parent::__construct($xmlData);
 
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child)
             {

tests/BrowserTest.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
      */
     public function testFirefox()
     {
-        $this->assertEquals('Firefox',Detector::analyse('Mozilla/5.0 (Windows NT 6.3; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0 ')->Browser->getName());
+        $this->assertEquals('Firefox', Detector::analyse('Mozilla/5.0 (Windows NT 6.3; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0 ')->Browser->getName());
     }
 
     /**
@@ -25,7 +25,7 @@ 
      */
     public function testOpera()
     {
-        $this->assertEquals('Opera',Detector::analyse('Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16')->Browser->getName());
+        $this->assertEquals('Opera', Detector::analyse('Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16')->Browser->getName());
     }
 
 

tests/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@ 
  * @project browser-detector
  */
 
-$vendor = realpath(__DIR__ . '/../vendor/');
+$vendor = realpath(__DIR__.'/../vendor/');
 
-define('__SRC__',str_replace('tests','src',__DIR__));
-if (file_exists($vendor . '/autoload.php')) {
-    require $vendor . '/autoload.php';
+define('__SRC__', str_replace('tests', 'src', __DIR__));
+if (file_exists($vendor.'/autoload.php')) {
+    require $vendor.'/autoload.php';
 } else {
-    $vendor = realpath(__DIR__ . '/../../../');
-    if (file_exists($vendor . '/autoload.php')) {
-        require $vendor . '/autoload.php';
+    $vendor = realpath(__DIR__.'/../../../');
+    if (file_exists($vendor.'/autoload.php')) {
+        require $vendor.'/autoload.php';
     } else {
         throw new Exception('Unable to load dependencies');
     }
@@ -28,12 +28,12 @@ 
 $loader->addPrefix('EndorphinStudio\\Detector', __SRC__);
 $loader->register();
 
-function testUaList($object,$detectorProperty,$property,$uaList,$expectedValue)
+function testUaList($object, $detectorProperty, $property, $uaList, $expectedValue)
 {
-    foreach($uaList as $ua)
+    foreach ($uaList as $ua)
     {
         $obj = Detector::analyse($ua)->$detectorProperty;
         $func = 'get'.$property;
-        $object->assertEquals($expectedValue,$obj->$func());
+        $object->assertEquals($expectedValue, $obj->$func());
     }
 }
\ No newline at end of file

tests/RobotTest.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
             'Tiny Tiny RSS/1.10 (http://tt-rss.org/)'
         );
 
-        testUaList($this,'Robot','Name',$ualist,'Tiny RSS');
+        testUaList($this, 'Robot', 'Name', $ualist, 'Tiny RSS');
     }
     /**
      * Test Google Bots
@@ -42,7 +42,7 @@ 
             'Mediapartners-Google'
         );
 
-        testUaList($this,'Robot','Owner',$ualist,'Google Inc.');
+        testUaList($this, 'Robot', 'Owner', $ualist, 'Google Inc.');
     }
     /**
      * Test Yandex Bots
@@ -81,6 +81,6 @@ 
             'Mozilla/5.0 (compatible; YandexSpravBot/1.0; +http://yandex.com/bots)'
         );
 
-        testUaList($this,'Robot','Owner',$ualist,'Yandex LLC.');
+        testUaList($this, 'Robot', 'Owner', $ualist, 'Yandex LLC.');
     }
 }

tests/DeviceTest.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
             'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543 Safari/419.3'
         );
 
-        testUaList($this,'Device','Name',$ualist,'iPhone');
+        testUaList($this, 'Device', 'Name', $ualist, 'iPhone');
     }
 
     public function testIPad()
@@ -33,7 +33,7 @@ 
             'Mozilla/5.0 (iPad; CPU OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Mobile/9B206'
         );
 
-        testUaList($this,'Device','Name',$ualist,'iPad');
+        testUaList($this, 'Device', 'Name', $ualist, 'iPad');
     }
 
     public function testLumia()
@@ -45,6 +45,6 @@ 
             'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 900)'
         );
 
-        testUaList($this,'Device','Name',$ualist,'Lumia');
+        testUaList($this, 'Device', 'Name', $ualist, 'Lumia');
     }
 }