Skip to content

Commit

Permalink
Scrutinizer cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Synchro
Synchro committed Apr 23, 2014
1 parent 06c7b9b commit 90d1f24
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 77 deletions.
14 changes: 8 additions & 6 deletions Tests/UAS/ParserTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
<?php

/**
* UASParser PHPUnit tests
* @author Marcus Bointon https://github.com/Synchro
*/
class ParserTest extends PHPUnit_Framework_TestCase

namespace UAS;

class ParserTest extends \PHPUnit_Framework_TestCase
{
/**
* An instance of the UAS parser to test.
* @type UAS\Parser
* @type Parser
*/
protected static $uasparser;
protected static $cachePath;

public function setUp()
{
self::$cachePath = sys_get_temp_dir() . '/uascache/';
self::$uasparser = new UAS\Parser(
self::$uasparser = new Parser(
self::$cachePath,
86400,
true
Expand Down Expand Up @@ -96,9 +98,9 @@ public function testPermissions()
chmod($path, 0444); //Set read-only
self::$uasparser->setIniUrl('https://github.com/Synchro/UASparser/raw/master/Tests/bad.ini');
self::$uasparser->setMd5Url('https://github.com/Synchro/UASparser/raw/master/Tests/bad.md5');
$ok = self::$uasparser->downloadData(true);
$result = self::$uasparser->downloadData(true);
chmod($path, $perms); //Reset perms
$this->assertFalse($ok, 'Failed file write not detected');
$this->assertFalse($result, 'Failed file write not detected');
$this->resetURLs();
}

Expand Down
143 changes: 72 additions & 71 deletions UAS/Parser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected function debug($msg)
public function parse($useragent = null)
{
// Intialize some variables
$browser_id = $os_id = null;
$browserId = $osId = null;
$result = array();

// Initialize the return value
Expand Down Expand Up @@ -185,24 +185,24 @@ public function parse($useragent = null)
$result['ua_icon'] = $test[6];
}
if ($test[7]) { // OS set
$os_data = $this->data['os'][$test[7]];
if ($os_data[0]) {
$result['os_family'] = $os_data[0];
$osData = $this->data['os'][$test[7]];
if ($osData[0]) {
$result['os_family'] = $osData[0];
}
if ($os_data[1]) {
$result['os_name'] = $os_data[1];
if ($osData[1]) {
$result['os_name'] = $osData[1];
}
if ($os_data[2]) {
$result['os_url'] = $os_data[2];
if ($osData[2]) {
$result['os_url'] = $osData[2];
}
if ($os_data[3]) {
$result['os_company'] = $os_data[3];
if ($osData[3]) {
$result['os_company'] = $osData[3];
}
if ($os_data[4]) {
$result['os_company_url'] = $os_data[4];
if ($osData[4]) {
$result['os_company_url'] = $osData[4];
}
if ($os_data[5]) {
$result['os_icon'] = $os_data[5];
if ($osData[5]) {
$result['os_icon'] = $osData[5];
}
}
if ($test[8]) {
Expand All @@ -215,96 +215,96 @@ public function parse($useragent = null)
// Find a browser based on the regex
foreach ($this->data['browser_reg'] as $test) {
if (@preg_match($test[0], $useragent, $info)) { // $info may contain version
$browser_id = $test[1];
$browserId = $test[1];
break;
}
}

// A valid browser was found
if ($browser_id) { // Browser detail
$browser_data = $this->data['browser'][$browser_id];
if ($this->data['browser_type'][$browser_data[0]][0]) {
$result['typ'] = $this->data['browser_type'][$browser_data[0]][0];
if ($browserId) { // Browser detail
$browserData = $this->data['browser'][$browserId];
if ($this->data['browser_type'][$browserData[0]][0]) {
$result['typ'] = $this->data['browser_type'][$browserData[0]][0];
}
if (isset($info[1])) {
$result['ua_version'] = $info[1];
}
if ($browser_data[1]) {
$result['ua_family'] = $browser_data[1];
if ($browserData[1]) {
$result['ua_family'] = $browserData[1];
}
if ($browser_data[1]) {
$result['ua_name'] = $browser_data[1] . (isset($info[1]) ? ' ' . $info[1] : '');
if ($browserData[1]) {
$result['ua_name'] = $browserData[1] . (isset($info[1]) ? ' ' . $info[1] : '');
}
if ($browser_data[2]) {
$result['ua_url'] = $browser_data[2];
if ($browserData[2]) {
$result['ua_url'] = $browserData[2];
}
if ($browser_data[3]) {
$result['ua_company'] = $browser_data[3];
if ($browserData[3]) {
$result['ua_company'] = $browserData[3];
}
if ($browser_data[4]) {
$result['ua_company_url'] = $browser_data[4];
if ($browserData[4]) {
$result['ua_company_url'] = $browserData[4];
}
if ($browser_data[5]) {
$result['ua_icon'] = $browser_data[5];
if ($browserData[5]) {
$result['ua_icon'] = $browserData[5];
}
if ($browser_data[6]) {
$result['ua_info_url'] = self::$info_url . $browser_data[6];
if ($browserData[6]) {
$result['ua_info_url'] = self::$info_url . $browserData[6];
}
}

// Browser OS, does this browser match contain a reference to an os?
if (isset($this->data['browser_os'][$browser_id])) { // OS detail
$os_id = $this->data['browser_os'][$browser_id][0]; // Get the OS id
$os_data = $this->data['os'][$os_id];
if ($os_data[0]) {
$result['os_family'] = $os_data[0];
if (isset($this->data['browser_os'][$browserId])) { // OS detail
$osId = $this->data['browser_os'][$browserId][0]; // Get the OS id
$osData = $this->data['os'][$osId];
if ($osData[0]) {
$result['os_family'] = $osData[0];
}
if ($os_data[1]) {
$result['os_name'] = $os_data[1];
if ($osData[1]) {
$result['os_name'] = $osData[1];
}
if ($os_data[2]) {
$result['os_url'] = $os_data[2];
if ($osData[2]) {
$result['os_url'] = $osData[2];
}
if ($os_data[3]) {
$result['os_company'] = $os_data[3];
if ($osData[3]) {
$result['os_company'] = $osData[3];
}
if ($os_data[4]) {
$result['os_company_url'] = $os_data[4];
if ($osData[4]) {
$result['os_company_url'] = $osData[4];
}
if ($os_data[5]) {
$result['os_icon'] = $os_data[5];
if ($osData[5]) {
$result['os_icon'] = $osData[5];
}
return $result;
}

// Search for the OS
foreach ($this->data['os_reg'] as $test) {
if (@preg_match($test[0], $useragent)) {
$os_id = $test[1];
$osId = $test[1];
break;
}
}

// A valid OS was found
if ($os_id) { // OS detail
$os_data = $this->data['os'][$os_id];
if ($os_data[0]) {
$result['os_family'] = $os_data[0];
if ($osId) { // OS detail
$osData = $this->data['os'][$osId];
if ($osData[0]) {
$result['os_family'] = $osData[0];
}
if ($os_data[1]) {
$result['os_name'] = $os_data[1];
if ($osData[1]) {
$result['os_name'] = $osData[1];
}
if ($os_data[2]) {
$result['os_url'] = $os_data[2];
if ($osData[2]) {
$result['os_url'] = $osData[2];
}
if ($os_data[3]) {
$result['os_company'] = $os_data[3];
if ($osData[3]) {
$result['os_company'] = $osData[3];
}
if ($os_data[4]) {
$result['os_company_url'] = $os_data[4];
if ($osData[4]) {
$result['os_company_url'] = $osData[4];
}
if ($os_data[5]) {
$result['os_icon'] = $os_data[5];
if ($osData[5]) {
$result['os_icon'] = $osData[5];
}
}
return $result;
Expand Down Expand Up @@ -363,7 +363,8 @@ public function downloadData($force = false)
if (!ini_get('allow_url_fopen') && !function_exists('curl_init')) {
$this->debug('Fopen wrappers and curl unavailable, cannot continue');
trigger_error(
'ERROR: function file_get_contents not allowed URL open. Update the datafile (uasdata.ini in Cache Dir) manually.'
'ERROR: function file_get_contents not allowed URL open. Update the datafile ',
'(uasdata.ini in Cache Dir) manually.'
);
return $status;
}
Expand Down Expand Up @@ -512,9 +513,9 @@ protected function getContents($url, $timeout = 300)
}
} elseif (function_exists('curl_init')) {
// Fall back to curl
$ch = curl_init($url);
$curl = curl_init($url);
curl_setopt_array(
$ch,
$curl,
array(
CURLOPT_TIMEOUT => $timeout,
CURLOPT_CONNECTTIMEOUT => $timeout,
Expand All @@ -523,22 +524,22 @@ protected function getContents($url, $timeout = 300)
);
if ($this->useZipDownloads) {
curl_setopt(
$ch,
$curl,
CURLOPT_ENCODING,
'gzip'
);
}
$data = curl_exec($ch);
if ($data !== false and curl_errno($ch) == 0) {
$data = curl_exec($curl);
if ($data !== false and curl_errno($curl) == 0) {
$this->debug(
'Fetching URL with curl succeeded: ' . $url . '. ' .
strlen($data) . ' bytes in ' . (microtime(true) - $starttime) . ' sec.'
);
} else {
$this->debug('Opening URL with curl failed: ' . $url . ' ' . curl_error($ch));
$this->debug('Opening URL with curl failed: ' . $url . ' ' . curl_error($curl));
$data = '';
}
curl_close($ch);
curl_close($curl);
} else {
trigger_error('Could not fetch UAS data; neither fopen nor curl are available.', E_USER_ERROR);
}
Expand Down

0 comments on commit 90d1f24

Please sign in to comment.