ankitjain28may / openchat

views/validate_login.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Login;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
     $loginField = json_decode($_POST['q']);
     $login = $loginField->login;
@@ -14,7 +14,7 @@ 
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
+    if (isset($result))
         echo $result;
     else
         echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -14,8 +14,9 @@
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
-        echo $result;
-    else
-        echo json_encode([]);
-}
\ No newline at end of file
+    if(isset($result)) {
+            echo $result;
+    } else {
+            echo json_encode([]);
+    }
+    }
\ No newline at end of file

views/validate_register.php

Indentation +19 added lines, -19 removed lines

@@ -5,25 +5,25 @@
 
 if(isset($_POST['q']))
 {
-	$registerField = json_decode($_POST['q']);
-	$name = $registerField->name;
-	$email = $registerField->email;
-	$username = $registerField->username;
-	$mob = $registerField->mob;
-	$password = $registerField->password;
-	$obRegister = new Register();
-	$data = array(
-		'name' => $name,
-		'email' => $email,
-		'username' => $username,
-		'passRegister' => $password,
-		'mob' => $mob
-	);
-	$result = $obRegister->authRegister($data);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $registerField = json_decode($_POST['q']);
+    $name = $registerField->name;
+    $email = $registerField->email;
+    $username = $registerField->username;
+    $mob = $registerField->mob;
+    $password = $registerField->password;
+    $obRegister = new Register();
+    $data = array(
+        'name' => $name,
+        'email' => $email,
+        'username' => $username,
+        'passRegister' => $password,
+        'mob' => $mob
+    );
+    $result = $obRegister->authRegister($data);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 
 

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Register;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$registerField = json_decode($_POST['q']);
 	$name = $registerField->name;
@@ -20,7 +20,7 @@ 
 		'mob' => $mob
 	);
 	$result = $obRegister->authRegister($data);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -20,11 +20,12 @@
 		'mob' => $mob
 	);
 	$result = $obRegister->authRegister($data);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
 
 
 

views/message.php

Indentation +1 added lines, -1 removed lines

@@ -175,6 +175,6 @@
 <?php
 }
 else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+    header('Location:'. getenv('APP_URL')."/index.php");
 }
 ?>

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();
 
-if(Session::get('start') != null && empty($_GET['user']))
+if (Session::get('start') != null && empty($_GET['user']))
 {
 
 ?>
@@ -174,7 +174,7 @@ 
 
 <?php
 }
-else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+else {
+  header('Location:'.getenv('APP_URL')."/index.php");
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -168,8 +168,7 @@
 </html>
 
 <?php
-}
-else{
+} else{
   header('Location:'. getenv('APP_URL')."/index.php");
 }
 ?>

tests/TestUser.php

Indentation +54 added lines, -54 removed lines

