Inspection of "Add Role-Based Access Control to the tool" - enwikipedia-acc/waca - Measure and Improve Code Quality continuously with Scrutinizer

Failed Conditions

Pull Request — newinternal-bugfixing (#286)

by Simon

created 2017-06-22 00:19 UTC

Status

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -12,51 +12,51 @@
 block discarded – undo
 
 class TypeAheadHelper implements ITypeAheadHelper
 {
-    private $definedClasses = array();
-
-    /**
-     * @param string   $class     CSS class to apply this typeahead to.
-     * @param callable $generator Generator function taking no arguments to return an array of strings.
-     */
-    public function defineTypeAheadSource($class, callable $generator)
-    {
-        $dataList = '';
-        foreach ($generator() as $dataItem) {
-            $dataList .= '"' . htmlentities($dataItem) . '", ';
-        }
-        $dataList = "[" . rtrim($dataList, ", ") . "]";
-
-        $script = <<<JS
+	private $definedClasses = array();
+
+	/**
+	 * @param string   $class     CSS class to apply this typeahead to.
+	 * @param callable $generator Generator function taking no arguments to return an array of strings.
+	 */
+	public function defineTypeAheadSource($class, callable $generator)
+	{
+		$dataList = '';
+		foreach ($generator() as $dataItem) {
+			$dataList .= '"' . htmlentities($dataItem) . '", ';
+		}
+		$dataList = "[" . rtrim($dataList, ", ") . "]";
+
+		$script = <<<JS
 $('.{$class}').typeahead({
 	source: {$dataList}
 });
 JS;
-        $this->definedClasses[$class] = $script;
-    }
+		$this->definedClasses[$class] = $script;
+	}
 
-    /**
-     * @return string HTML fragment containing a JS block for typeaheads.
-     */
-    public function getTypeAheadScriptBlock()
-    {
-        $jsBlocks = '';
+	/**
+	 * @return string HTML fragment containing a JS block for typeaheads.
+	 */
+	public function getTypeAheadScriptBlock()
+	{
+		$jsBlocks = '';
 
-        if (count($this->definedClasses) === 0) {
-            return '';
-        }
+		if (count($this->definedClasses) === 0) {
+			return '';
+		}
 
-        foreach ($this->definedClasses as $class => $js) {
-            $jsBlocks = $js . "\r\n\r\n";
-        }
+		foreach ($this->definedClasses as $class => $js) {
+			$jsBlocks = $js . "\r\n\r\n";
+		}
 
-        $data = <<<HTML
+		$data = <<<HTML
 <script type="text/javascript">
 	{$jsBlocks}
 </script>
 HTML;
 
-        $this->definedClasses = array();
+		$this->definedClasses = array();
 
-        return $data;
-    }
+		return $data;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -22,9 +22,9 @@  discard block
 block discarded – undo
     {
         $dataList = '';
         foreach ($generator() as $dataItem) {
-            $dataList .= '"' . htmlentities($dataItem) . '", ';
+            $dataList .= '"'.htmlentities($dataItem).'", ';
         }
-        $dataList = "[" . rtrim($dataList, ", ") . "]";
+        $dataList = "[".rtrim($dataList, ", ")."]";
 
         $script = <<<JS
 $('.{$class}').typeahead({
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
         }
 
         foreach ($this->definedClasses as $class => $js) {
-            $jsBlocks = $js . "\r\n\r\n";
+            $jsBlocks = $js."\r\n\r\n";
         }
 
         $data = <<<HTML

Please login to merge, or discard this patch.

includes/Helpers/DebugHelper.php 2 patches

Indentation +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -13,53 +13,53 @@
 block discarded – undo
  */
 class DebugHelper
 {
-    /**
-     * Internal mockable method wrapper for debug_backtrace.
-     *
-     * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
-     * cascade until the runtime explodes.
-     *
-     * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
-     *
-     * @return array
-     */
-    public function get_debug_backtrace()
-    {
-        return debug_backtrace();
-    }
+	/**
+	 * Internal mockable method wrapper for debug_backtrace.
+	 *
+	 * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
+	 * cascade until the runtime explodes.
+	 *
+	 * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
+	 *
+	 * @return array
+	 */
+	public function get_debug_backtrace()
+	{
+		return debug_backtrace();
+	}
 
-    /**
-     * Returns a string representation of the current backtrace for display.
-     *
-     * Note that this explicitly excludes the top two frames, which will be methods from this class.
-     *
-     * @return string
-     */
-    public function getBacktrace()
-    {
-        $backtrace = $this->get_debug_backtrace();
+	/**
+	 * Returns a string representation of the current backtrace for display.
+	 *
+	 * Note that this explicitly excludes the top two frames, which will be methods from this class.
+	 *
+	 * @return string
+	 */
+	public function getBacktrace()
+	{
+		$backtrace = $this->get_debug_backtrace();
 
-        $output = "";
+		$output = "";
 
-        $count = 0;
-        foreach ($backtrace as $line) {
-            if ($count <= 1) {
-                $count++;
-                continue;
-            }
+		$count = 0;
+		foreach ($backtrace as $line) {
+			if ($count <= 1) {
+				$count++;
+				continue;
+			}
 
-            $output .= "#{$count}: ";
+			$output .= "#{$count}: ";
 
-            if (isset($line['type']) && $line['type'] != "") {
-                $output .= $line['class'] . $line['type'];
-            }
+			if (isset($line['type']) && $line['type'] != "") {
+				$output .= $line['class'] . $line['type'];
+			}
 
-            $output .= $line['function'] . "(...)";
-            $output .= " [{$line['file']}#{$line['line']}\r\n";
+			$output .= $line['function'] . "(...)";
+			$output .= " [{$line['file']}#{$line['line']}\r\n";
 
-            $count++;
-        }
+			$count++;
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 }

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -51,10 +51,10 @@
 block discarded – undo
             $output .= "#{$count}: ";
 
             if (isset($line['type']) && $line['type'] != "") {
-                $output .= $line['class'] . $line['type'];
+                $output .= $line['class'].$line['type'];
             }
 
-            $output .= $line['function'] . "(...)";
+            $output .= $line['function']."(...)";
             $output .= " [{$line['file']}#{$line['line']}\r\n";
 
             $count++;

Please login to merge, or discard this patch.

includes/Helpers/BlacklistHelper.php 1 patch

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

@@ -13,91 +13,91 @@
 block discarded – undo
 
 class BlacklistHelper implements IBlacklistHelper
 {
-    /** @var HttpHelper */
-    private $httpHelper;
-    /**
-     * Cache of previously requested usernames
-     * @var array
-     */
-    private $cache = array();
-    /** @var string */
-    private $mediawikiWebServiceEndpoint;
+	/** @var HttpHelper */
+	private $httpHelper;
+	/**
+	 * Cache of previously requested usernames
+	 * @var array
+	 */
+	private $cache = array();
+	/** @var string */
+	private $mediawikiWebServiceEndpoint;
 
-    /**
-     * BlacklistHelper constructor.
-     *
-     * @param HttpHelper $httpHelper
-     * @param string     $mediawikiWebServiceEndpoint
-     */
-    public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
-    {
-        $this->httpHelper = $httpHelper;
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-    }
+	/**
+	 * BlacklistHelper constructor.
+	 *
+	 * @param HttpHelper $httpHelper
+	 * @param string     $mediawikiWebServiceEndpoint
+	 */
+	public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
+	{
+		$this->httpHelper = $httpHelper;
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+	}
 
-    /**
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
-     *
-     * @param string $username
-     *
-     * @return false|string False if the username is not blacklisted, else the blacklist entry.
-     */
-    public function isBlacklisted($username)
-    {
-        if (isset($this->cache[$username])) {
-            $result = $this->cache[$username];
-            if ($result === false) {
-                return false;
-            }
+	/**
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
+	 *
+	 * @param string $username
+	 *
+	 * @return false|string False if the username is not blacklisted, else the blacklist entry.
+	 */
+	public function isBlacklisted($username)
+	{
+		if (isset($this->cache[$username])) {
+			$result = $this->cache[$username];
+			if ($result === false) {
+				return false;
+			}
 
-            return $result['line'];
-        }
+			return $result['line'];
+		}
 
-        try {
-            $result = $this->performWikiLookup($username);
-        }
-        catch (CurlException $ex) {
-            // LOGME log this, but fail gracefully.
-            return false;
-        }
+		try {
+			$result = $this->performWikiLookup($username);
+		}
+		catch (CurlException $ex) {
+			// LOGME log this, but fail gracefully.
+			return false;
+		}
 
-        if ($result['result'] === 'ok') {
-            // not blacklisted
-            $this->cache[$username] = false;
+		if ($result['result'] === 'ok') {
+			// not blacklisted
+			$this->cache[$username] = false;
 
-            return false;
-        }
-        else {
-            $this->cache[$username] = $result;
+			return false;
+		}
+		else {
+			$this->cache[$username] = $result;
 
-            return $result['line'];
-        }
-    }
+			return $result['line'];
+		}
+	}
 
-    /**
-     * Performs a fetch to MediaWiki for the relevant title blacklist entry
-     *
-     * @param string $username The username to look up
-     *
-     * @return array
-     * @throws CurlException
-     */
-    private function performWikiLookup($username)
-    {
-        $endpoint = $this->mediawikiWebServiceEndpoint;
+	/**
+	 * Performs a fetch to MediaWiki for the relevant title blacklist entry
+	 *
+	 * @param string $username The username to look up
+	 *
+	 * @return array
+	 * @throws CurlException
+	 */
+	private function performWikiLookup($username)
+	{
+		$endpoint = $this->mediawikiWebServiceEndpoint;
 
-        $parameters = array(
-            'action'       => 'titleblacklist',
-            'format'       => 'php',
-            'tbtitle'      => $username,
-            'tbaction'     => 'new-account',
-            'tbnooverride' => true,
-        );
+		$parameters = array(
+			'action'       => 'titleblacklist',
+			'format'       => 'php',
+			'tbtitle'      => $username,
+			'tbaction'     => 'new-account',
+			'tbnooverride' => true,
+		);
 
-        $apiResult = $this->httpHelper->get($endpoint, $parameters);
+		$apiResult = $this->httpHelper->get($endpoint, $parameters);
 
-        $data = unserialize($apiResult);
+		$data = unserialize($apiResult);
 
-        return $data['titleblacklist'];
-    }
+		return $data['titleblacklist'];
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/Helpers/FakeBlacklistHelper.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -12,16 +12,16 @@
 block discarded – undo
 
 class FakeBlacklistHelper implements IBlacklistHelper
 {
-    /**
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
-     *
-     * @param string $username
-     *
-     * @return bool
-     */
-    public function isBlacklisted($username)
-    {
-        // Short-circuit
-        return false;
-    }
+	/**
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
+	 *
+	 * @param string $username
+	 *
+	 * @return bool
+	 */
+	public function isBlacklisted($username)
+	{
+		// Short-circuit
+		return false;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/Helpers/EmailHelper.php 2 patches

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -12,21 +12,21 @@
 block discarded – undo
 
 class EmailHelper implements IEmailHelper
 {
-    /**
-     * @param string $to
-     * @param string $subject
-     * @param string $content
-     * @param array  $headers Extra headers to include
-     */
-    public function sendMail($to, $subject, $content, $headers = array())
-    {
-        $headers['From'] = '[email protected]';
-        $headerString = '';
+	/**
+	 * @param string $to
+	 * @param string $subject
+	 * @param string $content
+	 * @param array  $headers Extra headers to include
+	 */
+	public function sendMail($to, $subject, $content, $headers = array())
+	{
+		$headers['From'] = '[email protected]';
+		$headerString = '';
 
-        foreach ($headers as $header => $headerValue) {
-            $headerString .= $header . ': ' . $headerValue . "\r\n";
-        }
+		foreach ($headers as $header => $headerValue) {
+			$headerString .= $header . ': ' . $headerValue . "\r\n";
+		}
 
-        mail($to, $subject, $content, $headerString);
-    }
+		mail($to, $subject, $content, $headerString);
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@
 block discarded – undo
         $headerString = '';
 
         foreach ($headers as $header => $headerValue) {
-            $headerString .= $header . ': ' . $headerValue . "\r\n";
+            $headerString .= $header.': '.$headerValue."\r\n";
         }
 
         mail($to, $subject, $content, $headerString);

Please login to merge, or discard this patch.

includes/Helpers/Interfaces/IBanHelper.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -12,30 +12,30 @@
 block discarded – undo
 
 interface IBanHelper
 {
-    /**
-     * Summary of nameIsBanned
-     *
-     * @param string $name The name to test if is banned.
-     *
-     * @return Ban
-     */
-    public function nameIsBanned($name);
+	/**
+	 * Summary of nameIsBanned
+	 *
+	 * @param string $name The name to test if is banned.
+	 *
+	 * @return Ban
+	 */
+	public function nameIsBanned($name);
 
-    /**
-     * Summary of emailIsBanned
-     *
-     * @param string $email
-     *
-     * @return Ban
-     */
-    public function emailIsBanned($email);
+	/**
+	 * Summary of emailIsBanned
+	 *
+	 * @param string $email
+	 *
+	 * @return Ban
+	 */
+	public function emailIsBanned($email);
 
-    /**
-     * Summary of ipIsBanned
-     *
-     * @param string $ip
-     *
-     * @return Ban
-     */
-    public function ipIsBanned($ip);
+	/**
+	 * Summary of ipIsBanned
+	 *
+	 * @param string $ip
+	 *
+	 * @return Ban
+	 */
+	public function ipIsBanned($ip);
 }

Please login to merge, or discard this patch.

includes/Helpers/Interfaces/IEmailHelper.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -17,15 +17,15 @@
 block discarded – undo
  */
 interface IEmailHelper
 {
-    /**
-     * Sends an email to the specified email address.
-     *
-     * @param string $to
-     * @param string $subject
-     * @param string $content
-     * @param array  $headers Extra headers to include
-     *
-     * @return void
-     */
-    public function sendMail($to, $subject, $content, $headers = array());
+	/**
+	 * Sends an email to the specified email address.
+	 *
+	 * @param string $to
+	 * @param string $subject
+	 * @param string $content
+	 * @param array  $headers Extra headers to include
+	 *
+	 * @return void
+	 */
+	public function sendMail($to, $subject, $content, $headers = array());
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/Helpers/Interfaces/IBlacklistHelper.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -10,12 +10,12 @@
 block discarded – undo
 
 interface IBlacklistHelper
 {
-    /**
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
-     *
-     * @param string $username
-     *
-     * @return bool
-     */
-    public function isBlacklisted($username);
+	/**
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
+	 *
+	 * @param string $username
+	 *
+	 * @return bool
+	 */
+	public function isBlacklisted($username);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/Helpers/Interfaces/ITypeAheadHelper.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -10,16 +10,16 @@
 block discarded – undo
 
 interface ITypeAheadHelper
 {
-    /**
-     * @param string   $class     CSS class to apply this typeahead to.
-     * @param callable $generator Generator function taking no arguments to return an array of strings.
-     *
-     * @return void
-     */
-    public function defineTypeAheadSource($class, callable $generator);
+	/**
+	 * @param string   $class     CSS class to apply this typeahead to.
+	 * @param callable $generator Generator function taking no arguments to return an array of strings.
+	 *
+	 * @return void
+	 */
+	public function defineTypeAheadSource($class, callable $generator);
 
-    /**
-     * @return string HTML fragment containing a JS block for typeaheads.
-     */
-    public function getTypeAheadScriptBlock();
+	/**
+	 * @return string HTML fragment containing a JS block for typeaheads.
+	 */
+	public function getTypeAheadScriptBlock();
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -51,10 +51,10 @@
		block discarded – undo
51	51	$output .= "#{$count}: ";
52	52
53	53	if (isset($line['type']) && $line['type'] != "") {
54		- $output .= $line['class'] . $line['type'];
	54	+ $output .= $line['class'].$line['type'];
55	55	}
56	56
57		- $output .= $line['function'] . "(...)";
	57	+ $output .= $line['function']."(...)";
58	58	$output .= " [{$line['file']}#{$line['line']}\r\n";
59	59
60	60	$count++;

		@@ -12,51 +12,51 @@
		block discarded – undo
12	12
13	13	class TypeAheadHelper implements ITypeAheadHelper
14	14	{
15		- private $definedClasses = array();
16		-
17		- /**
18		- * @param string $class CSS class to apply this typeahead to.
19		- * @param callable $generator Generator function taking no arguments to return an array of strings.
20		- */
21		- public function defineTypeAheadSource($class, callable $generator)
22		- {
23		- $dataList = '';
24		- foreach ($generator() as $dataItem) {
25		- $dataList .= '"' . htmlentities($dataItem) . '", ';
26		- }
27		- $dataList = "[" . rtrim($dataList, ", ") . "]";
28		-
29		- $script = <<<JS
	15	+ private $definedClasses = array();
	16	+
	17	+ /**
	18	+ * @param string $class CSS class to apply this typeahead to.
	19	+ * @param callable $generator Generator function taking no arguments to return an array of strings.
	20	+ */
	21	+ public function defineTypeAheadSource($class, callable $generator)
	22	+ {
	23	+ $dataList = '';
	24	+ foreach ($generator() as $dataItem) {
	25	+ $dataList .= '"' . htmlentities($dataItem) . '", ';
	26	+ }
	27	+ $dataList = "[" . rtrim($dataList, ", ") . "]";
	28	+
	29	+ $script = <<<JS
30	30	$('.{$class}').typeahead({
31	31	source: {$dataList}
32	32	});
33	33	JS;
34		- $this->definedClasses[$class] = $script;
35		- }
	34	+ $this->definedClasses[$class] = $script;
	35	+ }
36	36
37		- /**
38		- * @return string HTML fragment containing a JS block for typeaheads.
39		- */
40		- public function getTypeAheadScriptBlock()
41		- {
42		- $jsBlocks = '';
	37	+ /**
	38	+ * @return string HTML fragment containing a JS block for typeaheads.
	39	+ */
	40	+ public function getTypeAheadScriptBlock()
	41	+ {
	42	+ $jsBlocks = '';
43	43
44		- if (count($this->definedClasses) === 0) {
45		- return '';
46		- }
	44	+ if (count($this->definedClasses) === 0) {
	45	+ return '';
	46	+ }
47	47
48		- foreach ($this->definedClasses as $class => $js) {
49		- $jsBlocks = $js . "\r\n\r\n";
50		- }
	48	+ foreach ($this->definedClasses as $class => $js) {
	49	+ $jsBlocks = $js . "\r\n\r\n";
	50	+ }
51	51
52		- $data = <<<HTML
	52	+ $data = <<<HTML
53	53	<script type="text/javascript">
54	54	{$jsBlocks}
55	55	</script>
56	56	HTML;
57	57
58		- $this->definedClasses = array();
	58	+ $this->definedClasses = array();
59	59
60		- return $data;
61		- }
	60	+ return $data;
	61	+ }
62	62	}
63	63	\ No newline at end of file

		@@ -22,9 +22,9 @@ discard block
		block discarded – undo
22	22	{
23	23	$dataList = '';
24	24	foreach ($generator() as $dataItem) {
25		- $dataList .= '"' . htmlentities($dataItem) . '", ';
	25	+ $dataList .= '"'.htmlentities($dataItem).'", ';
26	26	}
27		- $dataList = "[" . rtrim($dataList, ", ") . "]";
	27	+ $dataList = "[".rtrim($dataList, ", ")."]";
28	28
29	29	$script = <<<JS
30	30	$('.{$class}').typeahead({
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	}
47	47
48	48	foreach ($this->definedClasses as $class => $js) {
49		- $jsBlocks = $js . "\r\n\r\n";
	49	+ $jsBlocks = $js."\r\n\r\n";
50	50	}
51	51
52	52	$data = <<<HTML

		@@ -13,53 +13,53 @@
		block discarded – undo
13	13	*/
14	14	class DebugHelper
15	15	{
16		- /**
17		- * Internal mockable method wrapper for debug_backtrace.
18		- *
19		- * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
20		- * cascade until the runtime explodes.
21		- *
22		- * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
23		- *
24		- * @return array
25		- */
26		- public function get_debug_backtrace()
27		- {
28		- return debug_backtrace();
29		- }
	16	+ /**
	17	+ * Internal mockable method wrapper for debug_backtrace.
	18	+ *
	19	+ * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
	20	+ * cascade until the runtime explodes.
	21	+ *
	22	+ * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
	23	+ *
	24	+ * @return array
	25	+ */
	26	+ public function get_debug_backtrace()
	27	+ {
	28	+ return debug_backtrace();
	29	+ }
30	30
31		- /**
32		- * Returns a string representation of the current backtrace for display.
33		- *
34		- * Note that this explicitly excludes the top two frames, which will be methods from this class.
35		- *
36		- * @return string
37		- */
38		- public function getBacktrace()
39		- {
40		- $backtrace = $this->get_debug_backtrace();
	31	+ /**
	32	+ * Returns a string representation of the current backtrace for display.
	33	+ *
	34	+ * Note that this explicitly excludes the top two frames, which will be methods from this class.
	35	+ *
	36	+ * @return string
	37	+ */
	38	+ public function getBacktrace()
	39	+ {
	40	+ $backtrace = $this->get_debug_backtrace();
41	41
42		- $output = "";
	42	+ $output = "";
43	43
44		- $count = 0;
45		- foreach ($backtrace as $line) {
46		- if ($count <= 1) {
47		- $count++;
48		- continue;
49		- }
	44	+ $count = 0;
	45	+ foreach ($backtrace as $line) {
	46	+ if ($count <= 1) {
	47	+ $count++;
	48	+ continue;
	49	+ }
50	50
51		- $output .= "#{$count}: ";
	51	+ $output .= "#{$count}: ";
52	52
53		- if (isset($line['type']) && $line['type'] != "") {
54		- $output .= $line['class'] . $line['type'];
55		- }
	53	+ if (isset($line['type']) && $line['type'] != "") {
	54	+ $output .= $line['class'] . $line['type'];
	55	+ }
56	56
57		- $output .= $line['function'] . "(...)";
58		- $output .= " [{$line['file']}#{$line['line']}\r\n";
	57	+ $output .= $line['function'] . "(...)";
	58	+ $output .= " [{$line['file']}#{$line['line']}\r\n";
59	59
60		- $count++;
61		- }
	60	+ $count++;
	61	+ }
62	62
63		- return $output;
64		- }
	63	+ return $output;
	64	+ }
65	65	}

		@@ -13,91 +13,91 @@
		block discarded – undo
13	13
14	14	class BlacklistHelper implements IBlacklistHelper
15	15	{
16		- /** @var HttpHelper */
17		- private $httpHelper;
18		- /**
19		- * Cache of previously requested usernames
20		- * @var array
21		- */
22		- private $cache = array();
23		- /** @var string */
24		- private $mediawikiWebServiceEndpoint;
	16	+ /** @var HttpHelper */
	17	+ private $httpHelper;
	18	+ /**
	19	+ * Cache of previously requested usernames
	20	+ * @var array
	21	+ */
	22	+ private $cache = array();
	23	+ /** @var string */
	24	+ private $mediawikiWebServiceEndpoint;
25	25
26		- /**
27		- * BlacklistHelper constructor.
28		- *
29		- * @param HttpHelper $httpHelper
30		- * @param string $mediawikiWebServiceEndpoint
31		- */
32		- public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
33		- {
34		- $this->httpHelper = $httpHelper;
35		- $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
36		- }
	26	+ /**
	27	+ * BlacklistHelper constructor.
	28	+ *
	29	+ * @param HttpHelper $httpHelper
	30	+ * @param string $mediawikiWebServiceEndpoint
	31	+ */
	32	+ public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
	33	+ {
	34	+ $this->httpHelper = $httpHelper;
	35	+ $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
	36	+ }
37	37
38		- /**
39		- * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
40		- *
41		- * @param string $username
42		- *
43		- * @return false\|string False if the username is not blacklisted, else the blacklist entry.
44		- */
45		- public function isBlacklisted($username)
46		- {
47		- if (isset($this->cache[$username])) {
48		- $result = $this->cache[$username];
49		- if ($result === false) {
50		- return false;
51		- }
	38	+ /**
	39	+ * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
	40	+ *
	41	+ * @param string $username
	42	+ *
	43	+ * @return false\|string False if the username is not blacklisted, else the blacklist entry.
	44	+ */
	45	+ public function isBlacklisted($username)
	46	+ {
	47	+ if (isset($this->cache[$username])) {
	48	+ $result = $this->cache[$username];
	49	+ if ($result === false) {
	50	+ return false;
	51	+ }
52	52
53		- return $result['line'];
54		- }
	53	+ return $result['line'];
	54	+ }
55	55
56		- try {
57		- $result = $this->performWikiLookup($username);
58		- }
59		- catch (CurlException $ex) {
60		- // LOGME log this, but fail gracefully.
61		- return false;
62		- }
	56	+ try {
	57	+ $result = $this->performWikiLookup($username);
	58	+ }
	59	+ catch (CurlException $ex) {
	60	+ // LOGME log this, but fail gracefully.
	61	+ return false;
	62	+ }
63	63
64		- if ($result['result'] === 'ok') {
65		- // not blacklisted
66		- $this->cache[$username] = false;
	64	+ if ($result['result'] === 'ok') {
	65	+ // not blacklisted
	66	+ $this->cache[$username] = false;
67	67
68		- return false;
69		- }
70		- else {
71		- $this->cache[$username] = $result;
	68	+ return false;
	69	+ }
	70	+ else {
	71	+ $this->cache[$username] = $result;
72	72
73		- return $result['line'];
74		- }
75		- }
	73	+ return $result['line'];
	74	+ }
	75	+ }
76	76
77		- /**
78		- * Performs a fetch to MediaWiki for the relevant title blacklist entry
79		- *
80		- * @param string $username The username to look up
81		- *
82		- * @return array
83		- * @throws CurlException
84		- */
85		- private function performWikiLookup($username)
86		- {
87		- $endpoint = $this->mediawikiWebServiceEndpoint;
	77	+ /**
	78	+ * Performs a fetch to MediaWiki for the relevant title blacklist entry
	79	+ *
	80	+ * @param string $username The username to look up
	81	+ *
	82	+ * @return array
	83	+ * @throws CurlException
	84	+ */
	85	+ private function performWikiLookup($username)
	86	+ {
	87	+ $endpoint = $this->mediawikiWebServiceEndpoint;
88	88
89		- $parameters = array(
90		- 'action' => 'titleblacklist',
91		- 'format' => 'php',
92		- 'tbtitle' => $username,
93		- 'tbaction' => 'new-account',
94		- 'tbnooverride' => true,
95		- );
	89	+ $parameters = array(
	90	+ 'action' => 'titleblacklist',
	91	+ 'format' => 'php',
	92	+ 'tbtitle' => $username,
	93	+ 'tbaction' => 'new-account',
	94	+ 'tbnooverride' => true,
	95	+ );
96	96
97		- $apiResult = $this->httpHelper->get($endpoint, $parameters);
	97	+ $apiResult = $this->httpHelper->get($endpoint, $parameters);
98	98
99		- $data = unserialize($apiResult);
	99	+ $data = unserialize($apiResult);
100	100
101		- return $data['titleblacklist'];
102		- }
	101	+ return $data['titleblacklist'];
	102	+ }
103	103	}
104	104	\ No newline at end of file

		@@ -12,16 +12,16 @@
		block discarded – undo
12	12
13	13	class FakeBlacklistHelper implements IBlacklistHelper
14	14	{
15		- /**
16		- * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
17		- *
18		- * @param string $username
19		- *
20		- * @return bool
21		- */
22		- public function isBlacklisted($username)
23		- {
24		- // Short-circuit
25		- return false;
26		- }
	15	+ /**
	16	+ * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
	17	+ *
	18	+ * @param string $username
	19	+ *
	20	+ * @return bool
	21	+ */
	22	+ public function isBlacklisted($username)
	23	+ {
	24	+ // Short-circuit
	25	+ return false;
	26	+ }
27	27	}
28	28	\ No newline at end of file

		@@ -12,21 +12,21 @@
		block discarded – undo
12	12
13	13	class EmailHelper implements IEmailHelper
14	14	{
15		- /**
16		- * @param string $to
17		- * @param string $subject
18		- * @param string $content
19		- * @param array $headers Extra headers to include
20		- */
21		- public function sendMail($to, $subject, $content, $headers = array())
22		- {
23		- $headers['From'] = '[email protected]';
24		- $headerString = '';
	15	+ /**
	16	+ * @param string $to
	17	+ * @param string $subject
	18	+ * @param string $content
	19	+ * @param array $headers Extra headers to include
	20	+ */
	21	+ public function sendMail($to, $subject, $content, $headers = array())
	22	+ {
	23	+ $headers['From'] = '[email protected]';
	24	+ $headerString = '';
25	25
26		- foreach ($headers as $header => $headerValue) {
27		- $headerString .= $header . ': ' . $headerValue . "\r\n";
28		- }
	26	+ foreach ($headers as $header => $headerValue) {
	27	+ $headerString .= $header . ': ' . $headerValue . "\r\n";
	28	+ }
29	29
30		- mail($to, $subject, $content, $headerString);
31		- }
	30	+ mail($to, $subject, $content, $headerString);
	31	+ }
32	32	}
33	33	\ No newline at end of file

		@@ -24,7 +24,7 @@
		block discarded – undo
24	24	$headerString = '';
25	25
26	26	foreach ($headers as $header => $headerValue) {
27		- $headerString .= $header . ': ' . $headerValue . "\r\n";
	27	+ $headerString .= $header.': '.$headerValue."\r\n";
28	28	}
29	29
30	30	mail($to, $subject, $content, $headerString);

		@@ -12,30 +12,30 @@
		block discarded – undo
12	12
13	13	interface IBanHelper
14	14	{
15		- /**
16		- * Summary of nameIsBanned
17		- *
18		- * @param string $name The name to test if is banned.
19		- *
20		- * @return Ban
21		- */
22		- public function nameIsBanned($name);
	15	+ /**
	16	+ * Summary of nameIsBanned
	17	+ *
	18	+ * @param string $name The name to test if is banned.
	19	+ *
	20	+ * @return Ban
	21	+ */
	22	+ public function nameIsBanned($name);
23	23
24		- /**
25		- * Summary of emailIsBanned
26		- *
27		- * @param string $email
28		- *
29		- * @return Ban
30		- */
31		- public function emailIsBanned($email);
	24	+ /**
	25	+ * Summary of emailIsBanned
	26	+ *
	27	+ * @param string $email
	28	+ *
	29	+ * @return Ban
	30	+ */
	31	+ public function emailIsBanned($email);
32	32
33		- /**
34		- * Summary of ipIsBanned
35		- *
36		- * @param string $ip
37		- *
38		- * @return Ban
39		- */
40		- public function ipIsBanned($ip);
	33	+ /**
	34	+ * Summary of ipIsBanned
	35	+ *
	36	+ * @param string $ip
	37	+ *
	38	+ * @return Ban
	39	+ */
	40	+ public function ipIsBanned($ip);
41	41	}

		@@ -17,15 +17,15 @@
		block discarded – undo
17	17	*/
18	18	interface IEmailHelper
19	19	{
20		- /**
21		- * Sends an email to the specified email address.
22		- *
23		- * @param string $to
24		- * @param string $subject
25		- * @param string $content
26		- * @param array $headers Extra headers to include
27		- *
28		- * @return void
29		- */
30		- public function sendMail($to, $subject, $content, $headers = array());
	20	+ /**
	21	+ * Sends an email to the specified email address.
	22	+ *
	23	+ * @param string $to
	24	+ * @param string $subject
	25	+ * @param string $content
	26	+ * @param array $headers Extra headers to include
	27	+ *
	28	+ * @return void
	29	+ */
	30	+ public function sendMail($to, $subject, $content, $headers = array());
31	31	}
32	32	\ No newline at end of file

		@@ -10,12 +10,12 @@
		block discarded – undo
10	10
11	11	interface IBlacklistHelper
12	12	{
13		- /**
14		- * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
15		- *
16		- * @param string $username
17		- *
18		- * @return bool
19		- */
20		- public function isBlacklisted($username);
	13	+ /**
	14	+ * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
	15	+ *
	16	+ * @param string $username
	17	+ *
	18	+ * @return bool
	19	+ */
	20	+ public function isBlacklisted($username);
21	21	}
22	22	\ No newline at end of file

		@@ -10,16 +10,16 @@
		block discarded – undo
10	10
11	11	interface ITypeAheadHelper
12	12	{
13		- /**
14		- * @param string $class CSS class to apply this typeahead to.
15		- * @param callable $generator Generator function taking no arguments to return an array of strings.
16		- *
17		- * @return void
18		- */
19		- public function defineTypeAheadSource($class, callable $generator);
	13	+ /**
	14	+ * @param string $class CSS class to apply this typeahead to.
	15	+ * @param callable $generator Generator function taking no arguments to return an array of strings.
	16	+ *
	17	+ * @return void
	18	+ */
	19	+ public function defineTypeAheadSource($class, callable $generator);
20	20
21		- /**
22		- * @return string HTML fragment containing a JS block for typeaheads.
23		- */
24		- public function getTypeAheadScriptBlock();
	21	+ /**
	22	+ * @return string HTML fragment containing a JS block for typeaheads.
	23	+ */
	24	+ public function getTypeAheadScriptBlock();
25	25	}
26	26	\ No newline at end of file

enwikipedia-acc / waca

Pull Request — newinternal-bugfixing (#286)

Status

Category

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +41 added lines, -41 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch