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

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

Unused Use Statements -1 removed lines

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

Indentation +18 added lines, -18 removed lines

@@ -49,9 +49,9 @@ 
     }
 
     /**
-    * @depends testAuthRegister
-    *  Register User2
-    */
+     * @depends testAuthRegister
+     *  Register User2
+     */
     public function testAuthRegister2()
     {
         $output = $this->obRegister->authRegister(
@@ -76,9 +76,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'];
@@ -133,9 +133,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'];
@@ -175,9 +175,9 @@ 
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Reply Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Reply Class
+     */
     public function testReply($userId)
     {
         $msg = [
@@ -228,9 +228,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'];
@@ -257,9 +257,9 @@ 
 
 
     /**
-    *   @depends testSearchWithTotalMessages
-    *  Empty the DB
-    */
+     *   @depends testSearchWithTotalMessages
+     *  Empty the DB
+     */
     public function test_EmptyDB()
     {
         $connect = mysqli_connect(

Spacing +5 added lines, -5 removed lines

@@ -189,12 +189,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" => [
                 0 => "Hello World"
@@ -206,7 +206,7 @@ 
         $output = $obReply->replyTo($msg);
         $this->assertEquals("Messages is sent", $output);
 
-        $msg =(object) [
+        $msg = (object)[
             "name" => $currentId,
             "reply" => [
                 0 => "Hello World"
@@ -221,7 +221,7 @@ 
         $output = $obReply->replyTo([]);
         $this->assertEquals("Failed", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => -1,
             "reply" => [
                 0 => "Hello World"
@@ -230,7 +230,7 @@ 
         ]);
         $this->assertEquals("Invalid Authentication", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => $userId,
             "reply" => [
                 0 => "Hello"

src/Compose.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-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__));
@@ -33,14 +33,14 @@ 
         $userId = $msg->userId;
         $suggestion = $msg->value;
         $suggestion = trim($suggestion);
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
-                if($result->num_rows > 0)
+                if ($result->num_rows > 0)
                 {
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $this->array = array_merge($this->array, [$row]);
                     }

src/Conversation.php

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Time;
 use ChatApp\User;
 use Dotenv\Dotenv;
@@ -36,7 +36,7 @@ 
     {
         $msg = json_decode($msg);
 
-        if(!empty($msg))
+        if (!empty($msg))
         {
             $userId = $msg->userId;
             $add_load = 0;
@@ -45,25 +45,25 @@ 
 
             $fetch = $this->obUser->userDetails($username, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $userId)
+                if ($login_id > $userId)
                     $identifier = $userId.':'.$login_id;
                 else
                     $identifier = $login_id.':'.$userId;
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
                         $total = $result->fetch_assoc();
                         $total = $total['total_messages'];
-                        if($total - $load > 0)
-                            if($total - $load > 10)
+                        if ($total - $load > 0)
+                            if ($total - $load > 10)
                                 $add_load = $load + 10;
                             else
                                 $add_load = $total;
@@ -71,14 +71,14 @@ 
                 }
 
                 $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load;
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
-                        while($row = $result->fetch_assoc())
+                        while ($row = $result->fetch_assoc())
                         {
                             $row['time'] = $this->obTime->timeConversion($row['time']);
-                            $row = array_merge($row,['start' => $userId]);
+                            $row = array_merge($row, ['start' => $userId]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

Braces +11 added lines, -10 removed lines

@@ -50,10 +50,11 @@ 
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $userId)
-                    $identifier = $userId.':'.$login_id;
-                else
-                    $identifier = $login_id.':'.$userId;
+                if($login_id > $userId) {
+                                    $identifier = $userId.':'.$login_id;
+                } else {
+                                    $identifier = $login_id.':'.$userId;
+                }
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
                 if($result = $this->connect->query($query))
@@ -62,11 +63,12 @@ 
                     {
                         $total = $result->fetch_assoc();
                         $total = $total['total_messages'];
-                        if($total - $load > 0)
-                            if($total - $load > 10)
+                        if($total - $load > 0) {
+                                                    if($total - $load > 10)
                                 $add_load = $load + 10;
-                            else
-                                $add_load = $total;
+                        } else {
+                                                            $add_load = $total;
+                            }
                     }
                 }
 
@@ -84,8 +86,7 @@ 
 
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]);
                     }

src/Search.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Time;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,20 +34,20 @@ 
         $userId = $suggestion->userId;
         $suggestion = trim($suggestion->value);
         $flag = 0;
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
-                if($result->num_rows > 0)
+                if ($result->num_rows > 0)
                 {
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $check_id = $row["login_id"];
                         $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')";
-                        if($result1 = $this->connect->query($query))
+                        if ($result1 = $this->connect->query($query))
                         {
-                            if($result1->num_rows > 0)
+                            if ($result1->num_rows > 0)
                             {
                                 $fetch = $result1->fetch_assoc();
                                 $fetch['time'] = $this->obTime->timeConversion($fetch['time']);
@@ -59,7 +59,7 @@ 
                     }
                 }
             }
-            if($flag != 0)
+            if ($flag != 0)
             {
                 $this->array = array_merge([], ["Search" => $this->array]);
                 return json_encode($this->array);