endorphin-studio / browser-detector

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/Device.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData === null || $xmlData->getName() == 'null')
+        if ($xmlData === null || $xmlData->getName() == 'null')
         {
             parent::__construct($xmlData);
 

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 
             $this->setName('Desktop');
             $this->setType('desktop');
-        }
-        else
+        } else
         {
             parent::__construct($xmlData);
 

src/Robot.php

Spacing +4 added lines, -4 removed lines

@@ -72,19 +72,19 @@
     {
         parent::__construct($xmlData);
 
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child)
             {
                 $name = $child->getName();
                 $val = $child->__toString();
-                if($name != 'id' && $name != 'pattern' && $name != 'SearchEngine')
+                if ($name != 'id' && $name != 'pattern' && $name != 'SearchEngine')
                 {
                     $this->$name = $val;
                 }
-                if($name == 'SearchEngine')
+                if ($name == 'SearchEngine')
                 {
-                    if($val == 'true')
+                    if ($val == 'true')
                     {
                         $this->setSearchEngine(true);
                     }

Braces +2 added lines, -2 removed lines

@@ -87,9 +87,9 @@
                     if($val == 'true')
                     {
                         $this->setSearchEngine(true);
+                    } else {
+                                            $this->setSearchEngine(false);
                     }
-                    else
-                        $this->setSearchEngine(false);
                 }
             }
         }

src/DetectorRule.php

Spacing +6 added lines, -6 removed lines

