endorphin-studio / browser-detector

src/Detector.php

Doc Comments +1 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
     }
 
     /**
-     * @param $version Windows number version
+     * @param string $version Windows number version
      * @return string Windows version
      */
     private static function getWindowsVersion($version)
@@ -235,7 +235,6 @@ 
     }
 
     /**
-     * @param DetectorResult $DetectorResult Detector result
      * @return DetectorResult Final result
      */
     private function ckeckRules(\EndorphinStudio\Detector\DetectorResult $result)

Unused Use Statements -2 removed lines

@@ -10,8 +10,6 @@
 namespace EndorphinStudio\Detector;
 
 
-use Composer\DependencyResolver\Rule;
-
 class Detector
 {
     /**

Spacing +27 added lines, -27 removed lines

@@ -57,16 +57,16 @@ 
      * 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');
         }
@@ -75,10 +75,10 @@ 
         $this->Rules = DetectorRule::loadRulesFromFile();
     }
 
-    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'];
         }
@@ -86,23 +86,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;
@@ -112,7 +112,7 @@ 
                         }
                         break;
                     case 'os':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $os = new OS($result);
                             $os->setVersion(self::getVersion($result, $ua));
@@ -125,7 +125,7 @@ 
                         }
                         break;
                     case 'device':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $device = new Device($result);
                             $detectorResult->Device = $device;
@@ -137,7 +137,7 @@ 
                         }
                         break;
                     case 'browser':
-                        if($result !== null)
+                        if ($result !== null)
                         {
                             $browser = new Browser($result);
                             $browser->setVersion(self::getVersion($result, $ua));
@@ -164,13 +164,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;
             }
@@ -183,21 +183,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);
@@ -240,14 +240,14 @@ 
      */
     private function ckeckRules(\EndorphinStudio\Detector\DetectorResult $result)
     {
-        foreach($this->Rules as $rule)
+        foreach ($this->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;
@@ -258,4 +258,4 @@ 
         return $result;
     }
 }
-define('D_NA','N\A');
\ No newline at end of file
+define('D_NA', 'N\A');
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -117,8 +117,7 @@ 
                             $os = new OS($result);
                             $os->setVersion(self::getVersion($result, $ua));
                             $detectorResult->OS = $os;
-                        }
-                        else
+                        } else
                         {
                             $os = OS::initEmpty();
                             $detectorResult->OS = $os;
@@ -129,8 +128,7 @@ 
                         {
                             $device = new Device($result);
                             $detectorResult->Device = $device;
-                        }
-                        else
+                        } else
                         {
                             $device = Device::initEmpty();
                             $detectorResult->Device = $device;
@@ -142,8 +140,7 @@ 
                             $browser = new Browser($result);
                             $browser->setVersion(self::getVersion($result, $ua));
                             $detectorResult->Browser = $browser;
-                        }
-                        else
+                        } else
                         {
                             $browser = Browser::initEmpty();
                             $detectorResult->Browser = $browser;

tests/DeviceTest.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
             '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');
-        testUaListIsProperty($this,'isMobile',$ualist,true);
+        testUaList($this, 'Device', 'Name', $ualist, 'iPhone');
+        testUaListIsProperty($this, 'isMobile', $ualist, true);
     }
 
     public function testIPad()
@@ -34,7 +34,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()
@@ -46,7 +46,7 @@ 
             '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');
-        testUaListIsProperty($this,'isMobile',$ualist,true);
+        testUaList($this, 'Device', 'Name', $ualist, 'Lumia');
+        testUaListIsProperty($this, 'isMobile', $ualist, true);
     }
 }

tests/OsTest.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
             'Mozilla/1.1I (X11; I; UNIX_SV 4.2MP R4000)',
         );
 
-        testUaList($this,'OS','Name',$ualist,'Linux');
+        testUaList($this, 'OS', 'Name', $ualist, 'Linux');
     }
 
     public function testAIX()
@@ -27,7 +27,7 @@ 
             'Mozilla/4.04j2 [en] (X11; I; AIX 4.2) ',
         );
 
-        testUaList($this,'OS','Name',$ualist,'AIX');
+        testUaList($this, 'OS', 'Name', $ualist, 'AIX');
     }
 
     public function testAliyunOS()
@@ -36,6 +36,6 @@ 
             'Mozilla/5.0 (Linux; U; AliyunOS 2.0; Android 4.0 Compatible; xx; R819T Build/AliyunOs-2012) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30',
         );
 
-        testUaList($this,'OS','Name',$ualist,'Aliyun OS');
+        testUaList($this, 'OS', 'Name', $ualist, 'Aliyun OS');
     }
 }
\ No newline at end of file

tests/bootstrap.php

Spacing +16 added lines, -16 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,30 +28,30 @@ 
 $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());
     }
 }
 
