enwikipedia-acc / waca

includes/API/ApiException.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
  */
 class ApiException extends Exception
 {
-    /**
-     * @param string $message
-     */
-    public function __construct($message)
-    {
-        $this->message = $message;
-    }
+	/**
+	 * @param string $message
+	 */
+	public function __construct($message)
+	{
+		$this->message = $message;
+	}
 }

includes/AuthUtility.php

Indentation +80 added lines, -80 removed lines

@@ -10,96 +10,96 @@
 
 class AuthUtility
 {
-    /**
-     * Test the specified data against the specified credentials
-     *
-     * @param string $password
-     * @param string $credentials
-     *
-     * @return bool
-     */
-    public static function testCredentials($password, $credentials)
-    {
-        global $minimumPasswordVersion;
+	/**
+	 * Test the specified data against the specified credentials
+	 *
+	 * @param string $password
+	 * @param string $credentials
+	 *
+	 * @return bool
+	 */
+	public static function testCredentials($password, $credentials)
+	{
+		global $minimumPasswordVersion;
 
-        if (substr($credentials, 0, 1) != ":") {
-            return false;
-        }
+		if (substr($credentials, 0, 1) != ":") {
+			return false;
+		}
 
-        // determine password version
-        $data = explode(':', substr($credentials, 1));
+		// determine password version
+		$data = explode(':', substr($credentials, 1));
 
-        // call the encryptVersion function for the version that this password actually is.
-        // syntax: :1:SALT:HASH
-        // syntax: :2:x:HASH
+		// call the encryptVersion function for the version that this password actually is.
+		// syntax: :1:SALT:HASH
+		// syntax: :2:x:HASH
 
-        // check the version is one of the allowed ones:
-        if ($minimumPasswordVersion > $data[0]) {
-            return false;
-        }
+		// check the version is one of the allowed ones:
+		if ($minimumPasswordVersion > $data[0]) {
+			return false;
+		}
 
-        if ($data[0] == 1) {
-            return $credentials == self::encryptVersion1($password, $data[1]);
-        }
+		if ($data[0] == 1) {
+			return $credentials == self::encryptVersion1($password, $data[1]);
+		}
 
-        if ($data[0] == 2) {
-            return self::verifyVersion2($password, $data[2]);
-        }
+		if ($data[0] == 2) {
+			return self::verifyVersion2($password, $data[2]);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * @param string $credentials
-     *
-     * @return bool
-     */
-    public static function isCredentialVersionLatest($credentials)
-    {
-        return substr($credentials, 0, 3) === ":2:";
-    }
+	/**
+	 * @param string $credentials
+	 *
+	 * @return bool
+	 */
+	public static function isCredentialVersionLatest($credentials)
+	{
+		return substr($credentials, 0, 3) === ":2:";
+	}
 
-    /**
-     * Encrypts a user's password with the latest version of the hash algorithm
-     *
-     * @param string $password
-     *
-     * @return string
-     */
-    public static function encryptPassword($password)
-    {
-        return self::encryptVersion2($password);
-    }
+	/**
+	 * Encrypts a user's password with the latest version of the hash algorithm
+	 *
+	 * @param string $password
+	 *
+	 * @return string
+	 */
+	public static function encryptPassword($password)
+	{
+		return self::encryptVersion2($password);
+	}
 
-    /**
-     * @param string $password
-     * @param string $salt
-     *
-     * @return string
-     */
-    private static function encryptVersion1($password, $salt)
-    {
-        return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
-    }
+	/**
+	 * @param string $password
+	 * @param string $salt
+	 *
+	 * @return string
+	 */
+	private static function encryptVersion1($password, $salt)
+	{
+		return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
+	}
 
-    /**
-     * @param string $password
-     *
-     * @return string
-     */
-    private static function encryptVersion2($password)
-    {
-        return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
-    }
+	/**
+	 * @param string $password
+	 *
+	 * @return string
+	 */
+	private static function encryptVersion2($password)
+	{
+		return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
+	}
 
-    /**
-     * @param string $password
-     * @param string $hash
-     *
-     * @return bool
-     */
-    private static function verifyVersion2($password, $hash)
-    {
-        return password_verify($password, $hash);
-    }
+	/**
+	 * @param string $password
+	 * @param string $hash
+	 *
+	 * @return bool
+	 */
+	private static function verifyVersion2($password, $hash)
+	{
+		return password_verify($password, $hash);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
      */
     private static function encryptVersion1($password, $salt)
     {
-        return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
+        return ':1:'.$salt.':'.md5($salt.'-'.md5($password));
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     private static function encryptVersion2($password)
     {
-        return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
+        return ':2:x:'.password_hash($password, PASSWORD_BCRYPT);
     }
 
     /**

includes/Providers/CachedApiAntispoofProvider.php

Indentation +61 added lines, -61 removed lines

@@ -22,77 +22,77 @@
  */
 class CachedApiAntispoofProvider implements IAntiSpoofProvider
 {
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-    /**
-     * @var string
-     */
-    private $mediawikiWebServiceEndpoint;
-    /**
-     * @var HttpHelper
-     */
-    private $httpHelper;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+	/**
+	 * @var string
+	 */
+	private $mediawikiWebServiceEndpoint;
+	/**
+	 * @var HttpHelper
+	 */
+	private $httpHelper;
 
-    public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
-    {
-        $this->database = $database;
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-        $this->httpHelper = $httpHelper;
-    }
+	public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
+	{
+		$this->database = $database;
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+		$this->httpHelper = $httpHelper;
+	}
 
-    public function getSpoofs($username)
-    {
-        /** @var AntiSpoofCache $cacheResult */
-        $cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
-        if ($cacheResult == false) {
-            // get the data from the API
-            $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
-                'action'   => 'antispoof',
-                'format'   => 'php',
-                'username' => $username,
-            ));
+	public function getSpoofs($username)
+	{
+		/** @var AntiSpoofCache $cacheResult */
+		$cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
+		if ($cacheResult == false) {
+			// get the data from the API
+			$data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
+				'action'   => 'antispoof',
+				'format'   => 'php',
+				'username' => $username,
+			));
 
-            $cacheEntry = new AntiSpoofCache();
-            $cacheEntry->setDatabase($this->database);
-            $cacheEntry->setUsername($username);
-            $cacheEntry->setData($data);
-            $cacheEntry->save();
+			$cacheEntry = new AntiSpoofCache();
+			$cacheEntry->setDatabase($this->database);
+			$cacheEntry->setUsername($username);
+			$cacheEntry->setData($data);
+			$cacheEntry->save();
 
-            $cacheResult = $cacheEntry;
-        }
-        else {
-            $data = $cacheResult->getData();
-        }
+			$cacheResult = $cacheEntry;
+		}
+		else {
+			$data = $cacheResult->getData();
+		}
 
-        $result = unserialize($data);
+		$result = unserialize($data);
 
-        if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
-            $cacheResult->delete();
+		if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
+			$cacheResult->delete();
 
-            if (isset($result['error']['info'])) {
-                throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
-            }
+			if (isset($result['error']['info'])) {
+				throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+			}
 
-            throw new Exception("Unrecognised API response to query.");
-        }
+			throw new Exception("Unrecognised API response to query.");
+		}
 
-        if ($result['antispoof']['result'] == "pass") {
-            // All good here!
-            return array();
-        }
+		if ($result['antispoof']['result'] == "pass") {
+			// All good here!
+			return array();
+		}
 
-        if ($result['antispoof']['result'] == "conflict") {
-            // we've got conflicts, let's do something with them.
-            return $result['antispoof']['users'];
-        }
+		if ($result['antispoof']['result'] == "conflict") {
+			// we've got conflicts, let's do something with them.
+			return $result['antispoof']['users'];
+		}
 
-        if ($result['antispoof']['result'] == "error") {
-            // we've got conflicts, let's do something with them.
-            throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
-        }
+		if ($result['antispoof']['result'] == "error") {
+			// we've got conflicts, let's do something with them.
+			throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+		}
 
-        throw new Exception("Unrecognised API response to query.");
-    }
+		throw new Exception("Unrecognised API response to query.");
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
             $cacheResult->delete();
 
             if (isset($result['error']['info'])) {
-                throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+                throw new Exception("Unrecognised API response to query: ".$result['error']['info']);
             }
 
             throw new Exception("Unrecognised API response to query.");
@@ -90,7 +90,7 @@ 
 
         if ($result['antispoof']['result'] == "error") {
             // we've got conflicts, let's do something with them.
-            throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+            throw new Exception("Encountered error while getting result: ".$result['antispoof']['error']);
         }
 
         throw new Exception("Unrecognised API response to query.");

includes/Providers/XffTrustProvider.php

Indentation +152 added lines, -152 removed lines

@@ -22,156 +22,156 @@
  */
 class XffTrustProvider implements IXffTrustProvider
 {
-    /**
-     * Array of IP addresses which are TRUSTED proxies
-     * @var string[]
-     */
-    private $trustedCache = array();
-    /**
-     * Array of IP addresses which are UNTRUSTED proxies
-     * @var string[]
-     */
-    private $untrustedCache = array();
-    /** @var PDOStatement */
-    private $trustedQuery;
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-
-    /**
-     * Creates a new instance of the trust provider
-     *
-     * @param string[]    $squidIpList List of IP addresses to pre-approve
-     * @param PdoDatabase $database
-     */
-    public function __construct($squidIpList, PdoDatabase $database)
-    {
-        $this->trustedCache = $squidIpList;
-        $this->database = $database;
-    }
-
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip)
-    {
-        if (in_array($ip, $this->trustedCache)) {
-            return true;
-        }
-
-        if (in_array($ip, $this->untrustedCache)) {
-            return false;
-        }
-
-        if ($this->trustedQuery === null) {
-            $query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
-            $this->trustedQuery = $this->database->prepare($query);
-        }
-
-        $this->trustedQuery->execute(array(":ip" => $ip));
-        $result = $this->trustedQuery->fetchColumn();
-        $this->trustedQuery->closeCursor();
-
-        if ($result == 0) {
-            $this->untrustedCache[] = $ip;
-
-            return false;
-        }
-
-        if ($result >= 1) {
-            $this->trustedCache[] = $ip;
-
-            return true;
-        }
-
-        // something weird has happened if we've got here.
-        // default to untrusted.
-        return false;
-    }
-
-    /**
-     * Gets the last trusted IP in the proxy chain.
-     *
-     * @param string $ip      The IP address from REMOTE_ADDR
-     * @param string $proxyIp The contents of the XFF header.
-     *
-     * @return string Trusted source IP address
-     */
-    public function getTrustedClientIp($ip, $proxyIp)
-    {
-        $clientIpAddress = $ip;
-        if ($proxyIp) {
-            $ipList = explode(",", $proxyIp);
-            $ipList[] = $clientIpAddress;
-            $ipList = array_reverse($ipList);
-
-            foreach ($ipList as $ipNumber => $ipAddress) {
-                if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
-                    continue;
-                }
-
-                $clientIpAddress = $ipAddress;
-                break;
-            }
-        }
-
-        return $clientIpAddress;
-    }
-
-    /**
-     * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
-     *
-     * @param array  $haystack
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function ipInRange($haystack, $ip)
-    {
-        $needle = ip2long($ip);
-
-        foreach ($haystack as $low => $high) {
-            if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Explodes a CIDR range into an array of addresses
-     *
-     * @param string $range A CIDR-format range
-     *
-     * @return array An array containing every IP address in the range
-     */
-    public function explodeCidr($range)
-    {
-        $cidrData = explode('/', $range);
-
-        if (!isset($cidrData[1])) {
-            return array($range);
-        }
-
-        $blow = (
-            str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
-            str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
-        );
-        $bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
-
-        $list = array();
-
-        $bindecBHigh = bindec($bhigh);
-        for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
-            $list[] = long2ip($x);
-        }
-
-        return $list;
-    }
+	/**
+	 * Array of IP addresses which are TRUSTED proxies
+	 * @var string[]
+	 */
+	private $trustedCache = array();
+	/**
+	 * Array of IP addresses which are UNTRUSTED proxies
+	 * @var string[]
+	 */
+	private $untrustedCache = array();
+	/** @var PDOStatement */
+	private $trustedQuery;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+
+	/**
+	 * Creates a new instance of the trust provider
+	 *
+	 * @param string[]    $squidIpList List of IP addresses to pre-approve
+	 * @param PdoDatabase $database
+	 */
+	public function __construct($squidIpList, PdoDatabase $database)
+	{
+		$this->trustedCache = $squidIpList;
+		$this->database = $database;
+	}
+
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip)
+	{
+		if (in_array($ip, $this->trustedCache)) {
+			return true;
+		}
+
+		if (in_array($ip, $this->untrustedCache)) {
+			return false;
+		}
+
+		if ($this->trustedQuery === null) {
+			$query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
+			$this->trustedQuery = $this->database->prepare($query);
+		}
+
+		$this->trustedQuery->execute(array(":ip" => $ip));
+		$result = $this->trustedQuery->fetchColumn();
+		$this->trustedQuery->closeCursor();
+
+		if ($result == 0) {
+			$this->untrustedCache[] = $ip;
+
+			return false;
+		}
+
+		if ($result >= 1) {
+			$this->trustedCache[] = $ip;
+
+			return true;
+		}
+
+		// something weird has happened if we've got here.
+		// default to untrusted.
+		return false;
+	}
+
+	/**
+	 * Gets the last trusted IP in the proxy chain.
+	 *
+	 * @param string $ip      The IP address from REMOTE_ADDR
+	 * @param string $proxyIp The contents of the XFF header.
+	 *
+	 * @return string Trusted source IP address
+	 */
+	public function getTrustedClientIp($ip, $proxyIp)
+	{
+		$clientIpAddress = $ip;
+		if ($proxyIp) {
+			$ipList = explode(",", $proxyIp);
+			$ipList[] = $clientIpAddress;
+			$ipList = array_reverse($ipList);
+
+			foreach ($ipList as $ipNumber => $ipAddress) {
+				if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
+					continue;
+				}
+
+				$clientIpAddress = $ipAddress;
+				break;
+			}
+		}
+
+		return $clientIpAddress;
+	}
+
+	/**
+	 * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
+	 *
+	 * @param array  $haystack
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function ipInRange($haystack, $ip)
+	{
+		$needle = ip2long($ip);
+
+		foreach ($haystack as $low => $high) {
+			if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Explodes a CIDR range into an array of addresses
+	 *
+	 * @param string $range A CIDR-format range
+	 *
+	 * @return array An array containing every IP address in the range
+	 */
+	public function explodeCidr($range)
+	{
+		$cidrData = explode('/', $range);
+
+		if (!isset($cidrData[1])) {
+			return array($range);
+		}
+
+		$blow = (
+			str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
+			str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
+		);
+		$bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
+
+		$list = array();
+
+		$bindecBHigh = bindec($bhigh);
+		for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
+			$list[] = long2ip($x);
+		}
+
+		return $list;
+	}
 }

