Ysurac / FlightAirMap

country-statistics-aircraft.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 

contribute.php

Braces +13 added lines, -2 removed lines

@@ -11,10 +11,21 @@
     <p>You can contribute to <?php print $globalName; ?> if you have an ADS-B receiver.</p>
     <h3>You need to : </h3>
     <ul>
-	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) print $globalContributeLogin.'">'.$globalContributeLogin; else print 'https://login.flightairmap.fr">login.flightairmap.fr'; ?></a></li>
+	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) {
+	print $globalContributeLogin.'">'.$globalContributeLogin;
+} else {
+	print 'https://login.flightairmap.fr">login.flightairmap.fr';
+}
+?></a></li>
 	<li>Download dump1090 fork from <a href="https://github.com/Ysurac/dump1090">https://github.com/Ysurac/dump1090</a></li>
 	<li>Compile zfamup1090 with <em>make zfamup1090</em> (you need to have libcurl installed)</li>
-	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) print ' --net-zfam-addr '.$globalContributeURL; if (isset($globalContributePort)) print ' --net-zfam-port '.$globalContributePort; ?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
+	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) {
+	print ' --net-zfam-addr '.$globalContributeURL;
+}
+if (isset($globalContributePort)) {
+	print ' --net-zfam-port '.$globalContributePort;
+}
+?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
     </ul>
 </div>
 <?php

tools-acars.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 print '<fieldset class="form-group">';
 print '<label for="acars_message">'._("ACARS Message").'</label>';
 print '<textarea class="form-control" name="acars_message" id="acars_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';

install/populate_ivao.php

Indentation +12 added lines, -12 removed lines

@@ -1,23 +1,23 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    if (isset($globalVATSIM) && $globalVATSIM) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	if (isset($globalVATSIM) && $globalVATSIM) {
 	echo "Install VATSIM airlines...";
 	update_db::update_vatsim();
 	echo "Done !\n";
-    }
-    if (isset($globalIVAO) && $globalIVAO) {
+	}
+	if (isset($globalIVAO) && $globalIVAO) {
 	if (!file_exists('tmp/ivae_feb2013.zip')) {
 		echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory";
 	} else {
-	        echo "Install IVAO airlines and logos...";
-	        update_db::update_IVAO();
+			echo "Install IVAO airlines and logos...";
+			update_db::update_IVAO();
 		echo "Done !\n";
 	}
-    }
+	}
 ?>
\ No newline at end of file

install/libs/sparqllib.php

Braces +2 added lines, -10 removed lines

@@ -215,14 +215,7 @@ 
 		}
 		$r = null;
 
-		if( $code == "select" ) { $r = $this->test_select(); }
-		elseif( $code == "constant_as" ) { $r = $this->test_constant_as(); }
-		elseif( $code == "math_as" ) { $r = $this->test_math_as(); }
-		elseif( $code == "count" ) { $r = $this->test_count(); }
-		elseif( $code == "max" ) { $r = $this->test_max(); }
-		elseif( $code == "load" ) { $r = $this->test_load(); }
-		elseif( $code == "sample" ) { $r = $this->test_sample(); }
-		else { print "<p>Unknown capability code: '$code'</p>"; return false; }
+		if( $code == "select" ) { $r = $this->test_select(); } elseif( $code == "constant_as" ) { $r = $this->test_constant_as(); } elseif( $code == "math_as" ) { $r = $this->test_math_as(); } elseif( $code == "count" ) { $r = $this->test_count(); } elseif( $code == "max" ) { $r = $this->test_max(); } elseif( $code == "load" ) { $r = $this->test_load(); } elseif( $code == "sample" ) { $r = $this->test_sample(); } else { print "<p>Unknown capability code: '$code'</p>"; return false; }
 		$this->caps[$code] = $r;
 		if( isset( $this->caps_cache ) )
 		{
@@ -231,8 +224,7 @@ 
 			if( $was_cached )
 			{
 				dba_replace( $db_key, $db_val, $this->caps_cache );
-			}
-			else
+			} else
 			{
 				dba_insert( $db_key, $db_val, $this->caps_cache );
 			}

install/update_arrival_airport.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
  *    This Script will try to find all real arrival airports for all flights in DB
  *
 */
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('../require/class.Spotter.php');
-    $Spotter = new Spotter();
-    $Spotter->updateArrivalAirports();
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('../require/class.Spotter.php');
+	$Spotter = new Spotter();
+	$Spotter->updateArrivalAirports();
 
 ?>
