enwikipedia-acc / waca

includes/AutoLoader.php

Indentation +28 added lines, -28 removed lines

@@ -13,36 +13,36 @@
  */
 class AutoLoader
 {
-    public static function load($class)
-    {
-        // handle namespaces sensibly
-        if (strpos($class, "Waca") !== false) {
-            // strip off the initial namespace
-            $class = str_replace("Waca\\", "", $class);
+	public static function load($class)
+	{
+		// handle namespaces sensibly
+		if (strpos($class, "Waca") !== false) {
+			// strip off the initial namespace
+			$class = str_replace("Waca\\", "", $class);
 
-            // swap backslashes for forward slashes to map to directory names
-            $class = str_replace("\\", "/", $class);
-        }
+			// swap backslashes for forward slashes to map to directory names
+			$class = str_replace("\\", "/", $class);
+		}
 
-        $paths = array(
-            __DIR__ . '/' . $class . ".php",
-            __DIR__ . '/DataObjects/' . $class . ".php",
-            __DIR__ . '/Providers/' . $class . ".php",
-            __DIR__ . '/Providers/Interfaces/' . $class . ".php",
-            __DIR__ . '/Validation/' . $class . ".php",
-            __DIR__ . '/Helpers/' . $class . ".php",
-            __DIR__ . '/Helpers/Interfaces/' . $class . ".php",
-            __DIR__ . '/' . $class . ".php",
-        );
+		$paths = array(
+			__DIR__ . '/' . $class . ".php",
+			__DIR__ . '/DataObjects/' . $class . ".php",
+			__DIR__ . '/Providers/' . $class . ".php",
+			__DIR__ . '/Providers/Interfaces/' . $class . ".php",
+			__DIR__ . '/Validation/' . $class . ".php",
+			__DIR__ . '/Helpers/' . $class . ".php",
+			__DIR__ . '/Helpers/Interfaces/' . $class . ".php",
+			__DIR__ . '/' . $class . ".php",
+		);
 
-        foreach ($paths as $file) {
-            if (file_exists($file)) {
-                require_once($file);
-            }
+		foreach ($paths as $file) {
+			if (file_exists($file)) {
+				require_once($file);
+			}
 
-            if (class_exists($class)) {
-                return;
-            }
-        }
-    }
+			if (class_exists($class)) {
+				return;
+			}
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -25,14 +25,14 @@
         }
 
         $paths = array(
-            __DIR__ . '/' . $class . ".php",
-            __DIR__ . '/DataObjects/' . $class . ".php",
-            __DIR__ . '/Providers/' . $class . ".php",
-            __DIR__ . '/Providers/Interfaces/' . $class . ".php",
-            __DIR__ . '/Validation/' . $class . ".php",
-            __DIR__ . '/Helpers/' . $class . ".php",
-            __DIR__ . '/Helpers/Interfaces/' . $class . ".php",
-            __DIR__ . '/' . $class . ".php",
+            __DIR__.'/'.$class.".php",
+            __DIR__.'/DataObjects/'.$class.".php",
+            __DIR__.'/Providers/'.$class.".php",
+            __DIR__.'/Providers/Interfaces/'.$class.".php",
+            __DIR__.'/Validation/'.$class.".php",
+            __DIR__.'/Helpers/'.$class.".php",
+            __DIR__.'/Helpers/Interfaces/'.$class.".php",
+            __DIR__.'/'.$class.".php",
         );
 
         foreach ($paths as $file) {

includes/StringFunctions.php

Indentation +64 added lines, -64 removed lines

@@ -10,77 +10,77 @@
 
 class StringFunctions
 {
-    /**
-     * Formats a string to be used as a username.
-     *
-     * @param $username
-     *
-     * @return string
-     */
-    public function formatAsUsername($username)
-    {
-        // trim whitespace from the ends
-        $uname = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $username);
+	/**
+	 * Formats a string to be used as a username.
+	 *
+	 * @param $username
+	 *
+	 * @return string
+	 */
+	public function formatAsUsername($username)
+	{
+		// trim whitespace from the ends
+		$uname = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $username);
 
-        // convert first char to uppercase
-        $uname = $this->ucfirst($uname);
+		// convert first char to uppercase
+		$uname = $this->ucfirst($uname);
 
-        // replace spaces with underscores
-        $uname = mb_ereg_replace("[ ]+", "_", $uname);
+		// replace spaces with underscores
+		$uname = mb_ereg_replace("[ ]+", "_", $uname);
 
-        // trim underscores from the end
-        $uname = mb_ereg_replace("[_]+$", "", $uname);
+		// trim underscores from the end
+		$uname = mb_ereg_replace("[_]+$", "", $uname);
 
-        return $uname;
-    }
+		return $uname;
+	}
 
-    /**
-     * Formats a string to be used as an email (specifically strips whitespace
-     * from the beginning/end of the Email, as well as immediately before/after
-     * the @ in the Email).
-     *
-     * @param $email
-     *
-     * @return string
-     */
-    public static function formatAsEmail($email)
-    {
-        // trim whitespace from the ends
-        $newemail = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $email);
+	/**
+	 * Formats a string to be used as an email (specifically strips whitespace
+	 * from the beginning/end of the Email, as well as immediately before/after
+	 * the @ in the Email).
+	 *
+	 * @param $email
+	 *
+	 * @return string
+	 */
+	public static function formatAsEmail($email)
+	{
+		// trim whitespace from the ends
+		$newemail = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $email);
 
-        // trim whitespace from around the email address
-        $newemail = mb_ereg_replace("[ \t]+@", "@", $newemail);
-        $newemail = mb_ereg_replace("@[ \t]+", "@", $newemail);
+		// trim whitespace from around the email address
+		$newemail = mb_ereg_replace("[ \t]+@", "@", $newemail);
+		$newemail = mb_ereg_replace("@[ \t]+", "@", $newemail);
 
-        return $newemail;
-    }
+		return $newemail;
+	}
 