@@ -104,13 +104,13 @@ 
 
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child)
             {
                 $name = $child->getName();
                 $val = $child->__toString();
-                if($name != 'TargetValue')
+                if ($name != 'TargetValue')
                 {
                     $this->$name = $val;
                 }
@@ -125,15 +125,15 @@ 
      */
     public static function loadRulesFromFile()
     {
-        $path = str_replace('src','data',__DIR__).'/rules/';
+        $path = str_replace('src', 'data', __DIR__).'/rules/';
         $files = scandir($path);
         $rules = array();
-        foreach($files as $file)
+        foreach ($files as $file)
         {
-            if($file != '.' && $file != '..')
+            if ($file != '.' && $file != '..')
             {
                 $xmlObj = simplexml_load_file($path.$file);
-                foreach($xmlObj->children() as $rule)
+                foreach ($xmlObj->children() as $rule)
                 {
                     $rules[] = new self($rule);
                 }

Braces +2 added lines, -2 removed lines

@@ -113,9 +113,9 @@
                 if($name != 'TargetValue')
                 {
                     $this->$name = $val;
+                } else {
+                                    $this->$name = filter_var($val, FILTER_VALIDATE_BOOLEAN);
                 }
-                else
-                    $this->$name = filter_var($val, FILTER_VALIDATE_BOOLEAN);
             }
         }
     }

src/DeviceModel.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child)
             {
@@ -84,10 +84,10 @@ 
      */
     public static function loadFromFile()
     {
-        $path = str_replace('src','data',__DIR__).'/deviceModels.xml';
+        $path = str_replace('src', 'data', __DIR__).'/deviceModels.xml';
         $models = array();
         $xmlObj = simplexml_load_file($path);
-        foreach($xmlObj->children() as $rule)
+        foreach ($xmlObj->children() as $rule)
         {
             $models[] = new self($rule);
         }

src/Detector.php

Spacing +27 added lines, -27 removed lines

@@ -19,7 +19,7 @@ 
     {
         if ($pathToData == 'auto')
         {
-            $pathToData = str_replace('src', 'data', __DIR__) . '/';
+            $pathToData = str_replace('src', 'data', __DIR__).'/';
         }
 
         if (self::$_xmlData === null)
@@ -27,22 +27,22 @@ 
             $xml = array('Robot', 'Browser', 'Device', 'OS');
             $xmlData = array();
             foreach ($xml as $name) {
-                $xmlData[$name] = simplexml_load_file($pathToData . strtolower($name) . '.xml');
+                $xmlData[$name] = simplexml_load_file($pathToData.strtolower($name).'.xml');
             }
             self::$_xmlData = $xmlData;
             self::$isInitialized = true;
         }
     }
 
-    public static function analyse($uaString='UA')
+    public static function analyse($uaString = 'UA')
     {
         $ua = $uaString;
-        if($uaString == 'UA')
+        if ($uaString == 'UA')
         {
             $ua = $_SERVER['HTTP_USER_AGENT'];
         }
 
-        if(!self::$isInitialized)
+        if (!self::$isInitialized)
             self::initialize();
         $xml = self::$_xmlData;
 
@@ -50,20 +50,20 @@ 
         $detectorResult->uaString = $ua;
         $ns = '\\EndorphinStudio\\Detector\\';
 
-        foreach($xml as $key => $item)
+        foreach ($xml as $key => $item)
         {
-            $data = self::analysePart($xml,$key,$ua);
+            $data = self::analysePart($xml, $key, $ua);
             $classname = $ns.$key;
-            if($data !== null)
+            if ($data !== null)
             {
                 $object = new $classname($data);
-                if($key == 'OS' || $key == 'Browser')
+                if ($key == 'OS' || $key == 'Browser')
                 {
                     $object->setVersion(self::getVersion($data, $ua));
                 }
-                if($key == 'Robot')
+                if ($key == 'Robot')
                 {
-                    if($object->getName() != D_NA)
+                    if ($object->getName() != D_NA)
                     {
                         $detectorResult->isBot = true;
                     }
@@ -88,13 +88,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;
             }
@@ -107,21 +107,21 @@ 
      * @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)
         {
-            foreach($xmlItem->children() as $node)
+            foreach ($xmlItem->children() as $node)
             {
-                if($node->getName() == 'versionPattern')
+                if ($node->getName() == 'versionPattern')
                 {
                     $vPattern = $node->__toString();
-                    $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);
@@ -163,7 +163,7 @@ 
             '10.0' => '10'
         );
 
-        if(array_key_exists(strval($version),$versions))
+        if (array_key_exists(strval($version), $versions))
             return $versions[strval($version)];
         else
             return D_NA;
@@ -176,14 +176,14 @@ 
     private static function checkRules(DetectorResult $result)
     {
         $Rules = DetectorRule::loadRulesFromFile();
-        foreach($Rules as $rule)
+        foreach ($Rules as $rule)
         {
             $objectType = $rule->getObjectType();
             $objectProperty = $rule->getObjectProperty();
             $targetType = $rule->getTargetType();
             $targetValue = $rule->isTargetValue();
             $func = 'get'.$objectProperty;
-            if($result->$objectType !== null)
+            if ($result->$objectType !== null)
             {
                 if ($result->$objectType->$func() == $rule->getObjectPropertyValue()) {
                     $result->$targetType = $targetValue;
@@ -197,16 +197,16 @@ 
     private static function checkModelName(DetectorResult $result)
     {
         $models = DeviceModel::loadFromFile();
-        foreach($models as $model)
+        foreach ($models as $model)
         {
-            if($model->getDeviceName() === $result->Device->getName())
+            if ($model->getDeviceName() === $result->Device->getName())
             {
                 $pattern = '/'.$model->getPattern().'/';
-                preg_match($pattern,$result->uaString,$match);
+                preg_match($pattern, $result->uaString, $match);
                 $result->Device->setModelName($match[1]);
             }
         }
         return $result;
     }
 }
-define('D_NA','N\A');
+define('D_NA', 'N\A');

Braces +9 added lines, -8 removed lines

@@ -42,8 +42,9 @@ 
             $ua = $_SERVER['HTTP_USER_AGENT'];
         }
 
-        if(!self::$isInitialized)
-            self::initialize();
+        if(!self::$isInitialized) {
+                    self::initialize();
+        }
         $xml = self::$_xmlData;
 
         $detectorResult = new DetectorResult();
@@ -68,8 +69,7 @@ 
                         $detectorResult->isBot = true;
                     }
                 }
-            }
-            else
+            } else
             {
                 $object = $classname::initEmpty();
             }
@@ -163,10 +163,11 @@ 
             '10.0' => '10'
         );
 
-        if(array_key_exists(strval($version),$versions))
-            return $versions[strval($version)];
-        else
-            return D_NA;
+        if(array_key_exists(strval($version),$versions)) {
+                    return $versions[strval($version)];
+        } else {
+                    return D_NA;
+        }
     }
 
     /**