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;
 		}
 

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;");
 		}

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

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");

acc.php

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');

functions.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
  */
 function isHttps() {
 	if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-		if($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+		if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			// Client <=> Proxy is encrypted
 			return true;
 		}
@@ -61,12 +61,12 @@ 
 	}
 
 	if (isset($_SERVER['HTTPS'])) {
-		if($_SERVER['HTTPS'] === 'off') {
+		if ($_SERVER['HTTPS'] === 'off') {
 			// ISAPI on IIS breaks the spec. :(
 			return false;
 		}
 
-		if($_SERVER['HTTPS'] !== '') {
+		if ($_SERVER['HTTPS'] !== '') {
 			// Set to a non-empty value
 			return true;
 		}

includes/DataObject.php

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 	 */
 	public static function getById($id, PdoDatabase $database)
 	{
-		if( isset( self::$getByIdResults[strtolower(get_called_class())][$id] ) ) return self::$getByIdResults[strtolower(get_called_class())][$id];
-		if( !isset( self::$getByIdStatement[strtolower(get_called_class())] ) ) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+		if (isset(self::$getByIdResults[strtolower(get_called_class())][$id])) return self::$getByIdResults[strtolower(get_called_class())][$id];
+		if (!isset(self::$getByIdStatement[strtolower(get_called_class())])) self::$getByIdStatement[strtolower(get_called_class())] = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
 		self::$getByIdStatement[strtolower(get_called_class())]->bindValue(":id", $id);
 
 		self::$getByIdStatement[strtolower(get_called_class())]->execute();