endorphin-studio / browser-detector

src/Detector.php

Spacing +24 added lines, -24 removed lines

@@ -52,26 +52,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().strtolower($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'];
         }
@@ -79,22 +79,22 @@ 
         $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;
         $ns = '\\EndorphinStudio\\Detector\\';
 
-        foreach($data as $key => $result)
+        foreach ($data as $key => $result)
         {
             $classname = $ns.$key;
-            if($result !== null)
+            if ($result !== null)
             {
                 $object = new $classname($result);
-                if($key == 'Os' || $key == 'Browser')
+                if ($key == 'Os' || $key == 'Browser')
                 {
                     $object->setVersion(self::getVersion($result, $ua));
                 }
@@ -117,13 +117,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;
             }
@@ -136,21 +136,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);
@@ -194,14 +194,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;
@@ -212,4 +212,4 @@ 
         return $result;
     }
 }
-define('D_NA','N\A');
+define('D_NA', 'N\A');

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
                 {
                     $object->setVersion(self::getVersion($result, $ua));
                 }
-            }
-            else
+            } else
             {
                 $object = $classname::initEmpty();
             }