@@ -51,9 +51,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with empty username
-    */
+     * @depends test_authRegister
+     *  Testing for the register with empty username
+     */
     public function test_authregisterEmptyUsername()
     {
         $output = $this->obRegister->authregister(
@@ -77,9 +77,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with invalid email credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the register with invalid email credentials
+     */
     public function test_authregisterInvalidEmail()
     {
         $output = $this->obRegister->authregister(
@@ -103,9 +103,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with repeated credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the register with repeated credentials
+     */
     public function test_authregisterInvalidCredentials()
     {
         $output = $this->obRegister->authregister(
@@ -137,9 +137,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with correct credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with correct credentials
+     */
 
     public function test_authLogin()
     {
@@ -163,9 +163,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with empty credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with empty credentials
+     */
 
     public function test_authLoginEmptyValues()
     {
@@ -191,9 +191,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid or wrong email
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid or wrong email
+     */
 
     public function test_authLoginWrongEmail()
     {
@@ -215,9 +215,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid email credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid email credentials
+     */
     public function test_authLoginInvalidUsernameEmail()
     {
         $output = $this->obLogin->authLogin(
@@ -238,9 +238,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid password credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid password credentials
+     */
     public function test_authLoginInvalidPassword()
     {
         $output = $this->obLogin->authLogin(
@@ -260,9 +260,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Profile::class with valid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the Profile::class with valid login_id
+     */
     public function test_getProfile()
     {
         $output = Profile::getProfile(1);
@@ -275,9 +275,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Profile::class with invalid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the Profile::class with invalid login_id
+     */
     public function test_getProfileInvalidID()
     {
         $output = Profile::getProfile(0);
@@ -285,9 +285,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the User::class with valid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the User::class with valid login_id
+     */
     public function test_userDetails()
     {
         $expectedOutput = [
@@ -306,9 +306,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the User::class with invalid data
-    */
+     * @depends test_authRegister
+     *  Testing for the User::class with invalid data
+     */
     public function test_userDetailsInvalidID()
     {
         $output = $this->obUser->userDetails(0, True);
@@ -316,9 +316,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for email
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for email
+     */
     public function test_validateEmailInDb()
     {
         $output = $this->obValidate->validateEmailInDb('test@testing.com');
@@ -326,9 +326,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for username
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for username
+     */
     public function test_validateUsernameInDb()
     {
         $output = $this->obValidate->validateUsernameInDb('test');
@@ -336,9 +336,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for non-existing username
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for non-existing username
+     */
     public function test_validateUsernameInDbNot()
     {
         $output = $this->obValidate->validateUsernameInDb('abc');
@@ -346,9 +346,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for non-existing email
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for non-existing email
+     */
     public function test_validateEmailInDbNot()
     {
         $output = $this->obValidate->validateEmailInDb('ankitjain28may77@gmail.com');
@@ -356,9 +356,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Online::class
-    */
+     * @depends test_authRegister
+     *  Testing for the Online::class
+     */
     public function test_Online()
     {
         Online::setOnlineStatus(1);
@@ -373,9 +373,9 @@ 
 
 
     /**
-    *   @depends test_Online
-    *  Empty the DB
-    */
+     *   @depends test_Online
+     *  Empty the DB
+     */
     public function test_EmptyDB()
     {
         $connect = mysqli_connect(

tests/TestAll.php

Indentation +20 added lines, -20 removed lines

@@ -50,9 +50,9 @@ 
     }
 
     /**
-    * @depends testAuthRegister
-    *  Register User2
-    */
+     * @depends testAuthRegister
+     *  Register User2
+     */
     public function testAuthRegister2()
     {
         $output = $this->obRegister->authRegister(
@@ -77,9 +77,9 @@ 
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for the register with empty username
-    */
+     * @depends testAuthRegister2
+     *  Testing for the register with empty username
+     */
     public function testCompose()
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -134,9 +134,9 @@ 
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Search Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Search Class
+     */
     public function testSearch($userId)
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -178,9 +178,9 @@ 
 
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Reply Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Reply Class
+     */
     public function testReply($userId)
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -236,9 +236,9 @@ 
 
 
     /**
-    * @depends testReply
-    *  Testing for Search Class
-    */
+     * @depends testReply
+     *  Testing for Search Class
+     */
     public function testSearchWithTotalMessages()
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -264,8 +264,8 @@ 
     }
 
     /**
-    *  Testing for Search Class
-    */
+     *  Testing for Search Class
+     */
     public function testSidebar()
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -294,9 +294,9 @@ 
 
 
     /**
-    *   @depends testSidebar
-    *  Empty the DB
-    */
+     *   @depends testSidebar
+     *  Empty the DB
+     */
     public function test_EmptyDB()
     {
         $connect = mysqli_connect(

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use ChatApp\Reply;
 use ChatApp\Session;
 use ChatApp\SideBar;
-
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();

Spacing +5 added lines, -5 removed lines

@@ -190,12 +190,12 @@ 
                 "passLogin" => 'testing'
             ]
         );
-        $outputEmail = (array) json_decode($outputEmail);
+        $outputEmail = (array)json_decode($outputEmail);
         $this->assertEquals($expectedOutput, $outputEmail);
         $currentId = Session::get('start');
         Session::forget('start');
 
-        $msg =(object) [
+        $msg = (object)[
             "name" => $userId,
             "reply" => "Hello World",
             "userId" => $currentId
@@ -205,7 +205,7 @@ 
         $output = $obReply->replyTo($msg);
         $this->assertEquals("Messages is sent", $output);
 
-        $msg =(object) [
+        $msg = (object)[
             "name" => $currentId,
             "reply" => "Hello World",
             "userId" => $userId
@@ -218,14 +218,14 @@ 
         $output = $obReply->replyTo([]);
         $this->assertEquals("Failed", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => -1,
             "reply" => "Hello World",
             "userId" => $currentId
         ]);
         $this->assertEquals("Invalid Authentication", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => $userId,
             "reply" => "Hello",
             "userId" => $currentId

src/Session.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
         $_SESSION[$key] = $value;
     }
 
+    /**
+     * @param string $key
+     */
     public static function get($key){
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }

Spacing +3 added lines, -3 removed lines

@@ -6,15 +6,15 @@
 class Session
 {
 
-    public static function put($key, $value){
+    public static function put($key, $value) {
         $_SESSION[$key] = $value;
     }
 
-    public static function get($key){
+    public static function get($key) {
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }
 
-    public static function forget($key){
+    public static function forget($key) {
         unset($_SESSION[$key]);
     }
 

index.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-require_once (__DIR__ . '/vendor/autoload.php');
+require_once (__DIR__.'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(__DIR__);
 $dotenv->load();
 
 // die("Hello");
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     header("Location:".getenv('APP_URL')."/views/account.php");
 }

src/Chat.php

Doc Comments +11 added lines

@@ -25,6 +25,9 @@ 
         Online::setOnlineStatus($conn->userId);
     }
 
+    /**
+     * @param ConnectionInterface $conn
+     */
     public function setID($conn) {
         session_id($conn->WebSocket->request->getCookies()['PHPSESSID']);
         @session_start();
@@ -117,11 +120,19 @@ 
         return $obSidebar->loadSideBar($data);
     }
 
+    /**
+     * @param string $data
+     * @param boolean $para
+     */
     public function onConversation($data, $para) {
         $obConversation = new Conversation();
         return $obConversation->conversationLoad($data, $para);
     }
 
+    /**
+     * @param string $data
+     * @param boolean $para
+     */
     public function onReceiver($data, $para) {
         $obReceiver = new Receiver();
         return $obReceiver->receiverLoad($data, $para);

Spacing +7 added lines, -7 removed lines

@@ -34,9 +34,9 @@ 
     }
 
     public function onMessage(ConnectionInterface $from, $msg) {
-        $msg = (object) json_decode($msg);
+        $msg = (object)json_decode($msg);
         if ($msg->type == 'OpenChat initiated..!') {
-            $initial = (object) array();
+            $initial = (object)array();
             $initial->initial = json_decode($this->onSidebar($from->userId));
 
             if ($initial->initial != null) {
@@ -52,12 +52,12 @@ 
             }
             $from->send(json_encode($initial));
         } else if ($msg->type == 'Load Sidebar') {
-            $sidebar = (object) array();
+            $sidebar = (object)array();
             $sidebar->sidebar = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($sidebar));
         } else if ($msg->type == 'Initiated') {
             $msg->userId = $from->userId;
-            $result = (object) array();
+            $result = (object)array();
             $result->conversation = json_decode($this->onConversation(json_encode($msg), False));
             $from->send(json_encode($result));
         } else if ($msg->type == 'Search') {
@@ -75,8 +75,8 @@ 
             $getReturn = $this->onReply($msg);
             echo $getReturn;
 
-            $receiveResult = (object) array();
-            $sentResult = (object) array();
+            $receiveResult = (object)array();
+            $sentResult = (object)array();
             foreach ($this->clients as $client)
             {
                 if ($client->userId == $msg->name) {
@@ -93,7 +93,7 @@ 
                     );
 
                     $client->send(json_encode($receiveResult));
-                } else if($client == $from) {
+                } else if ($client == $from) {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 
                     $sentResult->conversation = json_decode(

src/Register.php

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
     }
 
 
+    /**
+     * @param string $value
+     */
     public function onError($key, $value)
     {
         $this->flag = 1;

Indentation +5 added lines, -5 removed lines

@@ -64,9 +64,9 @@ 
         $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
         if (!$this->connect->query($query)) {
             return json_encode(
-            	[
-            	"Error" => "You are not registered, ".$this->connect->error
-            	]
+                [
+                "Error" => "You are not registered, ".$this->connect->error
+                ]
             );
         }
         $query = "SELECT id FROM register WHERE email = '$email'";
@@ -86,9 +86,9 @@ 
 
             Session::put('start', $userId);
             return json_encode(
-            	[
+                [
                 "location" => getenv('APP_URL')."/views/account.php"
-            	]
+                ]
             );
         }
     }

Spacing +2 added lines, -2 removed lines

@@ -76,12 +76,12 @@
             $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
 
             if (!$this->connect->query($query)) {
-                return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+                return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
             }
 
             $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
             if (!$this->connect->query($query)) {
-                return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+                return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
             }
 
             Session::put('start', $userId);