ankitjain28may / openchat

tests/TestReply.php

Unused Use Statements -2 removed lines

@@ -3,10 +3,8 @@
 namespace ChatApp\Tests;
 use PHPUnit_Framework_TestCase;
 use ChatApp\Register;
-use ChatApp\Search;
 use ChatApp\Reply;
 use ChatApp\Session;
-
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();

Indentation +6 added lines, -6 removed lines

@@ -48,9 +48,9 @@ 
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with empty username
-    */
+     * @depends test_authRegister
+     *  Testing for the register with empty username
+     */
     public function test_authRegister2($userId)
     {
         $msg = [
@@ -133,9 +133,9 @@ 
     }
 
     /**
-    *   @depends test_authRegister2
-    *  Empty the DB
-    */
+     *   @depends test_authRegister2
+     *  Empty the DB
+     */
     // public function test_EmptyDB()
     // {
     //     $connect = mysqli_connect(

src/Reply.php

Spacing +17 added lines, -17 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__));
@@ -30,37 +30,37 @@ 
 
     public function replyTo($msg)
     {
-        $msg = json_decode($msg);   //decode json value
-        if(Session::get('start') != null && !empty($msg))  //checks for session login and the value send
+        $msg = json_decode($msg); //decode json value
+        if (Session::get('start') != null && !empty($msg))  //checks for session login and the value send
         {
             $userId = Session::get('start');
             $identifier = $msg->name;
 
-            $receiverID = $identifier;  //stores id of the person whom message is to be sent
+            $receiverID = $identifier; //stores id of the person whom message is to be sent
 
-            if($identifier > $userId)    // geneate specific unique code to store messages
-                $identifier = $userId . ":" . $identifier;
+            if ($identifier > $userId)    // geneate specific unique code to store messages
+                $identifier = $userId.":".$identifier;
             else
-                $identifier = $identifier . ":" . $userId;
+                $identifier = $identifier.":".$userId;
 
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
 
-            $time = date("D d M Y H:i:s", time() + 16200);  // current time
+            $time = date("D d M Y H:i:s", time() + 16200); // current time
             $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time
 
             //the sender id must not be equal to current session id
-            if($reply != "" && $receiverID != $userId)
+            if ($reply != "" && $receiverID != $userId)
             {
                 // check whether the receiver is authorized or registered
                 $query = "SELECT * from login where login_id = '$receiverID'";
 
                 $result = $this->connect->query($query);
-                if($result->num_rows > 0)     // if true
+                if ($result->num_rows > 0)     // if true
                 {
                     //check whether he is sending message for thr first time or he has sent messages before
                     $query = "SELECT * from total_message where identifier = '$identifier'";
                     $result = $this->connect->query($query);
-                    if($result->num_rows>0)               // if he has sent messages before
+                    if ($result->num_rows > 0)               // if he has sent messages before
                     {
                         // Update Total_Message Table
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
@@ -70,15 +70,15 @@ 
                     else    // if he sends message for the first time
                     {
                         $length = strlen($userId);
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
+                        if (substr($identifier, 0, $length) == $userId) // generate specific unique code
                         {
-                            $user2 = substr($identifier, $length+1);
+                            $user2 = substr($identifier, $length + 1);
                             $user1 = $userId;
                         }
                         else
                         {
                             $user2 = $userId;
-                            $length = strlen($identifier) - $length-1;
+                            $length = strlen($identifier) - $length - 1;
                             $user1 = substr($identifier, 0, $length);
                         }
                         // insert Details in Total_Message Table
@@ -100,13 +100,13 @@ 
 
     public function updateMessages($query, $identifier, $reply, $userId, $time)
     {
-        if($result = $this->connect->query($query))
+        if ($result = $this->connect->query($query))
         {
             //insert message in db
             $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)";
-            if($this->connect->query($query))
+            if ($this->connect->query($query))
             {
-                return "Messages is sent";    // if query is executed return true
+                return "Messages is sent"; // if query is executed return true
             }
             else
             {

Braces +22 added lines, -17 removed lines

@@ -31,17 +31,21 @@ 
     public function replyTo($msg)
     {
         $msg = json_decode($msg);   //decode json value
-        if(Session::get('start') != null && !empty($msg))  //checks for session login and the value send
+        if(Session::get('start') != null && !empty($msg)) {
+            //checks for session login and the value send
         {
             $userId = Session::get('start');
+        }
             $identifier = $msg->name;
 
             $receiverID = $identifier;  //stores id of the person whom message is to be sent
 
-            if($identifier > $userId)    // geneate specific unique code to store messages
+            if($identifier > $userId) {
+                // geneate specific unique code to store messages
                 $identifier = $userId . ":" . $identifier;
-            else
-                $identifier = $identifier . ":" . $userId;
+            } else {
+                            $identifier = $identifier . ":" . $userId;
+            }
 
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
 
@@ -55,27 +59,31 @@ 
                 $query = "SELECT * from login where login_id = '$receiverID'";
 
                 $result = $this->connect->query($query);
-                if($result->num_rows > 0)     // if true
+                if($result->num_rows > 0) {
+                    // if true
                 {
                     //check whether he is sending message for thr first time or he has sent messages before
                     $query = "SELECT * from total_message where identifier = '$identifier'";
+                }
                     $result = $this->connect->query($query);
-                    if($result->num_rows>0)               // if he has sent messages before
+                    if($result->num_rows>0) {
+                        // if he has sent messages before
                     {
                         // Update Total_Message Table
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
+                    }
                         return $this->updateMessages($query, $identifier, $reply, $userId, $time);
 
-                    }
-                    else    // if he sends message for the first time
+                    } else    // if he sends message for the first time
                     {
                         $length = strlen($userId);
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
+                        if(substr($identifier, 0, $length) == $userId) {
+                            // generate specific unique code
                         {
                             $user2 = substr($identifier, $length+1);
-                            $user1 = $userId;
                         }
-                        else
+                            $user1 = $userId;
+                        } else
                         {
                             $user2 = $userId;
                             $length = strlen($identifier) - $length-1;
@@ -85,14 +93,12 @@ 
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
                         return $this->updateMessages($query, $identifier, $reply, $userId, $time);
                     }
-                }
-                else // if he is unauthorized echo message is failed
+                } else // if he is unauthorized echo message is failed
                 {
                     return "Invalid Authentication";
                 }
             }
-        }
-        else
+        } else
         {
             return "Failed";
         }
@@ -107,8 +113,7 @@ 
             if($this->connect->query($query))
             {
                 return "Messages is sent";    // if query is executed return true
-            }
-            else
+            } else
             {
                 return "Message is failed";
             }