-function testUaListBooleanTrue($object,$detectorProperty,$property,$uaList)
+function testUaListBooleanTrue($object, $detectorProperty, $property, $uaList)
 {
-    foreach($uaList as $ua)
+    foreach ($uaList as $ua)
     {
         $obj = Detector::analyse($ua)->$detectorProperty;
         $func = 'is'.$property;
-        $object->assertTrue($obj->$func(),'Object Property '.$property.' is no equal TRUE');
+        $object->assertTrue($obj->$func(), 'Object Property '.$property.' is no equal TRUE');
     }
 }
 
-function testUaListIsProperty($object,$detectorProperty,$uaList,$expectedValue)
+function testUaListIsProperty($object, $detectorProperty, $uaList, $expectedValue)
 {
-    foreach($uaList as $ua)
+    foreach ($uaList as $ua)
     {
-        $object->assertEquals($expectedValue,Detector::analyse($ua)->$detectorProperty);
+        $object->assertEquals($expectedValue, Detector::analyse($ua)->$detectorProperty);
     }
 }
\ No newline at end of file

tests/RobotTest.php

Spacing +11 added lines, -11 removed lines

@@ -22,8 +22,8 @@ 
             'Tiny Tiny RSS/1.10 (http://tt-rss.org/)'
         );
 
-        testUaList($this,'Robot','Name',$ualist,'Tiny RSS');
-        testUaList($this,'Robot','Type',$ualist,'RSS Reader');
+        testUaList($this, 'Robot', 'Name', $ualist, 'Tiny RSS');
+        testUaList($this, 'Robot', 'Type', $ualist, 'RSS Reader');
     }
     /**
      * Test Google Bots
@@ -43,9 +43,9 @@ 
             'Mediapartners-Google'
         );
 
-        testUaList($this,'Robot','Owner',$ualist,'Google Inc.');
-        testUaList($this,'Robot','Type',$ualist,'Search Engine');
-        testUaListBooleanTrue($this,'Robot','SearchEngine',$ualist);
+        testUaList($this, 'Robot', 'Owner', $ualist, 'Google Inc.');
+        testUaList($this, 'Robot', 'Type', $ualist, 'Search Engine');
+        testUaListBooleanTrue($this, 'Robot', 'SearchEngine', $ualist);
     }
     /**
      * Test Yandex Bots
@@ -84,9 +84,9 @@ 
             'Mozilla/5.0 (compatible; YandexSpravBot/1.0; +http://yandex.com/bots)'
         );
 
-        testUaList($this,'Robot','Owner',$ualist,'Yandex LLC.');
-        testUaList($this,'Robot','Type',$ualist,'Search Engine');
-        testUaListBooleanTrue($this,'Robot','SearchEngine',$ualist);
+        testUaList($this, 'Robot', 'Owner', $ualist, 'Yandex LLC.');
+        testUaList($this, 'Robot', 'Type', $ualist, 'Search Engine');
+        testUaListBooleanTrue($this, 'Robot', 'SearchEngine', $ualist);
     }
     /**
      * Test Bing Bots
@@ -106,8 +106,8 @@ 
             'Mozilla/5.0 (Windows Phone 8.1; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 530) like Gecko BingPreview/1.0b'
         );
 
-        testUaList($this,'Robot','Name',$ualist,'Bing');
-        testUaList($this,'Robot','Type',$ualist,'Search Engine');
-        testUaListBooleanTrue($this,'Robot','SearchEngine',$ualist);
+        testUaList($this, 'Robot', 'Name', $ualist, 'Bing');
+        testUaList($this, 'Robot', 'Type', $ualist, 'Search Engine');
+        testUaListBooleanTrue($this, 'Robot', 'SearchEngine', $ualist);
     }
 }

src/Robot.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
     {
         parent::__construct($xmlData);
 
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child)
             {
@@ -86,7 +86,7 @@ 
                         break;
                     case 'isse':
                         $val = $child->__toString();
-                        if($val == 'true')
+                        if ($val == 'true')
                         {
                             $this->setSearchEngine(true);
                         }

Braces +2 added lines, -2 removed lines

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

src/DetectorRule.php

Spacing +6 added lines, -6 removed lines

@@ -104,7 +104,7 @@ 
 
     public function __construct(\SimpleXMLElement $xmlData)
     {
-        if($xmlData !== null)
+        if ($xmlData !== null)
         {
             foreach ($xmlData->children() as $child) {
                 switch ($child->getName())
@@ -123,7 +123,7 @@ 
                         break;
                     case 'targetProperty':
                         $boolVal = $child->__toString();
-                        if($boolVal == 'true')
+                        if ($boolVal == 'true')
                         {
                             $this->TargetValue = true;
                         }
@@ -142,15 +142,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 +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
                         if($boolVal == 'true')
                         {
                             $this->TargetValue = true;
-                        }
-                        else
+                        } else
                         {
                             $this->TargetValue = false;
                         }

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);