-    /**
-     * Returns true if a string is a multibyte string
-     *
-     * @param string $string
-     *
-     * @return bool
-     */
-    public function isMultibyte($string)
-    {
-        return strlen($string) !== mb_strlen($string);
-    }
+	/**
+	 * Returns true if a string is a multibyte string
+	 *
+	 * @param string $string
+	 *
+	 * @return bool
+	 */
+	public function isMultibyte($string)
+	{
+		return strlen($string) !== mb_strlen($string);
+	}
 
-    /**
-     * Make a string's first character uppercase
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    public function ucfirst($string)
-    {
-        if (ord($string) < 128) {
-            return ucfirst($string);
-        }
-        else {
-            return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
-        }
-    }
+	/**
+	 * Make a string's first character uppercase
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	public function ucfirst($string)
+	{
+		if (ord($string) < 128) {
+			return ucfirst($string);
+		}
+		else {
+			return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
             return ucfirst($string);
         }
         else {
-            return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
+            return mb_strtoupper(mb_substr($string, 0, 1)).mb_substr($string, 1);
         }
     }
 }

includes/ConsoleTasks/UpdateTorExitTask.php

Indentation +10 added lines, -10 removed lines

@@ -13,14 +13,14 @@
 
 class UpdateTorExitTask extends ConsoleTaskBase
 {
-    /**
-     * @return void
-     */
-    public function execute()
-    {
-        TorExitProvider::regenerate(
-            $this->getDatabase(),
-            $this->getHttpHelper(),
-            $this->getSiteConfiguration()->getTorExitPaths());
-    }
+	/**
+	 * @return void
+	 */
+	public function execute()
+	{
+		TorExitProvider::regenerate(
+			$this->getDatabase(),
+			$this->getHttpHelper(),
+			$this->getSiteConfiguration()->getTorExitPaths());
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/RecreateTrustedIpTableTask.php

Indentation +148 added lines, -148 removed lines

@@ -16,152 +16,152 @@
 
 class RecreateTrustedIpTableTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-
-        echo "Fetching file...\n";
-
-        $htmlfile = file($this->getSiteConfiguration()->getXffTrustedHostsFile(),
-            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-        $ip = array();
-        $iprange = array();
-        $dnsdomain = array();
-
-        echo "Sorting file...\n";
-        $this->readFile($htmlfile, $iprange, $ip, $dnsdomain);
-
-        echo "Exploding CIDRs...\n";
-        $this->explodeCidrs($iprange, $ip);
-
-        echo "Resolving DNS...\n";
-        $this->resolveDns($dnsdomain, $ip);
-
-        echo "Uniq-ing array...\n";
-
-        $ip = array_unique($ip);
-
-        $database = $this->getDatabase();
-
-        $database->exec('DELETE FROM xfftrustcache;');
-
-        $insert = $database->prepare('INSERT INTO xfftrustcache (ip) VALUES (:ip);');
-
-        $this->doInserts($ip, $insert);
-    }
-
-    /**
-     * @param string[] $dnsDomains  the DNS domains to resolve
-     * @param string[] $ipAddresses existing array of IPs to add to
-     */
-    protected function resolveDns($dnsDomains, &$ipAddresses)
-    {
-        foreach ($dnsDomains as $domain) {
-            $ipList = gethostbynamel($domain);
-
-            if ($ipList === false) {
-                echo "Invalid DNS name $domain\n";
-                continue;
-            }
-
-            foreach ($ipList as $ipAddress) {
-                $ipAddresses[] = $ipAddress;
-            }
-
-            // don't DoS
-            usleep(10000);
-        }
-    }
-
-    /**
-     * @param $iprange
-     * @param $ip
-     */
-    protected function explodeCidrs($iprange, &$ip)
-    {
-        foreach ($iprange as $r) {
-            $ips = $this->getXffTrustProvider()->explodeCidr($r);
-
-            foreach ($ips as $i) {
-                $ip[] = $i;
-            }
-        }
-    }
-
-    /**
-     * @param $htmlfile
-     * @param $iprange
-     * @param $ip
-     * @param $dnsdomain
-     */
-    protected function readFile($htmlfile, &$iprange, &$ip, &$dnsdomain)
-    {
-        foreach ($htmlfile as $line_num => $rawline) {
-            // remove the comments
-            $hashPos = strpos($rawline, '#');
-            if ($hashPos !== false) {
-                $line = substr($rawline, 0, $hashPos);
-            }
-            else {
-                $line = $rawline;
-            }
-
-            $line = trim($line);
-
-            // this was a comment or empty line...
-            if ($line == "") {
-                continue;
-            }
-
-            // match a regex of an CIDR range:
-            $ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@';
-            if (preg_match($ipcidr, $line) === 1) {
-                $iprange[] = $line;
-                continue;
-            }
-
-            $ipnoncidr = '@' . RegexConstants::IPV4 . '@';
-            if (preg_match($ipnoncidr, $line) === 1) {
-                $ip[] = $line;
-                continue;
-            }
-
-            // it's probably a DNS name.
-            $dnsdomain[] = $line;
-        }
-    }
-
-    /**
-     * @param array        $ip
-     * @param PDOStatement $insert
-     *
-     * @throws Exception
-     */
-    protected function doInserts($ip, PDOStatement $insert)
-    {
-        $successful = true;
-
-        foreach ($ip as $i) {
-            if (count($i) > 15) {
-                echo "Rejected $i\n";
-                $successful = false;
-
-                continue;
-            }
-
-            try {
-                $insert->execute(array(':ip' => $i));
-            }
-            catch (PDOException $ex) {
-                echo "Exception on $i :\n";
-                echo $ex->getMessage();
-                $successful = false;
-                break;
-            }
-        }
-
-        if (!$successful) {
-            throw new Exception('Encountered errors during transaction processing');
-        }
-    }
+	public function execute()
+	{
+
+		echo "Fetching file...\n";
+
+		$htmlfile = file($this->getSiteConfiguration()->getXffTrustedHostsFile(),
+			FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+		$ip = array();
+		$iprange = array();
+		$dnsdomain = array();
+
+		echo "Sorting file...\n";
+		$this->readFile($htmlfile, $iprange, $ip, $dnsdomain);
+
+		echo "Exploding CIDRs...\n";
+		$this->explodeCidrs($iprange, $ip);
+
+		echo "Resolving DNS...\n";
+		$this->resolveDns($dnsdomain, $ip);
+
+		echo "Uniq-ing array...\n";
+
+		$ip = array_unique($ip);
+
+		$database = $this->getDatabase();
+
+		$database->exec('DELETE FROM xfftrustcache;');
+
+		$insert = $database->prepare('INSERT INTO xfftrustcache (ip) VALUES (:ip);');
+
+		$this->doInserts($ip, $insert);
+	}
+
+	/**
+	 * @param string[] $dnsDomains  the DNS domains to resolve
+	 * @param string[] $ipAddresses existing array of IPs to add to
+	 */
+	protected function resolveDns($dnsDomains, &$ipAddresses)
+	{
+		foreach ($dnsDomains as $domain) {
+			$ipList = gethostbynamel($domain);
+
+			if ($ipList === false) {
+				echo "Invalid DNS name $domain\n";
+				continue;
+			}
+
+			foreach ($ipList as $ipAddress) {
+				$ipAddresses[] = $ipAddress;
+			}
+
+			// don't DoS
+			usleep(10000);
+		}
+	}
+
+	/**
+	 * @param $iprange
+	 * @param $ip
+	 */
+	protected function explodeCidrs($iprange, &$ip)
+	{
+		foreach ($iprange as $r) {
+			$ips = $this->getXffTrustProvider()->explodeCidr($r);
+
+			foreach ($ips as $i) {
+				$ip[] = $i;
+			}
+		}
+	}
+
+	/**
+	 * @param $htmlfile
+	 * @param $iprange
+	 * @param $ip
+	 * @param $dnsdomain
+	 */
+	protected function readFile($htmlfile, &$iprange, &$ip, &$dnsdomain)
+	{
+		foreach ($htmlfile as $line_num => $rawline) {
+			// remove the comments
+			$hashPos = strpos($rawline, '#');
+			if ($hashPos !== false) {
+				$line = substr($rawline, 0, $hashPos);
+			}
+			else {
+				$line = $rawline;
+			}
+
+			$line = trim($line);
+
+			// this was a comment or empty line...
+			if ($line == "") {
+				continue;
+			}
+
+			// match a regex of an CIDR range:
+			$ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@';
+			if (preg_match($ipcidr, $line) === 1) {
+				$iprange[] = $line;
+				continue;
+			}
+
+			$ipnoncidr = '@' . RegexConstants::IPV4 . '@';
+			if (preg_match($ipnoncidr, $line) === 1) {
+				$ip[] = $line;
+				continue;
+			}
+
+			// it's probably a DNS name.
+			$dnsdomain[] = $line;
+		}
+	}
+
+	/**
+	 * @param array        $ip
+	 * @param PDOStatement $insert
+	 *
+	 * @throws Exception
+	 */
+	protected function doInserts($ip, PDOStatement $insert)
+	{
+		$successful = true;
+
+		foreach ($ip as $i) {
+			if (count($i) > 15) {
+				echo "Rejected $i\n";
+				$successful = false;
+
+				continue;
+			}
+
+			try {
+				$insert->execute(array(':ip' => $i));
+			}
+			catch (PDOException $ex) {
+				echo "Exception on $i :\n";
+				echo $ex->getMessage();
+				$successful = false;
+				break;
+			}
+		}
+
+		if (!$successful) {
+			throw new Exception('Encountered errors during transaction processing');
+		}
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
             }
 
             // match a regex of an CIDR range:
-            $ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@';
+            $ipcidr = '@'.RegexConstants::IPV4.RegexConstants::IPV4_CIDR.'@';
             if (preg_match($ipcidr, $line) === 1) {
                 $iprange[] = $line;
                 continue;
             }
 
-            $ipnoncidr = '@' . RegexConstants::IPV4 . '@';
+            $ipnoncidr = '@'.RegexConstants::IPV4.'@';
             if (preg_match($ipnoncidr, $line) === 1) {
                 $ip[] = $line;
                 continue;

includes/ConsoleTasks/ClearExpiredIdentificationData.php

Indentation +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@
 
 class ClearExpiredIdentificationData extends ConsoleTaskBase
 {
-    /**
-     * @return void
-     */
-    public function execute()
-    {
-        IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
-    }
+	/**
+	 * @return void
+	 */
+	public function execute()
+	{
+		IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
+	}
 }

includes/ConsoleTasks/OldRequestCleanupTask.php

Indentation +15 added lines, -15 removed lines

@@ -12,28 +12,28 @@
 
 class OldRequestCleanupTask extends ConsoleTaskBase
 {
-    private $expiryTime;
+	private $expiryTime;
 
-    /**
-     * OldRequestCleanupTask constructor.
-     */
-    public function __construct()
-    {
-        $this->expiryTime = $this->getSiteConfiguration()->getEmailConfirmationExpiryDays();
-    }
+	/**
+	 * OldRequestCleanupTask constructor.
+	 */
+	public function __construct()
+	{
+		$this->expiryTime = $this->getSiteConfiguration()->getEmailConfirmationExpiryDays();
+	}
 
-    public function execute()
-    {
-        $statement = $this->getDatabase()->prepare(<<<SQL
+	public function execute()
+	{
+		$statement = $this->getDatabase()->prepare(<<<SQL
             DELETE FROM request
             WHERE
                 date < DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL :expiry DAY)
                 AND emailconfirm != 'Confirmed'
                 AND emailconfirm != '';
 SQL
-        );
+		);
 
-        $statement->bindValue(':expiry', $this->expiryTime);
-        $statement->execute();
-    }
+		$statement->bindValue(':expiry', $this->expiryTime);
+		$statement->execute();
+	}
 }
\ No newline at end of file

includes/RegexConstants.php

Indentation +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@
 
 class RegexConstants
 {
-    const IPV6_CIDR = '(?:/(?:12[0-8]|1[01][0-9]|[0-9]{1,2}))?';
-    const IPV4_CIDR = '(?:/(?:32|3[01]|[0-2]?[0-9]))?';
-    const IPV4 = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-    const IPV6 = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
+	const IPV6_CIDR = '(?:/(?:12[0-8]|1[01][0-9]|[0-9]{1,2}))?';
+	const IPV4_CIDR = '(?:/(?:32|3[01]|[0-2]?[0-9]))?';
+	const IPV4 = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
+	const IPV6 = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
 }
\ No newline at end of file

includes/Helpers/WikiTextHelper.php

Indentation +48 added lines, -48 removed lines

@@ -12,52 +12,52 @@
 
 class WikiTextHelper
 {
-    /**
-     * @var SiteConfiguration
-     */
-    private $configuration;
-    /**
-     * @var HttpHelper
-     */
-    private $http;
-
-    /**
-     * WikiTextHelper constructor.
-     *
-     * @param SiteConfiguration $configuration
-     * @param HttpHelper        $http
-     */
-    public function __construct(SiteConfiguration $configuration, HttpHelper $http)
-    {
-        $this->configuration = $configuration;
-        $this->http = $http;
-    }
-
-    /**
-     * Gets the HTML for the provided wiki-markup from the MediaWiki service endpoint
-     *
-     * @param string $wikiText
-     *
-     * @return string
-     */
-    public function getHtmlForWikiText($wikiText)
-    {
-        $endpoint = $this->configuration->getMediawikiWebServiceEndpoint();
-
-        $parameters = array(
-            'action'             => 'parse',
-            'pst'                => true,
-            'contentmodel'       => 'wikitext',
-            'disablelimitreport' => true,
-            'disabletoc'         => true,
-            'disableeditsection' => true,
-            'format'             => 'php',
-            'text'               => $wikiText,
-        );
-
-        $apiResult = $this->http->get($endpoint, $parameters);
-        $parseResult = unserialize($apiResult);
-
-        return $parseResult['parse']['text']['*'];
-    }
+	/**
+	 * @var SiteConfiguration
+	 */
+	private $configuration;
+	/**
+	 * @var HttpHelper
+	 */
+	private $http;
+
+	/**
+	 * WikiTextHelper constructor.
+	 *
+	 * @param SiteConfiguration $configuration
+	 * @param HttpHelper        $http
+	 */
+	public function __construct(SiteConfiguration $configuration, HttpHelper $http)
+	{
+		$this->configuration = $configuration;
+		$this->http = $http;
+	}
+
+	/**
+	 * Gets the HTML for the provided wiki-markup from the MediaWiki service endpoint
+	 *
+	 * @param string $wikiText
+	 *
+	 * @return string
+	 */
+	public function getHtmlForWikiText($wikiText)
+	{
+		$endpoint = $this->configuration->getMediawikiWebServiceEndpoint();
+
+		$parameters = array(
+			'action'             => 'parse',
+			'pst'                => true,
+			'contentmodel'       => 'wikitext',
+			'disablelimitreport' => true,
+			'disabletoc'         => true,
+			'disableeditsection' => true,
+			'format'             => 'php',
+			'text'               => $wikiText,
+		);
+
+		$apiResult = $this->http->get($endpoint, $parameters);
+		$parseResult = unserialize($apiResult);
+
+		return $parseResult['parse']['text']['*'];
+	}
 }
\ No newline at end of file

includes/Helpers/BanHelper.php

Indentation +41 added lines, -41 removed lines

@@ -14,49 +14,49 @@
 
 class BanHelper implements IBanHelper
 {
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
 
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
 
-    /**
-     * Summary of nameIsBanned
-     *
-     * @param string $name The name to test if is banned.
-     *
-     * @return Ban
-     */
-    public function nameIsBanned($name)
-    {
-        return Ban::getBanByTarget($name, "Name", $this->database);
-    }
+	/**
+	 * Summary of nameIsBanned
+	 *
+	 * @param string $name The name to test if is banned.
+	 *
+	 * @return Ban
+	 */
+	public function nameIsBanned($name)
+	{
+		return Ban::getBanByTarget($name, "Name", $this->database);
+	}
 
-    /**
-     * Summary of emailIsBanned
-     *
-     * @param string $email
-     *
-     * @return Ban
-     */
-    public function emailIsBanned($email)
-    {
-        return Ban::getBanByTarget($email, "EMail", $this->database);
-    }
+	/**
+	 * Summary of emailIsBanned
+	 *
+	 * @param string $email
+	 *
+	 * @return Ban
+	 */
+	public function emailIsBanned($email)
+	{
+		return Ban::getBanByTarget($email, "EMail", $this->database);
+	}
 
-    /**
-     * Summary of ipIsBanned
-     *
-     * @param string $ip
-     *
-     * @return Ban
-     */
-    public function ipIsBanned($ip)
-    {
-        return Ban::getBanByTarget($ip, "IP", $this->database);
-    }
+	/**
+	 * Summary of ipIsBanned
+	 *
+	 * @param string $ip
+	 *
+	 * @return Ban
+	 */
+	public function ipIsBanned($ip)
+	{
+		return Ban::getBanByTarget($ip, "IP", $this->database);
+	}
 }