Finish changes for event handling and tests

src/php/whatsprot.class.php

@@ -55,7 +55,7 @@ class WhatsProt
     protected $phoneNumber;             // The user phone number including the country code without '+' or '00'.
     protected $reader;                  // An instance of the BinaryTreeNodeReader class.
     protected $serverReceivedId;        // Confirm that the *server* has received your command.
-    public $socket;                  // A socket to connect to the WhatsApp network.
+    protected $socket;                  // A socket to connect to the WhatsApp network.
     protected $writer;                  // An instance of the BinaryTreeNodeWriter class.
 
     /**
@@ -357,7 +357,7 @@ public function connect()
             );
         } else {
             if ($this->debug) {
-                echo "Firing onConnectError\n";
+                print_r("Firing onConnectError\n");
             }            
             $this->eventManager()->fireConnectError(
                $this->phoneNumber, 
@@ -426,7 +426,7 @@ public function login($profileSubscribe = false)
         $this->accountInfo = (array) $this->checkCredentials();
         if ($this->accountInfo['status'] == 'ok') {
             if ($this->debug) {
-                echo "New password received: " . $this->accountInfo['pw'] . "\r\n";
+                print_r("New password received: " . $this->accountInfo['pw'] . "\n");
             }
             $this->password = $this->accountInfo['pw'];
         }
@@ -1541,8 +1541,6 @@ protected function doLogin($profileSubscribe = false)
         if($this->loginStatus != static::CONNECTED_STATUS) {
             $data = $this->createAuthResponseNode();
             $this->sendNode($data);
-
-            file_put_contents('inputKey', serialize($this->inputKey));
             $this->reader->setKey($this->inputKey);
             $this->writer->setKey($this->outputKey);
         }
@@ -1735,8 +1733,6 @@ protected function processChallenge($node)
      */
     protected function processInboundData($data)
     {
-        file_put_contents('messageTest', $data, FILE_APPEND);
-
         try {
             $node = $this->reader->nextTree($data);
             if( $node != null ) {
@@ -2230,13 +2226,12 @@ protected function processUploadResponse($node)
         $messageNode = @$this->mediaQueue[$id];
         if ($messageNode == null) {
             //message not found, can't send!
-            $this->eventManager()->fire ("onMediaUploadFailed", array(
-                    $this->phoneNumber,
-                    $id,
-                    $node,
-                    $messageNode,
-                    "Message node not found in queue"
-                )
+            $this->eventManager()->fireMediaUploadFailed(
+                $this->phoneNumber,
+                $id,
+                $node,
+                $messageNode,
+                "Message node not found in queue"
             );
             return false;
         }

tests/TestWhatsProt.php

@@ -1,22 +1,11 @@
 <?php
 require_once '../src/php/whatsprot.class.php';
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
- * Description of WhatsProtTest
- *
- * @author daniel
+ * Used to expose protected methods to the testing framework.
  */
 class TestWhatsProt extends WhatsProt {
     public function processInboundDataNode(ProtocolNode $node) {
         parent::processInboundDataNode($node);
     }
-    public function setKey($key) {
-        $this->reader->setKey($key);
-    }
 }

tests/WhatsAppEventListenerCapture.php

@@ -1,16 +1,9 @@
 <?php
 require_once '../src/php/events/WhatsAppEventListenerProxy.php';
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
- * Description of WhatsAppEventListenerCapture
- *
- * @author daniel
+ * Records all calls to the WhatsAppEventListener so they can be analyzed 
+ *  and asserted by the testing framework.
  */
 class WhatsAppEventListenerCapture extends WhatsAppEventListenerProxy {
     private $capture = array();