\ No newline at end of file

tools-notam.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 print '<fieldset class="form-group">';
 print '<label for="notam_message">'._("NOTAM Message").'</label>';
 print '<textarea class="form-control" name="notam_message" id="notam_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';

require/libs/uagent/uagent.php

Indentation +342 added lines, -342 removed lines

@@ -8,347 +8,347 @@
 
 class UAgent
 {
-    // General token that says the browser is Mozilla compatible, 
-    // and is common to almost every browser today.
-    const MOZILLA = 'Mozilla/5.0 ';
-
-    /**
-     * Processors by Arch.
-     */
-    public static $processors = array(
-        'lin' => array( 'i686', 'x86_64' ),
-        'mac' => array( 'Intel', 'PPC', 'U; Intel', 'U; PPC' ),
-        'win' => array( 'foo' )
-    );
-
-    /**
-     * Browsers
-     * 
-     * Weighting is based on market share to determine frequency.
-     */
-    public static $browsers = array(
-        34 => array(
-            89 => array( 'chrome', 'win' ),
-            9  => array( 'chrome', 'mac' ),
-            2  => array( 'chrome', 'lin' )
-        ),
-        32 => array(
-            100 => array( 'iexplorer', 'win' )
-        ),
-        25 => array(
-            83 => array( 'firefox', 'win' ),
-            16 => array( 'firefox', 'mac' ),
-            1  => array( 'firefox', 'lin' )
-        ),
-        7 => array(
-            95 => array( 'safari', 'mac' ),
-            4  => array( 'safari', 'win' ),
-            1  => array( 'safari', 'lin' )
-        ),
-        2 => array(
-            91 => array( 'opera', 'win' ),
-            6  => array( 'opera', 'lin' ),
-            3  => array( 'opera', 'mac' )
-        )
-    );
-
-    /**
-     * List of Lanuge Culture Codes (ISO 639-1)
-     *
-     * @see: http://msdn.microsoft.com/en-gb/library/ee825488(v=cs.20).aspx
-     */
-    public static $languages = array(
-        'af-ZA', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB',
-        'ar-LY', 'ar-MA', 'ar-OM', 'ar-QA', 'ar-SA', 'ar-SY', 'ar-TN', 'ar-YE', 'be-BY',
-        'bg-BG', 'ca-ES', 'cs-CZ', 'Cy-az-AZ', 'Cy-sr-SP', 'Cy-uz-UZ', 'da-DK', 'de-AT',
-        'de-CH', 'de-DE', 'de-LI', 'de-LU', 'div-MV', 'el-GR', 'en-AU', 'en-BZ', 'en-CA', 
-        'en-CB', 'en-GB', 'en-IE', 'en-JM', 'en-NZ', 'en-PH', 'en-TT', 'en-US', 'en-ZA', 
-        'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO',  'es-CR', 'es-DO', 'es-EC', 'es-ES',
-        'es-GT', 'es-HN', 'es-MX', 'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV',
-        'es-UY', 'es-VE', 'et-EE', 'eu-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-BE', 'fr-CA',
-        'fr-CH', 'fr-FR', 'fr-LU', 'fr-MC', 'gl-ES', 'gu-IN', 'he-IL', 'hi-IN', 'hr-HR', 
-        'hu-HU', 'hy-AM', 'id-ID', 'is-IS', 'it-CH', 'it-IT', 'ja-JP', 'ka-GE', 'kk-KZ',
-        'kn-IN', 'kok-IN', 'ko-KR', 'ky-KZ', 'Lt-az-AZ', 'lt-LT', 'Lt-sr-SP', 'Lt-uz-UZ', 
-        'lv-LV', 'mk-MK', 'mn-MN', 'mr-IN', 'ms-BN', 'ms-MY', 'nb-NO', 'nl-BE', 'nl-NL', 
-        'nn-NO', 'pa-IN', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sa-IN', 'sk-SK', 
-        'sl-SI', 'sq-AL', 'sv-FI', 'sv-SE', 'sw-KE', 'syr-SY', 'ta-IN', 'te-IN', 'th-TH', 
-        'tr-TR', 'tt-RU', 'uk-UA', 'ur-PK', 'vi-VN', 'zh-CHS', 'zh-CHT', 'zh-CN', 'zh-HK', 
-        'zh-MO', 'zh-SG', 'zh-TW',   
-    );    
-
-    /**
-     * Generate Device Platform
-     *
-     * Uses a random result with a weighting related to frequencies.
-     */
-    public static function generate_platform()
-    {
-        $rand = mt_rand( 1, 100 );
-        $sum = 0;
-
-        foreach ( self::$browsers as $share => $freq_os )
-        {
-            $sum += $share;
-
-            if ( $rand <= $sum )
-            {
-                $rand = mt_rand( 1, 100 );
-                $sum = 0;
-
-                foreach ( $freq_os as $share => $choice )
-                {
-                    $sum += $share;
-
-                    if ( $rand <= $sum )
-                    {
-                        return $choice;
-                    }
-                }
-            }
-        }
-
-        throw new Exception( 'Sum of $browsers frequency is not 100.' );
-    }
-
-    private static function array_random( $array )
-    {
-        $i = array_rand( $array, 1 );
-
-        return $array[$i];
-    }
-
-    private static function get_language( $lang = array() )
-    {
-        return self::array_random( empty( $lang ) ? self::$languages : $lang );
-    }
-
-    private static function get_processor( $os )
-    {
-        return self::array_random( self::$processors[$os] );
-    }
-
-    private static function get_version_nt()
-    {   
-        // Win2k (5.0) to Win 7 (6.1).
-        return mt_rand( 5, 6 ) . '.' . mt_rand( 0, 1 );
-    }
-
-    private static function get_version_osx()
-    {
-        return '10_' . mt_rand( 5, 7 ) . '_' . mt_rand( 0, 9 );
-    }
-
-    private static function get_version_webkit()
-    {
-        return mt_rand( 531, 536 ) . mt_rand( 0, 2 );
-    }
-
-    private static function get_verison_chrome()
-    {
-        return mt_rand( 13, 15 ) . '.0.' . mt_rand( 800, 899 ) . '.0';
-    }
-
-    private static function get_version_gecko()
-    {
-        return mt_rand( 17, 31 ) . '.0';
-    }
-
-    private static function get_version_ie()
-    {
-        return mt_rand( 7, 9 ) . '.0';
-    }
-
-    private static function get_version_trident()
-    {
-        // IE8 (4.0) to IE11 (7.0).
-        return mt_rand( 4, 7 ) . '.0';
-    }
-
-    private static function get_version_net()
-    {
-        // generic .NET Framework common language run time (CLR) version numbers.
-        $frameworks = array(
-            '2.0.50727',
-            '3.0.4506',
-            '3.5.30729',
-        );
-
-        $rev = '.' . mt_rand( 26, 648 );
-
-        return self::array_random( $frameworks ) . $rev;
-    }
-
-    private static function get_version_safari()
-    {
-        if ( mt_rand( 0, 1 ) == 0 )
-        {
-            $ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
-        }
-        else
-        {
-            $ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
-        }
-
-        return $ver;
-    }
-
-    private static function get_version_opera()
-    {
-        return mt_rand( 15, 19 ) . '.0.' . mt_rand( 1147, 1284 ) . mt_rand( 49, 100 );
-    }
-
-    /**
-     * Opera
-     * 
-     * @see: http://dev.opera.com/blog/opera-user-agent-strings-opera-15-and-beyond/
-     */
-    public static function opera( $arch )
-    {
-        $opera = ' OPR/' . self::get_version_opera();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $chrome = ' Chrome/' . self::get_verison_chrome();
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari . $opera;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari . $opera;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; WOW64) ' . $webkit . $chrome . $safari . $opera;
-        }
-    }    
-
-    /**
-     * Safari
-     *
-     */
-    public static function safari( $arch )
-    {
-        $version = ' Version/' . self::get_version_safari();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . '; {lang})' . $webkit . $version . $safari;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows; U; Windows NT ' . $nt . ')' . $webkit . $version . $safari;
-        }
-
-    }
-
-    /**
-     * Internet Explorer
-     * 
-     * @see: http://msdn.microsoft.com/en-gb/library/ms537503(v=vs.85).aspx
-     */
-    public static function iexplorer( $arch )
-    {
-        $nt = self::get_version_nt();
-        $ie = self::get_version_ie();
-        $trident = self::get_version_trident();
-        $net = self::get_version_net();
-
-        return '(compatible' 
-            . '; MSIE ' . $ie 
-            . '; Windows NT ' . $nt 
-            . '; WOW64' // A 32-bit version of Internet Explorer is running on a 64-bit processor.
-            . '; Trident/' . $trident 
-            . '; .NET CLR ' . $net
-            . ')';
-    }
-
-    /**
-     * Firefox User-Agent
-     *
-     * @see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference
-     */
-    public static function firefox( $arch )
-    {
-        // The release version of Gecko. 
-        $gecko = self::get_version_gecko();
-
-        // On desktop, the gecko trail is fixed.
-        $trail = '20100101';
-
-        $release = 'rv:' . $gecko;
-        $version = 'Gecko/' . $trail . ' Firefox/' . $gecko;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}; ' . $release . ') ' . $version;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; {proc} Mac OS X ' . $osx . '; ' . $release . ') ' . $version;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; {lang}; ' . $release . ') ' . $version;
-        }
-    }
-
-    public static function chrome( $arch )
-    {
-        $chrome = ' Chrome/' . self::get_verison_chrome();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . ') ' . $webkit . $chrome . $safari;
-        }
-    }
-
-    public static function random( $lang = array( 'en-US' ) )
-    {
-        list( $browser, $os ) = self::generate_platform();
-
-        return self::generate( $browser, $os, $lang );
-    }
-
-    public static function generate( $browser = 'chrome', $os = 'win', $lang = array( 'en-US' ) )
-    {
-        $ua = self::MOZILLA . call_user_func( 'UAgent::' . $browser, $os );
-
-        $tags = array(
-            '{proc}' => self::get_processor( $os ),
-            '{lang}' => self::get_language( $lang ),
-        );
-
-        $ua = str_replace( array_keys( $tags ), array_values( $tags ), $ua );
-
-        return $ua;
-    }
+	// General token that says the browser is Mozilla compatible, 
+	// and is common to almost every browser today.
+	const MOZILLA = 'Mozilla/5.0 ';
+
+	/**
+	 * Processors by Arch.
+	 */
+	public static $processors = array(
+		'lin' => array( 'i686', 'x86_64' ),
+		'mac' => array( 'Intel', 'PPC', 'U; Intel', 'U; PPC' ),
+		'win' => array( 'foo' )
+	);
+
+	/**
+	 * Browsers
+	 * 
+	 * Weighting is based on market share to determine frequency.
+	 */
+	public static $browsers = array(
+		34 => array(
+			89 => array( 'chrome', 'win' ),
+			9  => array( 'chrome', 'mac' ),
+			2  => array( 'chrome', 'lin' )
+		),
+		32 => array(
+			100 => array( 'iexplorer', 'win' )
+		),
+		25 => array(
+			83 => array( 'firefox', 'win' ),
+			16 => array( 'firefox', 'mac' ),
+			1  => array( 'firefox', 'lin' )
+		),
+		7 => array(
+			95 => array( 'safari', 'mac' ),
+			4  => array( 'safari', 'win' ),
+			1  => array( 'safari', 'lin' )
+		),
+		2 => array(
+			91 => array( 'opera', 'win' ),
+			6  => array( 'opera', 'lin' ),
+			3  => array( 'opera', 'mac' )
+		)
+	);
+
+	/**
+	 * List of Lanuge Culture Codes (ISO 639-1)
+	 *
+	 * @see: http://msdn.microsoft.com/en-gb/library/ee825488(v=cs.20).aspx
+	 */
+	public static $languages = array(
+		'af-ZA', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB',
+		'ar-LY', 'ar-MA', 'ar-OM', 'ar-QA', 'ar-SA', 'ar-SY', 'ar-TN', 'ar-YE', 'be-BY',
+		'bg-BG', 'ca-ES', 'cs-CZ', 'Cy-az-AZ', 'Cy-sr-SP', 'Cy-uz-UZ', 'da-DK', 'de-AT',
+		'de-CH', 'de-DE', 'de-LI', 'de-LU', 'div-MV', 'el-GR', 'en-AU', 'en-BZ', 'en-CA', 
+		'en-CB', 'en-GB', 'en-IE', 'en-JM', 'en-NZ', 'en-PH', 'en-TT', 'en-US', 'en-ZA', 
+		'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO',  'es-CR', 'es-DO', 'es-EC', 'es-ES',
+		'es-GT', 'es-HN', 'es-MX', 'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV',
+		'es-UY', 'es-VE', 'et-EE', 'eu-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-BE', 'fr-CA',
+		'fr-CH', 'fr-FR', 'fr-LU', 'fr-MC', 'gl-ES', 'gu-IN', 'he-IL', 'hi-IN', 'hr-HR', 
+		'hu-HU', 'hy-AM', 'id-ID', 'is-IS', 'it-CH', 'it-IT', 'ja-JP', 'ka-GE', 'kk-KZ',
+		'kn-IN', 'kok-IN', 'ko-KR', 'ky-KZ', 'Lt-az-AZ', 'lt-LT', 'Lt-sr-SP', 'Lt-uz-UZ', 
+		'lv-LV', 'mk-MK', 'mn-MN', 'mr-IN', 'ms-BN', 'ms-MY', 'nb-NO', 'nl-BE', 'nl-NL', 
+		'nn-NO', 'pa-IN', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sa-IN', 'sk-SK', 
+		'sl-SI', 'sq-AL', 'sv-FI', 'sv-SE', 'sw-KE', 'syr-SY', 'ta-IN', 'te-IN', 'th-TH', 
+		'tr-TR', 'tt-RU', 'uk-UA', 'ur-PK', 'vi-VN', 'zh-CHS', 'zh-CHT', 'zh-CN', 'zh-HK', 
+		'zh-MO', 'zh-SG', 'zh-TW',   
+	);    
+
+	/**
+	 * Generate Device Platform
+	 *
+	 * Uses a random result with a weighting related to frequencies.
+	 */
+	public static function generate_platform()
+	{
+		$rand = mt_rand( 1, 100 );
+		$sum = 0;
+
+		foreach ( self::$browsers as $share => $freq_os )
+		{
+			$sum += $share;
+
+			if ( $rand <= $sum )
+			{
+				$rand = mt_rand( 1, 100 );
+				$sum = 0;
+
+				foreach ( $freq_os as $share => $choice )
+				{
+					$sum += $share;
+
+					if ( $rand <= $sum )
+					{
+						return $choice;
+					}
+				}
+			}
+		}
+
+		throw new Exception( 'Sum of $browsers frequency is not 100.' );
+	}
+
+	private static function array_random( $array )
+	{
+		$i = array_rand( $array, 1 );
+
+		return $array[$i];
+	}
+
+	private static function get_language( $lang = array() )
+	{
+		return self::array_random( empty( $lang ) ? self::$languages : $lang );
+	}
+
+	private static function get_processor( $os )
+	{
+		return self::array_random( self::$processors[$os] );
+	}
+
+	private static function get_version_nt()
+	{   
+		// Win2k (5.0) to Win 7 (6.1).
+		return mt_rand( 5, 6 ) . '.' . mt_rand( 0, 1 );
+	}
+
+	private static function get_version_osx()
+	{
+		return '10_' . mt_rand( 5, 7 ) . '_' . mt_rand( 0, 9 );
+	}
+
+	private static function get_version_webkit()
+	{
+		return mt_rand( 531, 536 ) . mt_rand( 0, 2 );
+	}
+
+	private static function get_verison_chrome()
+	{
+		return mt_rand( 13, 15 ) . '.0.' . mt_rand( 800, 899 ) . '.0';
+	}
+
+	private static function get_version_gecko()
+	{
+		return mt_rand( 17, 31 ) . '.0';
+	}
+
+	private static function get_version_ie()
+	{
+		return mt_rand( 7, 9 ) . '.0';
+	}
+
+	private static function get_version_trident()
+	{
+		// IE8 (4.0) to IE11 (7.0).
+		return mt_rand( 4, 7 ) . '.0';
+	}
+
+	private static function get_version_net()
+	{
+		// generic .NET Framework common language run time (CLR) version numbers.
+		$frameworks = array(
+			'2.0.50727',
+			'3.0.4506',
+			'3.5.30729',
+		);
+
+		$rev = '.' . mt_rand( 26, 648 );
+
+		return self::array_random( $frameworks ) . $rev;
+	}
+
+	private static function get_version_safari()
+	{
+		if ( mt_rand( 0, 1 ) == 0 )
+		{
+			$ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
+		}
+		else
+		{
+			$ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
+		}
+
+		return $ver;
+	}
+
+	private static function get_version_opera()
+	{
+		return mt_rand( 15, 19 ) . '.0.' . mt_rand( 1147, 1284 ) . mt_rand( 49, 100 );
+	}
+
+	/**
+	 * Opera
+	 * 
+	 * @see: http://dev.opera.com/blog/opera-user-agent-strings-opera-15-and-beyond/
+	 */
+	public static function opera( $arch )
+	{
+		$opera = ' OPR/' . self::get_version_opera();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$chrome = ' Chrome/' . self::get_verison_chrome();
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari . $opera;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari . $opera;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . '; WOW64) ' . $webkit . $chrome . $safari . $opera;
+		}
+	}    
+
+	/**
+	 * Safari
+	 *
+	 */
+	public static function safari( $arch )
+	{
+		$version = ' Version/' . self::get_version_safari();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . '; {lang})' . $webkit . $version . $safari;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows; U; Windows NT ' . $nt . ')' . $webkit . $version . $safari;
+		}
+
+	}
+
+	/**
+	 * Internet Explorer
+	 * 
+	 * @see: http://msdn.microsoft.com/en-gb/library/ms537503(v=vs.85).aspx
+	 */
+	public static function iexplorer( $arch )
+	{
+		$nt = self::get_version_nt();
+		$ie = self::get_version_ie();
+		$trident = self::get_version_trident();
+		$net = self::get_version_net();
+
+		return '(compatible' 
+			. '; MSIE ' . $ie 
+			. '; Windows NT ' . $nt 
+			. '; WOW64' // A 32-bit version of Internet Explorer is running on a 64-bit processor.
+			. '; Trident/' . $trident 
+			. '; .NET CLR ' . $net
+			. ')';
+	}
+
+	/**
+	 * Firefox User-Agent
+	 *
+	 * @see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference
+	 */
+	public static function firefox( $arch )
+	{
+		// The release version of Gecko. 
+		$gecko = self::get_version_gecko();
+
+		// On desktop, the gecko trail is fixed.
+		$trail = '20100101';
+
+		$release = 'rv:' . $gecko;
+		$version = 'Gecko/' . $trail . ' Firefox/' . $gecko;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}; ' . $release . ') ' . $version;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; {proc} Mac OS X ' . $osx . '; ' . $release . ') ' . $version;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . '; {lang}; ' . $release . ') ' . $version;
+		}
+	}
+
+	public static function chrome( $arch )
+	{
+		$chrome = ' Chrome/' . self::get_verison_chrome();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . ') ' . $webkit . $chrome . $safari;
+		}
+	}
+
+	public static function random( $lang = array( 'en-US' ) )
+	{
+		list( $browser, $os ) = self::generate_platform();
+
+		return self::generate( $browser, $os, $lang );
+	}
+
+	public static function generate( $browser = 'chrome', $os = 'win', $lang = array( 'en-US' ) )
+	{
+		$ua = self::MOZILLA . call_user_func( 'UAgent::' . $browser, $os );
+
+		$tags = array(
+			'{proc}' => self::get_processor( $os ),
+			'{lang}' => self::get_language( $lang ),
+		);
+
+		$ua = str_replace( array_keys( $tags ), array_values( $tags ), $ua );
+
+		return $ua;
+	}
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -183,8 +183,7 @@
         if ( mt_rand( 0, 1 ) == 0 )
         {
             $ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
-        }
-        else
+        } else
         {
             $ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
         }

