enwikipedia-acc / waca

includes/DataObjects/User.php

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

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

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

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;
 

tests/includes/StringFunctionsTest.php

Indentation +34 added lines, -34 removed lines

@@ -2,7 +2,7 @@ 
 
 class StringFunctionsTest extends PHPUnit_Framework_TestCase
 {
-    private $e;
+	private $e;
 
 	public function setUp()
 	{
@@ -11,38 +11,38 @@ 
 	}
 
 	public function tearDown() {
-        $this->e = NULL;
-    }
-
-    public function test_formatAsUsername() {
-        // Happy path
-        $this->assertEquals($this->e->formatAsUsername("this"), "This");
-        $this->assertEquals($this->e->formatAsUsername("1this"), "1this");
-        $this->assertEquals($this->e->formatAsUsername("This"), "This");
-        $this->assertEquals($this->e->formatAsUsername("This "), "This");
-        $this->assertEquals($this->e->formatAsUsername("This_"), "This");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->formatAsUsername("This "), "This ");
-        $this->assertNotEquals($this->e->formatAsUsername("This_"), "This_");
-        $this->assertNotEquals($this->e->formatAsUsername("this"), "this");
-        $this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
-    }
-
-    public function test_formatAsEmail() {
-        $this->assertEquals($this->e->formatAsEmail("this@example.com"), "this@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345@example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail(" 1this12345@example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@example.com");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->formatAsEmail(" 1this12345@example.com"), " 1this12345@example.com");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com ");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345 @example.com");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@ example.com");
-
-    }
+		$this->e = NULL;
+	}
+
+	public function test_formatAsUsername() {
+		// Happy path
+		$this->assertEquals($this->e->formatAsUsername("this"), "This");
+		$this->assertEquals($this->e->formatAsUsername("1this"), "1this");
+		$this->assertEquals($this->e->formatAsUsername("This"), "This");
+		$this->assertEquals($this->e->formatAsUsername("This "), "This");
+		$this->assertEquals($this->e->formatAsUsername("This_"), "This");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->formatAsUsername("This "), "This ");
+		$this->assertNotEquals($this->e->formatAsUsername("This_"), "This_");
+		$this->assertNotEquals($this->e->formatAsUsername("this"), "this");
+		$this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
+	}
+
+	public function test_formatAsEmail() {
+		$this->assertEquals($this->e->formatAsEmail("this@example.com"), "this@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345@example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail(" 1this12345@example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@example.com");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->formatAsEmail(" 1this12345@example.com"), " 1this12345@example.com");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com ");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345 @example.com");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@ example.com");
+
+	}
 
 }

Braces +6 added lines, -3 removed lines

@@ -10,11 +10,13 @@ 
 		$this->e = new StringFunctions();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->e = NULL;
     }
 
