enwikipedia-acc / waca

includes/DataObjects/Comment.php

Doc Comments +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 
 	/**
 	 * Summary of getUserObject
-	 * @return User|null
+	 * @return DataObject|null
 	 */
 	public function getUserObject()
 	{
@@ -126,7 +126,7 @@ 
 
 	/**
 	 * Summary of getRequestObject
-	 * @return Request|null
+	 * @return DataObject|null
 	 */
 	public function getRequestObject()
 	{

includes/DataObjects/Log.php

Doc Comments +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	
 	/**
 	 * Summary of getUserObject
-	 * @return User|null
+	 * @return DataObject|null
 	 */
 	public function getUserObject()
 	{
@@ -94,7 +94,7 @@ 
 
 	/**
 	 * Summary of setUser
-	 * @param int|User $user 
+	 * @param User $user 
 	 */
 	public function setUser($user)
 	{

includes/DataObjects/User.php

Spacing +5 added lines, -5 removed lines

@@ -131,7 +131,7 @@ 
 			$user->setDatabase($database); 
 
 			// Using cached data here!
-			if($user->getOAuthOnWikiName(true) == $username) {
+			if ($user->getOAuthOnWikiName(true) == $username) {
 				// Success.
 				return $user;
 			}
@@ -144,7 +144,7 @@ 
 			$user->setDatabase($database); 
 
 			// Don't use the cached data, but instead query the API.
-			if($user->getOAuthOnWikiName(false) == $username) {
+			if ($user->getOAuthOnWikiName(false) == $username) {
 				// Success.
 				return $user;
 			}
@@ -202,7 +202,7 @@ 
 			$u->setDatabase($database);
 			$u->isNew = false;
 
-			if(! $u->isCheckuser()) {
+			if (!$u->isCheckuser()) {
 				continue;
 			}
 
@@ -690,7 +690,7 @@ 
 			$this->identityCache->aud == $oauthConsumerToken &&
 			$this->identityCache->iss == $oauthMediaWikiCanonicalServer
 			) {
-			if(
+			if (
 				$useCached || (
 					DateTime::createFromFormat("U", $this->identityCache->iat) < new DateTime() &&
 					DateTime::createFromFormat("U", $this->identityCache->exp) > new DateTime()
@@ -714,7 +714,7 @@ 
 	private function getOAuthOnWikiName($useCached = false)
 	{
 		$identity = $this->getOAuthIdentity($useCached);
-		if($identity !== null) {
+		if ($identity !== null) {
 			return $identity->username;
 		}
 

Braces +4 added lines, -2 removed lines

@@ -822,11 +822,13 @@
     
 	#endregion
     
-	public function getForgottenPasswordHash() {
+	public function getForgottenPasswordHash()
+	{
 		return md5($this->username . $this->email . $this->welcome_template . $this->id . $this->password);
 	}
 
-	public function getApprovalDate() {
+	public function getApprovalDate()
+	{
 		$query = $this->dbObject->prepare(<<<SQL
 			SELECT timestamp 
 			FROM log 

includes/Helpers/Logger.php

Braces +1 added lines, -2 removed lines

@@ -425,8 +425,7 @@
 			);
 		
 		$statement = $database->query("SELECT CONCAT('Closed ', id) as k, CONCAT('closed (',name,')') as v FROM emailtemplate;");
-		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row)
-		{
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
 			$lookup[$row['k']] = $row['v'];
 		}
 		

queryBrowser.php

Indentation +12 added lines, -12 removed lines

@@ -22,20 +22,20 @@
 	 */
 	public $numberedList = false;
 	
-    /**
-     * @var string
-     */
-    public $numberedListTitle = "#";
+	/**
+	 * @var string
+	 */
+	public $numberedListTitle = "#";
 	
-    /**
-     * @var boolean|callable
-     */
-    public $tableCallbackFunction = false;
+	/**
+	 * @var boolean|callable
+	 */
+	public $tableCallbackFunction = false;
 	
-    /**
-     * @var boolean|string[]
-     */
-    public $overrideTableTitles = false;
+	/**
+	 * @var boolean|string[]
+	 */
+	public $overrideTableTitles = false;
 
 	/**
 	 * @var int

includes/DataObjects/EmailTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
 
-		if($defaultAction === false) {
+		if ($defaultAction === false) {
 			$statement = $database->prepare(
 				"SELECT * FROM `emailtemplate` WHERE defaultaction not in ('created', 'not created') AND active = 1;");
 		}

acc.php

Braces +2 added lines, -2 removed lines

@@ -1281,7 +1281,7 @@ 
 		if ($_POST['action'] == EmailTemplate::CREATED || $_POST['action'] == EmailTemplate::NOT_CREATED) {
 			$request->setStatus('Closed');
 
-			if($_POST['action'] == EmailTemplate::CREATED){
+			if($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
 			}
@@ -1331,7 +1331,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();		
 	}
-	else{
+	else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');

Spacing +4 added lines, -4 removed lines

@@ -1218,7 +1218,7 @@ 
 	if ($gem == 1 && !$exists && !isset($_GET['createoverride'])) {
 		$alertContent = "<p>You have chosen to mark this request as \"created\", but the account does not exist on the English Wikipedia, proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] ."&amp;createoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&amp;createoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1286,7 +1286,7 @@ 
 		if ($_POST['action'] == EmailTemplate::CREATED || $_POST['action'] == EmailTemplate::NOT_CREATED) {
 			$request->setStatus('Closed');
 
-			if($_POST['action'] == EmailTemplate::CREATED){
+			if ($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
 			}
@@ -1311,7 +1311,7 @@ 
 			BootstrapSkin::displayAlertBox("Sent mail to Request {$request->getId()}", 
 				"alert-success");
 		}
-		else if(array_key_exists($_POST['action'], $availableRequestStates) ) {
+		else if (array_key_exists($_POST['action'], $availableRequestStates)) {
 			// Defer
 
 			$request->setStatus($_POST['action']);
@@ -1345,7 +1345,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();		
 	}
-	else{
+	else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');

includes/strings.php

Doc Comments +2 added lines

@@ -35,6 +35,7 @@ 
 	/**
 	 * Formats a string to be used as a username.
 	 * @deprecated StringFunctions class
+	 * @param string $username
 	 */
 	public function struname($username)
 	{
@@ -50,6 +51,7 @@ 
 	 * from the beginning/end of the Email, as well as immediately before/after
 	 * the @ in the Email).
 	 * @deprecated StringFunctions class
+	 * @param string $email
 	 */
 	public function stremail($email)
 	{

tests/includes/IrcColourCodeTest.php

Indentation +52 added lines, -52 removed lines

@@ -2,7 +2,7 @@ 
 
 class IrcColourCodeTest extends PHPUnit_Framework_TestCase
 {
-    private $irc;
+	private $irc;
 
 	public function setUp()
 	{
@@ -11,62 +11,62 @@ 
 	}
 
 	public function tearDown() {
-        $this->irc = NULL;
-    }
+		$this->irc = NULL;
+	}
 
-    public function test_colorCodes() {
+	public function test_colorCodes() {
 
-        $i = $this->irc;
+		$i = $this->irc;
 
-        $this->assertEquals($i::BOLD,"\x02");
-        $this->assertEquals($i::ITALIC, "\x09");
-        $this->assertEquals($i::STRIKE, "\x13");
-        $this->assertEquals($i::UNDERLINE, "\x15");
-        $this->assertEquals($i::UNDERLINE2, "\x1f");
-        $this->assertEquals($i::REVERSE, "\x16");
-        $this->assertEquals($i::RESET, "\x0f");
+		$this->assertEquals($i::BOLD,"\x02");
+		$this->assertEquals($i::ITALIC, "\x09");
+		$this->assertEquals($i::STRIKE, "\x13");
+		$this->assertEquals($i::UNDERLINE, "\x15");
+		$this->assertEquals($i::UNDERLINE2, "\x1f");
+		$this->assertEquals($i::REVERSE, "\x16");
+		$this->assertEquals($i::RESET, "\x0f");
 
-        $this->assertEquals($i::WHITE, "\x0300");
-        $this->assertEquals($i::BLACK, "\x0301");
-        $this->assertEquals($i::DARK_BLUE, "\x0302");
-        $this->assertEquals($i::DARK_GREEN, "\x0303");
-        $this->assertEquals($i::RED, "\x0304");
-        $this->assertEquals($i::DARK_RED, "\x0305");
-        $this->assertEquals($i::DARK_VIOLET, "\x0306");
-        $this->assertEquals($i::ORANGE, "\x0307");
-        $this->assertEquals($i::YELLOW, "\x0308");
-        $this->assertEquals($i::LIGHT_GREEN, "\x0309");
-        $this->assertEquals($i::CYAN, "\x0310");
-        $this->assertEquals($i::LIGHT_CYAN, "\x0311");
-        $this->assertEquals($i::BLUE, "\x0312");
-        $this->assertEquals($i::VIOLET, "\x0313");
-        $this->assertEquals($i::DARK_GREY, "\x0314");
-        $this->assertEquals($i::LIGHT_GREY, "\x0315");
+		$this->assertEquals($i::WHITE, "\x0300");
+		$this->assertEquals($i::BLACK, "\x0301");
+		$this->assertEquals($i::DARK_BLUE, "\x0302");
+		$this->assertEquals($i::DARK_GREEN, "\x0303");
+		$this->assertEquals($i::RED, "\x0304");
+		$this->assertEquals($i::DARK_RED, "\x0305");
+		$this->assertEquals($i::DARK_VIOLET, "\x0306");
+		$this->assertEquals($i::ORANGE, "\x0307");
+		$this->assertEquals($i::YELLOW, "\x0308");
+		$this->assertEquals($i::LIGHT_GREEN, "\x0309");
+		$this->assertEquals($i::CYAN, "\x0310");
+		$this->assertEquals($i::LIGHT_CYAN, "\x0311");
+		$this->assertEquals($i::BLUE, "\x0312");
+		$this->assertEquals($i::VIOLET, "\x0313");
+		$this->assertEquals($i::DARK_GREY, "\x0314");
+		$this->assertEquals($i::LIGHT_GREY, "\x0315");
 
-        $this->assertNotEquals($i::BOLD,"\x021");
-        $this->assertNotEquals($i::ITALIC, "\x091");
-        $this->assertNotEquals($i::STRIKE, "\x131");
-        $this->assertNotEquals($i::UNDERLINE, "\x151");
-        $this->assertNotEquals($i::UNDERLINE2, "\x1f1");
-        $this->assertNotEquals($i::REVERSE, "\x161");
-        $this->assertNotEquals($i::RESET, "\x0f1");
+		$this->assertNotEquals($i::BOLD,"\x021");
+		$this->assertNotEquals($i::ITALIC, "\x091");
+		$this->assertNotEquals($i::STRIKE, "\x131");
+		$this->assertNotEquals($i::UNDERLINE, "\x151");
+		$this->assertNotEquals($i::UNDERLINE2, "\x1f1");
+		$this->assertNotEquals($i::REVERSE, "\x161");
+		$this->assertNotEquals($i::RESET, "\x0f1");
 
-        $this->assertNotEquals($i::WHITE, "\x03001");
-        $this->assertNotEquals($i::BLACK, "\x03011");
-        $this->assertNotEquals($i::DARK_BLUE, "\x03021");
-        $this->assertNotEquals($i::DARK_GREEN, "\x03031");
-        $this->assertNotEquals($i::RED, "\x03041");
-        $this->assertNotEquals($i::DARK_RED, "\x03051");
-        $this->assertNotEquals($i::DARK_VIOLET, "\x03061");
-        $this->assertNotEquals($i::ORANGE, "\x03071");
-        $this->assertNotEquals($i::YELLOW, "\x03081");
-        $this->assertNotEquals($i::LIGHT_GREEN, "\x03091");
-        $this->assertNotEquals($i::CYAN, "\x03101");
-        $this->assertNotEquals($i::LIGHT_CYAN, "\x03111");
-        $this->assertNotEquals($i::BLUE, "\x03121");
-        $this->assertNotEquals($i::VIOLET, "\x03131");
-        $this->assertNotEquals($i::DARK_GREY, "\x03141");
-        $this->assertNotEquals($i::LIGHT_GREY, "\x03151");
-    }
+		$this->assertNotEquals($i::WHITE, "\x03001");
+		$this->assertNotEquals($i::BLACK, "\x03011");
+		$this->assertNotEquals($i::DARK_BLUE, "\x03021");
+		$this->assertNotEquals($i::DARK_GREEN, "\x03031");
+		$this->assertNotEquals($i::RED, "\x03041");
+		$this->assertNotEquals($i::DARK_RED, "\x03051");
+		$this->assertNotEquals($i::DARK_VIOLET, "\x03061");
+		$this->assertNotEquals($i::ORANGE, "\x03071");
+		$this->assertNotEquals($i::YELLOW, "\x03081");
+		$this->assertNotEquals($i::LIGHT_GREEN, "\x03091");
+		$this->assertNotEquals($i::CYAN, "\x03101");
+		$this->assertNotEquals($i::LIGHT_CYAN, "\x03111");
+		$this->assertNotEquals($i::BLUE, "\x03121");
+		$this->assertNotEquals($i::VIOLET, "\x03131");
+		$this->assertNotEquals($i::DARK_GREY, "\x03141");
+		$this->assertNotEquals($i::LIGHT_GREY, "\x03151");
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
         $i = $this->irc;
 
-        $this->assertEquals($i::BOLD,"\x02");
+        $this->assertEquals($i::BOLD, "\x02");
         $this->assertEquals($i::ITALIC, "\x09");
         $this->assertEquals($i::STRIKE, "\x13");
         $this->assertEquals($i::UNDERLINE, "\x15");
@@ -43,7 +43,7 @@ 
         $this->assertEquals($i::DARK_GREY, "\x0314");
         $this->assertEquals($i::LIGHT_GREY, "\x0315");
 
-        $this->assertNotEquals($i::BOLD,"\x021");
+        $this->assertNotEquals($i::BOLD, "\x021");
         $this->assertNotEquals($i::ITALIC, "\x091");
         $this->assertNotEquals($i::STRIKE, "\x131");
         $this->assertNotEquals($i::UNDERLINE, "\x151");

Braces +4 added lines, -2 removed lines

@@ -10,11 +10,13 @@
 		$this->irc = new IrcColourCode();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->irc = NULL;
     }
 
-    public function test_colorCodes() {
+    public function test_colorCodes()
+    {
 
         $i = $this->irc;
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	}
 
 	public function tearDown() {
-        $this->irc = NULL;
+        $this->irc = null;
     }
 
     public function test_colorCodes() {