require/libs/geoPHP/tests/tests/methodsTest.php

Indentation +328 added lines, -328 removed lines

@@ -9,357 +9,357 @@
   }
 
   function testMethods() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $methods = array(
-          array('name' => 'area'),
-          array('name' => 'boundary'),
-          array('name' => 'getBBox'),
-          array('name' => 'centroid'),
-          array('name' => 'length'),
-          array('name' => 'greatCircleLength'),
-          array('name' => 'haversineLength'),
-          array('name' => 'y'),
-          array('name' => 'x'),
-          array('name' => 'numGeometries'),
-          array('name' => 'geometryN', 'argument' => '1'),
-          array('name' => 'startPoint'),
-          array('name' => 'endPoint'),
-          array('name' => 'isRing'),
-          array('name' => 'isClosed'),
-          array('name' => 'numPoints'),
-          array('name' => 'pointN', 'argument' => '1'),
-          array('name' => 'exteriorRing'),
-          array('name' => 'numInteriorRings'),
-          array('name' => 'interiorRingN', 'argument' => '1'),
-          array('name' => 'dimension'),
-          array('name' => 'geometryType'),
-          array('name' => 'SRID'),
-          array('name' => 'setSRID', 'argument' => '4326'),
-        );
+		$methods = array(
+		  array('name' => 'area'),
+		  array('name' => 'boundary'),
+		  array('name' => 'getBBox'),
+		  array('name' => 'centroid'),
+		  array('name' => 'length'),
+		  array('name' => 'greatCircleLength'),
+		  array('name' => 'haversineLength'),
+		  array('name' => 'y'),
+		  array('name' => 'x'),
+		  array('name' => 'numGeometries'),
+		  array('name' => 'geometryN', 'argument' => '1'),
+		  array('name' => 'startPoint'),
+		  array('name' => 'endPoint'),
+		  array('name' => 'isRing'),
+		  array('name' => 'isClosed'),
+		  array('name' => 'numPoints'),
+		  array('name' => 'pointN', 'argument' => '1'),
+		  array('name' => 'exteriorRing'),
+		  array('name' => 'numInteriorRings'),
+		  array('name' => 'interiorRingN', 'argument' => '1'),
+		  array('name' => 'dimension'),
+		  array('name' => 'geometryType'),
+		  array('name' => 'SRID'),
+		  array('name' => 'setSRID', 'argument' => '4326'),
+		);
 