-    public function test_formatAsUsername() {
+    public function test_formatAsUsername()
+    {
         // Happy path
         $this->assertEquals($this->e->formatAsUsername("this"), "This");
         $this->assertEquals($this->e->formatAsUsername("1this"), "1this");
@@ -29,7 +31,8 @@ 
         $this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
     }
 
-    public function test_formatAsEmail() {
+    public function test_formatAsEmail()
+    {
         $this->assertEquals($this->e->formatAsEmail("this@example.com"), "this@example.com");
         $this->assertEquals($this->e->formatAsEmail("1this12345@example.com"), "1this12345@example.com");
         $this->assertEquals($this->e->formatAsEmail(" 1this12345@example.com"), "1this12345@example.com");

tests/includes/stringsTest.php

Indentation +34 added lines, -34 removed lines

@@ -2,7 +2,7 @@ 
 
 class stringsTest extends PHPUnit_Framework_TestCase
 {
-    private $e;
+	private $e;
 
 	public function setUp()
 	{
@@ -11,38 +11,38 @@ 
 	}
 
 	public function tearDown() {
-        $this->e = NULL;
-    }
-
-    public function test_struname() {
-        // Happy path
-        $this->assertEquals($this->e->struname("this"), "This");
-        $this->assertEquals($this->e->struname("1this"), "1this");
-        $this->assertEquals($this->e->struname("This"), "This");
-        $this->assertEquals($this->e->struname("This "), "This");
-        $this->assertEquals($this->e->struname("This_"), "This");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->struname("This "), "This ");
-        $this->assertNotEquals($this->e->struname("This_"), "This_");
-        $this->assertNotEquals($this->e->struname("this"), "this");
-        $this->assertNotEquals($this->e->struname("1this"), "1This");
-    }
-
-    public function test_stremail() {
-        $this->assertEquals($this->e->stremail("this@example.com"), "this@example.com");
-        $this->assertEquals($this->e->stremail("1this12345@example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail(" 1this12345@example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail("1this12345 @example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail("1this12345@ example.com"), "1this12345@example.com");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->stremail(" 1this12345@example.com"), " 1this12345@example.com");
-        $this->assertNotEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com ");
-        $this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com");
-        $this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com");
-
-    }
+		$this->e = NULL;
+	}
+
+	public function test_struname() {
+		// Happy path
+		$this->assertEquals($this->e->struname("this"), "This");
+		$this->assertEquals($this->e->struname("1this"), "1this");
+		$this->assertEquals($this->e->struname("This"), "This");
+		$this->assertEquals($this->e->struname("This "), "This");
+		$this->assertEquals($this->e->struname("This_"), "This");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->struname("This "), "This ");
+		$this->assertNotEquals($this->e->struname("This_"), "This_");
+		$this->assertNotEquals($this->e->struname("this"), "this");
+		$this->assertNotEquals($this->e->struname("1this"), "1This");
+	}
+
+	public function test_stremail() {
+		$this->assertEquals($this->e->stremail("this@example.com"), "this@example.com");
+		$this->assertEquals($this->e->stremail("1this12345@example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail(" 1this12345@example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail("1this12345 @example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail("1this12345@ example.com"), "1this12345@example.com");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->stremail(" 1this12345@example.com"), " 1this12345@example.com");
+		$this->assertNotEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com ");
+		$this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com");
+		$this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com");
+
+	}
 
 }

Braces +6 added lines, -3 removed lines

@@ -10,11 +10,13 @@ 
 		$this->e = new strings();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->e = NULL;
     }
 
-    public function test_struname() {
+    public function test_struname()
+    {
         // Happy path
         $this->assertEquals($this->e->struname("this"), "This");
         $this->assertEquals($this->e->struname("1this"), "1this");
@@ -29,7 +31,8 @@ 
         $this->assertNotEquals($this->e->struname("1this"), "1This");
     }
 
-    public function test_stremail() {
+    public function test_stremail()
+    {
         $this->assertEquals($this->e->stremail("this@example.com"), "this@example.com");
         $this->assertEquals($this->e->stremail("1this12345@example.com"), "1this12345@example.com");
         $this->assertEquals($this->e->stremail(" 1this12345@example.com"), "1this12345@example.com");

includes/DataObjects/Notification.php

Braces +4 added lines, -2 removed lines

@@ -330,7 +330,8 @@ 
 	 * Summary of sentMail
 	 * @param Request $request
 	 */
-	public static function sentMail(Request $request) {
+	public static function sentMail(Request $request)
+	{
 		self::send(User::getCurrent()->getUsername() 
 			. " sent an email related to Request {$request->getId()} ({$request->getName()})");
 	}
@@ -371,7 +372,8 @@ 
 	 * @param Request $request
 	 * @param User $target
 	 */
-	public static function requestReservationSent(Request $request, User $target) {
+	public static function requestReservationSent(Request $request, User $target)
+	{
 		self::send(
 			"Reservation of request {$request->getId()} ({$request->getName()}) sent to {$target->getUsername()} by " 
 			. User::getCurrent()->getUsername());

functions.php

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
  * Returns a value indicating whether the current request was issued over HTTPSs
  * @return bool true if HTTPS
  */
-function isHttps() {
+function isHttps()
+{
 	if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
 		if($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			// Client <=> Proxy is encrypted
@@ -399,7 +400,8 @@ 
  * @param $users string[] Array of usernames as strings
  * @return string
  */
-function getTypeaheadSource($users) {
+function getTypeaheadSource($users)
+{
 	$userList = "";
 	foreach ($users as $v) {
 		$userList .= "\"" . htmlentities($v) . "\", ";