enwikipedia-acc / waca

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

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

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

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

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) . "\", ";

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

includes/DataObjects/Request.php

Braces +3 added lines, -1 removed lines

@@ -271,7 +271,9 @@
 			return true;
 		}
 
-		if (is_null(self::$commentsQuery)) self::$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) as num FROM comment where request = :id;");
+		if (is_null(self::$commentsQuery)) {
+			self::$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) as num FROM comment where request = :id;");
+		}
 		self::$commentsQuery->bindValue(":id", $this->id);
 
 		self::$commentsQuery->execute();

Indentation +2 added lines, -2 removed lines

@@ -261,8 +261,8 @@
 		}
         
 		if (isset(self::$commentsResults[$this->id])) {
-		    $this->hasCommentsResolved = true;
-		    return $this->hasComments = self::$commentsResults[$this->id];
+			$this->hasCommentsResolved = true;
+			return $this->hasComments = self::$commentsResults[$this->id];
 		}
 
 		if ($this->comment != "") {

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

Braces +6 added lines, -2 removed lines

@@ -44,8 +44,12 @@
 	 */
 	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();