-        foreach($methods as $method) {
-          $argument = NULL;
-          $method_name = $method['name'];
-          if (isset($method['argument'])) {
-            $argument = $method['argument'];
-          }
+		foreach($methods as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          $this->_methods_tester($geometry, $method_name, $argument);
-        }
+		  $this->_methods_tester($geometry, $method_name, $argument);
+		}
 
-        $this->_methods_tester_with_geos($geometry);
-      }
-    }
+		$this->_methods_tester_with_geos($geometry);
+	  }
+	}
   }
 
   function _methods_tester($geometry, $method_name, $argument) {
 
-    if (!method_exists($geometry, $method_name)) {
-      $this->fail("Method ".$method_name.'() doesn\'t exists.');
-      return;
-    }
+	if (!method_exists($geometry, $method_name)) {
+	  $this->fail("Method ".$method_name.'() doesn\'t exists.');
+	  return;
+	}
 
-    switch ($method_name) {
-      case 'y':
-      case 'x':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'geometryN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'startPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method startPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'endPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method endPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isClosed':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'pointN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method pointN() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'exteriorRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numInteriorRings':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'interiorRingN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'SRID':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'getBBox':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'centroid':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'length':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numGeometries':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numPoints':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'dimension':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'boundary':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'haversineLength':
-        //TODO: Check if output is a float >= 0.
-        //TODO: Sometimes haversineLength() returns NAN, needs to check why.
-        break;
-      case 'greatCircleLength':
-      case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      case 'setSRID':
-        //TODO: The method setSRID() should return TRUE.
-        break;
-      default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-    }
+	switch ($method_name) {
+	  case 'y':
+	  case 'x':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'geometryN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'startPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method startPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'endPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method endPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isClosed':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'pointN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method pointN() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'exteriorRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numInteriorRings':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'interiorRingN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'SRID':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'getBBox':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'centroid':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'length':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numGeometries':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numPoints':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'dimension':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'boundary':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'haversineLength':
+		//TODO: Check if output is a float >= 0.
+		//TODO: Sometimes haversineLength() returns NAN, needs to check why.
+		break;
+	  case 'greatCircleLength':
+	  case 'area':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  case 'geometryType':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  case 'setSRID':
+		//TODO: The method setSRID() should return TRUE.
+		break;
+	  default:
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+	}
 
   }
 
   function _methods_tester_with_geos($geometry) {
-    // Cannot test methods if GEOS is not intstalled
-    if (!geoPHP::geosInstalled()) return;
+	// Cannot test methods if GEOS is not intstalled
+	if (!geoPHP::geosInstalled()) return;
 
-    $methods = array(
-      //'boundary', //@@TODO: Uncomment this and fix errors
-      'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
-      'getBBox',
-      'x',
-      'y',
-      'startPoint',
-      'endPoint',
-      'isRing',
-      'isClosed',
-      'numPoints',
-    );
+	$methods = array(
+	  //'boundary', //@@TODO: Uncomment this and fix errors
+	  'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+	  'getBBox',
+	  'x',
+	  'y',
+	  'startPoint',
+	  'endPoint',
+	  'isRing',
+	  'isClosed',
+	  'numPoints',
+	);
 
-    foreach ($methods as $method) {
-      // Turn GEOS on
-      geoPHP::geosInstalled(TRUE);
-      $geos_result = $geometry->$method();
+	foreach ($methods as $method) {
+	  // Turn GEOS on
+	  geoPHP::geosInstalled(TRUE);
+	  $geos_result = $geometry->$method();
 
-      // Turn GEOS off
-      geoPHP::geosInstalled(FALSE);
-      $norm_result = $geometry->$method();
+	  // Turn GEOS off
+	  geoPHP::geosInstalled(FALSE);
+	  $norm_result = $geometry->$method();
 
-      // Turn GEOS back On
-      geoPHP::geosInstalled(TRUE);
+	  // Turn GEOS back On
+	  geoPHP::geosInstalled(TRUE);
 
-      $geos_type = gettype($geos_result);
-      $norm_type = gettype($norm_result);
+	  $geos_type = gettype($geos_result);
+	  $norm_type = gettype($norm_result);
 
-      if ($geos_type != $norm_type) {
-        $this->fail('Type mismatch on '.$method);
-        $this->dump($geos_type);
-        $this->dump($norm_type);
-        continue;
-      }
+	  if ($geos_type != $norm_type) {
+		$this->fail('Type mismatch on '.$method);
+		$this->dump($geos_type);
+		$this->dump($norm_type);
+		continue;
+	  }
 
-      // Now check base on type
-      if ($geos_type == 'object') {
-        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+	  // Now check base on type
+	  if ($geos_type == 'object') {
+		$haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
 
-        // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
-        // Using Pythagorean theorem
-        $bb = $geos_result->getBBox();
-        $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
+		// Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
+		// Using Pythagorean theorem
+		$bb = $geos_result->getBBox();
+		$scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
-        // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-        if ($haus_dist / $scale > 0.5) {
-          $this->fail('Output mismatch on '.$method);
-          $this->dump('GEOS : ');
-          $this->dump($geos_result->out('wkt'));
-          $this->dump('NORM : ');
-          $this->dump($norm_result->out('wkt'));
-          continue;
-        }
-      }
+		// The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
+		if ($haus_dist / $scale > 0.5) {
+		  $this->fail('Output mismatch on '.$method);
+		  $this->dump('GEOS : ');
+		  $this->dump($geos_result->out('wkt'));
+		  $this->dump('NORM : ');
+		  $this->dump($norm_result->out('wkt'));
+		  continue;
+		}
+	  }
 
-      if ($geos_type == 'boolean' || $geos_type == 'string') {
-        if ($geos_result !== $norm_result) {
-          $this->fail('Output mismatch on '.$method);
-          $this->dump('GEOS : ');
-          $this->dump((string) $geos_result);
-          $this->dump('NORM : ');
-          $this->dump((string) $norm_result);
-          continue;
-        }
-      }
+	  if ($geos_type == 'boolean' || $geos_type == 'string') {
+		if ($geos_result !== $norm_result) {
+		  $this->fail('Output mismatch on '.$method);
+		  $this->dump('GEOS : ');
+		  $this->dump((string) $geos_result);
+		  $this->dump('NORM : ');
+		  $this->dump((string) $norm_result);
+		  continue;
+		}
+	  }
 
-      //@@TODO: Run tests for output of types arrays and float
-      //@@TODO: centroid function is non-compliant for collections and strings
-    }
+	  //@@TODO: Run tests for output of types arrays and float
+	  //@@TODO: centroid function is non-compliant for collections and strings
+	}
   }
 }

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,9 @@
 
   function _methods_tester_with_geos($geometry) {
     // Cannot test methods if GEOS is not intstalled
-    if (!geoPHP::geosInstalled()) return;
+    if (!geoPHP::geosInstalled()) {
+    	return;
+    }
 
     $methods = array(
       //'boundary', //@@TODO: Uncomment this and fix errors