includes/Providers/CachedRDnsLookupProvider.php

Indentation +27 added lines, -27 removed lines

@@ -20,40 +20,40 @@
  */
 class CachedRDnsLookupProvider implements IRDnsProvider
 {
-    private $database;
+	private $database;
 
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
 
-    public function getReverseDNS($address)
-    {
-        $address = trim($address);
+	public function getReverseDNS($address)
+	{
+		$address = trim($address);
 
-        // lets look in our cache database first.
-        $rDns = RDnsCache::getByAddress($address, $this->database);
+		// lets look in our cache database first.
+		$rDns = RDnsCache::getByAddress($address, $this->database);
 
-        if ($rDns instanceof RDnsCache) {
-            // touch cache timer
-            $rDns->save();
+		if ($rDns instanceof RDnsCache) {
+			// touch cache timer
+			$rDns->save();
 
-            return $rDns->getData();
-        }
+			return $rDns->getData();
+		}
 
-        // OK, it's not there, let's do an rDNS lookup.
-        $result = @ gethostbyaddr($address);
+		// OK, it's not there, let's do an rDNS lookup.
+		$result = @ gethostbyaddr($address);
 
-        if ($result !== false) {
-            $rDns = new RDnsCache();
-            $rDns->setDatabase($this->database);
-            $rDns->setAddress($address);
-            $rDns->setData($result);
-            $rDns->save();
+		if ($result !== false) {
+			$rDns = new RDnsCache();
+			$rDns->setDatabase($this->database);
+			$rDns->setAddress($address);
+			$rDns->setData($result);
+			$rDns->save();
 
-            return $result;
-        }
+			return $result;
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

includes/Providers/GlobalState/GlobalStateProvider.php

Indentation +28 added lines, -28 removed lines

@@ -18,35 +18,35 @@
  */
 class GlobalStateProvider implements IGlobalStateProvider
 {
-    /**
-     * @return array
-     */
-    public function &getServerSuperGlobal()
-    {
-        return $_SERVER;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getServerSuperGlobal()
+	{
+		return $_SERVER;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getGetSuperGlobal()
-    {
-        return $_GET;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getGetSuperGlobal()
+	{
+		return $_GET;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getPostSuperGlobal()
-    {
-        return $_POST;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getPostSuperGlobal()
+	{
+		return $_POST;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getSessionSuperGlobal()
-    {
-        return $_SESSION;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getSessionSuperGlobal()
+	{
+		return $_SESSION;
+	}
 }
\ No newline at end of file

includes/Providers/GlobalState/IGlobalStateProvider.php

Indentation +16 added lines, -16 removed lines

@@ -14,23 +14,23 @@
  */
 interface IGlobalStateProvider
 {
-    /**
-     * @return array
-     */
-    public function getServerSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getServerSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getGetSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getGetSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getPostSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getPostSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getSessionSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getSessionSuperGlobal();
 }
\ No newline at end of file

includes/Providers/GlobalState/FakeGlobalStateProvider.php

Indentation +20 added lines, -20 removed lines

@@ -18,28 +18,28 @@
  */
 class FakeGlobalStateProvider extends GlobalStateProvider implements IGlobalStateProvider
 {
-    var $server = array();
-    var $get = array();
-    var $post = array();
-    var $session = array();
+	var $server = array();
+	var $get = array();
+	var $post = array();
+	var $session = array();
 
-    public function &getServerSuperGlobal()
-    {
-        return $this->server;
-    }
+	public function &getServerSuperGlobal()
+	{
+		return $this->server;
+	}
 
-    public function &getGetSuperGlobal()
-    {
-        return $this->get;
-    }
+	public function &getGetSuperGlobal()
+	{
+		return $this->get;
+	}
 
-    public function &getPostSuperGlobal()
-    {
-        return $this->post;
-    }
+	public function &getPostSuperGlobal()
+	{
+		return $this->post;
+	}
 
-    public function &getSessionSuperGlobal()
-    {
-        return $this->session;
-    }
+	public function &getSessionSuperGlobal()
+	{
+		return $this->session;
+	}
 }
\ No newline at end of file

includes/Providers/TorExitProvider.php

Indentation +75 added lines, -75 removed lines

@@ -13,96 +13,96 @@
 
 class TorExitProvider
 {
-    /** @var PdoDatabase */
-    private $database;
-
-    /**
-     * TorExitProvider constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
-
-    /**
-     * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
-     *
-     * @param string $ip IP Address
-     *
-     * @return bool
-     */
-    public function isTorExit($ip)
-    {
-        $statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
-
-        $statement->execute(array(':ip' => $ip));
-
-        $count = $statement->fetchColumn();
-        $statement->closeCursor();
-
-        if ($count > 0) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
-    {
-        $query = <<<SQL
+	/** @var PdoDatabase */
+	private $database;
+
+	/**
+	 * TorExitProvider constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
+
+	/**
+	 * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
+	 *
+	 * @param string $ip IP Address
+	 *
+	 * @return bool
+	 */
+	public function isTorExit($ip)
+	{
+		$statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
+
+		$statement->execute(array(':ip' => $ip));
+
+		$count = $statement->fetchColumn();
+		$statement->closeCursor();
+
+		if ($count > 0) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
+	{
+		$query = <<<SQL
 INSERT INTO tornodecache (ipaddr, exitaddr, exitport)
 VALUES (:ipaddr, :exitaddr, :exitport)
 ON DUPLICATE KEY
 UPDATE touched = CURRENT_TIMESTAMP, updateversion = updateversion + 1
 SQL;
 
-        $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        foreach ($destinationIps as $ip) {
-            echo 'Fetching data for ' . $ip . PHP_EOL;
+		foreach ($destinationIps as $ip) {
+			echo 'Fetching data for ' . $ip . PHP_EOL;
 
-            $statement->bindValue(':exitaddr', $ip);
+			$statement->bindValue(':exitaddr', $ip);
 
-            $http = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 80,
-                ));
+			$http = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 80,
+				));
 
-            $https = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 443,
-                ));
+			$https = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 443,
+				));
 
-            foreach (array(80 => $http, 443 => $https) as $port => $response) {
-                echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
+			foreach (array(80 => $http, 443 => $https) as $port => $response) {
+				echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
 
-                $statement->bindValue(':exitport', $port);
+				$statement->bindValue(':exitport', $port);
 
-                $lines = explode("\n", $response);
+				$lines = explode("\n", $response);
 
-                foreach ($lines as $line) {
-                    // line contains a comment char, just skip the line.
-                    // This is OK as of 2016-04-06  --stw
-                    if (strpos($line, '#') !== false) {
-                        continue;
-                    }
+				foreach ($lines as $line) {
+					// line contains a comment char, just skip the line.
+					// This is OK as of 2016-04-06  --stw
+					if (strpos($line, '#') !== false) {
+						continue;
+					}
 
-                    $statement->bindValue(':ipaddr', $line);
-                    $statement->execute();
-                }
-            }
+					$statement->bindValue(':ipaddr', $line);
+					$statement->execute();
+				}
+			}
 
-            echo 'Done for ' . $ip . PHP_EOL;
-        }
+			echo 'Done for ' . $ip . PHP_EOL;
+		}
 
-        // kill old cached entries
-        $database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
-    }
+		// kill old cached entries
+		$database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
         $statement = $database->prepare($query);
 
         foreach ($destinationIps as $ip) {
-            echo 'Fetching data for ' . $ip . PHP_EOL;
+            echo 'Fetching data for '.$ip.PHP_EOL;
 
             $statement->bindValue(':exitaddr', $ip);
 
@@ -81,7 +81,7 @@ 
                 ));
 
             foreach (array(80 => $http, 443 => $https) as $port => $response) {
-                echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
+                echo '  Running for port '.$ip.':'.$port.PHP_EOL;
 
                 $statement->bindValue(':exitport', $port);
 
@@ -99,7 +99,7 @@ 
                 }
             }
 
-            echo 'Done for ' . $ip . PHP_EOL;
+            echo 'Done for '.$ip.PHP_EOL;
         }
 
         // kill old cached entries