florinp / phpbb-messenger

controller/main.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace florinp\messenger\controller;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class main

Indentation +199 added lines, -199 removed lines

@@ -8,204 +8,204 @@
 class main
 {
 
-    protected $user;
-    protected $model;
-    protected $request;
-    protected $notification_manager;
-    protected $emojione;
-    protected $upload;
-    protected $download;
-
-    public function __construct(
-        \phpbb\request\request $request,
-        \phpbb\user $user,
-        \florinp\messenger\models\main_model $model,
-        \phpbb\notification\manager $notification_manager,
-        \florinp\messenger\libs\emojione $emojione,
-        \florinp\messenger\libs\upload $upload,
-        \florinp\messenger\libs\download $download
-    )
-    {
-        $this->request = $request;
-        $this->user = $user;
-        $this->model = $model;
-        $this->notification_manager = $notification_manager;
-        $this->emojione = $emojione;
-        $this->upload = $upload;
-        $this->download = $download;
-    }
-
-    public function handle()
-    {
-    }
-
-    public function index()
-    {
-
-    }
-
-    public function publish()
-    {
-        $text = $this->request->variable('text', '', true);
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        if ($receiver_id != 0 && trim($text) != '') {
-            $text = htmlspecialchars($text);
-            $text = str_replace(array("\n", "\r"), '', $text);
-
-            $message = array(
-                'sender_id' => $sender_id,
-                'receiver_id' => $receiver_id,
-                'text' => $text,
-                'sentAt' => time()
-            );
-
-            if ($id = $this->model->sendMessage($message)) {
-                $lastMessage = $this->model->getMessageById($id);
-                $response = array('success' => true, 'message' => $lastMessage);
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => 'An error has been ocurred!'
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getFile($id)
-    {
-        $id = explode('_', $id)[1];
-        $file = $this->model->getFileById($id);
-        $this->download->setFile($file['file']);
-        $this->download->sendDownload();
-    }
-
-    public function sendFile()
-    {
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        $file = $this->request->file('file');
-        if ($receiver_id != 0 && !empty($file)) {
-            if ($file['error'] == 0) {
-                $this->upload->file($file);
-                $this->upload->set_allowed_mime_types(array(
-                    'image/gif',
-                    'image/jpeg',
-                    'image/png',
-                    'application/pdf',
-                    'application/x-rar-compressed',
-                    'application/zip',
-                    'application/x-7z-compressed',
-                    'text/plain'
-                ));
-                $results = $this->upload->upload();
-                if (isset($results['errors']) && count($results['errors'])) {
-                    $response = array(
-                        'success' => false,
-                        'errors' => $results['errors']
-                    );
-                } else {
-                    $data = array(
-                        'sender_id' => $sender_id,
-                        'receiver_id' => $receiver_id,
-                        'fileName' => $results['original_filename'],
-                        'file' => $results['filename'],
-                        'type' => $results['mime'],
-                    );
-                    if ($id = $this->model->sendFile($data)) {
-                        $lastFile = $this->model->getFileById($id);
-                        $response = array(
-                            'success' => true,
-                            'file' => $lastFile
-                        );
-                    } else {
-                        $response = array(
-                            'succes' => false,
-                            'error' => 'An error has been ocurred!'
-                        );
-                    }
-                }
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => $file['error']
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function load()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-
-        if ($friend_id > 0) {
-            $messages = $this->model->getMessages($friend_id);
-            return new JsonResponse($messages, 200);
-        }
-        return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
-    }
-
-    public function updateMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $newVal = $this->model->updateMessagesStatus($friend_id);
-            return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function checkForNewMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $messages = $this->model->getInboxFromId($friend_id);
-            return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function getFriends()
-    {
-        $friends = $this->model->getFriends();
-        $friends_online = array_filter($friends, function ($friend) {
-            return $friend['user_status'] != 0;
-        });
-
-        $response = array(
-            'friends_online' => count($friends_online),
-            'friends_list' => $friends
-        );
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getEmoticons()
-    {
-        $emoticons = \florinp\messenger\libs\emojione::$ascii_replace;
-        $eicons = array();
-        foreach ($emoticons as $code => $value) {
-            $eicons[$value] = $code;
-        }
-
-        $response = array();
-        foreach ($eicons as $emoticon) {
-            $item = array();
-            $item['code'] = $emoticon;
-            $item['image'] = $this->emojione->toImage($emoticon);
-
-            $response[] = $item;
-        }
-
-        return new JsonResponse($response, 200);
-    }
+	protected $user;
+	protected $model;
+	protected $request;
+	protected $notification_manager;
+	protected $emojione;
+	protected $upload;
+	protected $download;
+
+	public function __construct(
+		\phpbb\request\request $request,
+		\phpbb\user $user,
+		\florinp\messenger\models\main_model $model,
+		\phpbb\notification\manager $notification_manager,
+		\florinp\messenger\libs\emojione $emojione,
+		\florinp\messenger\libs\upload $upload,
+		\florinp\messenger\libs\download $download
+	)
+	{
+		$this->request = $request;
+		$this->user = $user;
+		$this->model = $model;
+		$this->notification_manager = $notification_manager;
+		$this->emojione = $emojione;
+		$this->upload = $upload;
+		$this->download = $download;
+	}
+
+	public function handle()
+	{
+	}
+
+	public function index()
+	{
+
+	}
+
+	public function publish()
+	{
+		$text = $this->request->variable('text', '', true);
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		if ($receiver_id != 0 && trim($text) != '') {
+			$text = htmlspecialchars($text);
+			$text = str_replace(array("\n", "\r"), '', $text);
+
+			$message = array(
+				'sender_id' => $sender_id,
+				'receiver_id' => $receiver_id,
+				'text' => $text,
+				'sentAt' => time()
+			);
+
+			if ($id = $this->model->sendMessage($message)) {
+				$lastMessage = $this->model->getMessageById($id);
+				$response = array('success' => true, 'message' => $lastMessage);
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => 'An error has been ocurred!'
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getFile($id)
+	{
+		$id = explode('_', $id)[1];
+		$file = $this->model->getFileById($id);
+		$this->download->setFile($file['file']);
+		$this->download->sendDownload();
+	}
+
+	public function sendFile()
+	{
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		$file = $this->request->file('file');
+		if ($receiver_id != 0 && !empty($file)) {
+			if ($file['error'] == 0) {
+				$this->upload->file($file);
+				$this->upload->set_allowed_mime_types(array(
+					'image/gif',
+					'image/jpeg',
+					'image/png',
+					'application/pdf',
+					'application/x-rar-compressed',
+					'application/zip',
+					'application/x-7z-compressed',
+					'text/plain'
+				));
+				$results = $this->upload->upload();
+				if (isset($results['errors']) && count($results['errors'])) {
+					$response = array(
+						'success' => false,
+						'errors' => $results['errors']
+					);
+				} else {
+					$data = array(
+						'sender_id' => $sender_id,
+						'receiver_id' => $receiver_id,
+						'fileName' => $results['original_filename'],
+						'file' => $results['filename'],
+						'type' => $results['mime'],
+					);
+					if ($id = $this->model->sendFile($data)) {
+						$lastFile = $this->model->getFileById($id);
+						$response = array(
+							'success' => true,
+							'file' => $lastFile
+						);
+					} else {
+						$response = array(
+							'succes' => false,
+							'error' => 'An error has been ocurred!'
+						);
+					}
+				}
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => $file['error']
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function load()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+
+		if ($friend_id > 0) {
+			$messages = $this->model->getMessages($friend_id);
+			return new JsonResponse($messages, 200);
+		}
+		return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
+	}
+
+	public function updateMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$newVal = $this->model->updateMessagesStatus($friend_id);
+			return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function checkForNewMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$messages = $this->model->getInboxFromId($friend_id);
+			return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function getFriends()
+	{
+		$friends = $this->model->getFriends();
+		$friends_online = array_filter($friends, function ($friend) {
+			return $friend['user_status'] != 0;
+		});
+
+		$response = array(
+			'friends_online' => count($friends_online),
+			'friends_list' => $friends
+		);
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getEmoticons()
+	{
+		$emoticons = \florinp\messenger\libs\emojione::$ascii_replace;
+		$eicons = array();
+		foreach ($emoticons as $code => $value) {
+			$eicons[$value] = $code;
+		}
+
+		$response = array();
+		foreach ($eicons as $emoticon) {
+			$item = array();
+			$item['code'] = $emoticon;
+			$item['image'] = $this->emojione->toImage($emoticon);
+
+			$response[] = $item;
+		}
+
+		return new JsonResponse($response, 200);
+	}
 
 }

tests/controller/main_test.php

Indentation +104 added lines, -104 removed lines

@@ -6,108 +6,108 @@
 
 class main_test extends \phpbb_test_case {
 
-    /**
-     * @var \florinp\messenger\controller\main
-     */
-    protected $controller;
-
-    public function setUp() {
-        parent::setUp();
-        /**
-         * @var \phpbb\user $user Mock the user class
-         */
-        $user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
-
-        /**
-         * @var \phpbb\request\request $request
-         */
-        $request = $this->getMockBuilder('\phpbb\request\request')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\models\main_model $model
-         */
-        $model = $this->getMockBuilder('\florinp\messenger\models\main_model')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \phpbb\notification\manager $notification_manager
-         */
-        $notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\emojione $emojione
-         */
-        $emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\upload $upload
-         */
-        $upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\download $download
-         */
-        $download = $this->getMockBuilder('\florinp\messenger\libs\download')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->controller = new \florinp\messenger\controller\main(
-            $request,
-            $user,
-            $model,
-            $notification_manager,
-            $emojione,
-            $upload,
-            $download
-        );
-    }
-
-    public function tearDown() {
-        $this->controller = null;
-        parent::tearDown();
-    }
-
-    public function publish_data() {
-        return array(
-            array(200, json_encode(array()))
-        );
-    }
-
-    /**
-     * @dataProvider publish_data
-     */
-    public function test_publish($status_code, $page_content) {
-        $response = $this->controller->publish();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
-
-    public function load_data() {
-        return array(
-            array(200, json_encode(array(
-                'success' => false,
-                'error' => 'The request is invalid'
-            )))
-        );
-    }
-
-    /**
-     * @dataProvider load_data
-     */
-    public function test_load($status_code, $page_content) {
-        $response = $this->controller->load();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
+	/**
+	 * @var \florinp\messenger\controller\main
+	 */
+	protected $controller;
+
+	public function setUp() {
+		parent::setUp();
+		/**
+		 * @var \phpbb\user $user Mock the user class
+		 */
+		$user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
+
+		/**
+		 * @var \phpbb\request\request $request
+		 */
+		$request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\models\main_model $model
+		 */
+		$model = $this->getMockBuilder('\florinp\messenger\models\main_model')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \phpbb\notification\manager $notification_manager
+		 */
+		$notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\emojione $emojione
+		 */
+		$emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\upload $upload
+		 */
+		$upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\download $download
+		 */
+		$download = $this->getMockBuilder('\florinp\messenger\libs\download')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->controller = new \florinp\messenger\controller\main(
+			$request,
+			$user,
+			$model,
+			$notification_manager,
+			$emojione,
+			$upload,
+			$download
+		);
+	}
+
+	public function tearDown() {
+		$this->controller = null;
+		parent::tearDown();
+	}
+
+	public function publish_data() {
+		return array(
+			array(200, json_encode(array()))
+		);
+	}
+
+	/**
+	 * @dataProvider publish_data
+	 */
+	public function test_publish($status_code, $page_content) {
+		$response = $this->controller->publish();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
+
+	public function load_data() {
+		return array(
+			array(200, json_encode(array(
+				'success' => false,
+				'error' => 'The request is invalid'
+			)))
+		);
+	}
+
+	/**
+	 * @dataProvider load_data
+	 */
+	public function test_load($status_code, $page_content) {
+		$response = $this->controller->load();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
 }
\ No newline at end of file