Refactored code, many fixes and improvements in chat backend+frontend

2 files changed, 11 insertions, 13 deletions

diff --git a/main/app/sprinkles/core/src/Log/DatabaseHandler.php b/main/app/sprinkles/core/src/Log/DatabaseHandler.php
index c78308c..d4c9fce 100644
--- a/main/app/sprinkles/core/src/Log/DatabaseHandler.php
+++ b/main/app/sprinkles/core/src/Log/DatabaseHandler.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Core\Log;
 
 use Monolog\Logger;
@@ -32,11 +33,10 @@ class DatabaseHandler extends AbstractProcessingHandler
      *
      * @param ClassMapper $classMapper Maps the modelIdentifier to the specific Eloquent model.
      * @param string $modelIdentifier
-     * @param int     $level  The minimum logging level at which this handler will be triggered
+     * @param int $level The minimum logging level at which this handler will be triggered
      * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
      */
-    public function __construct($classMapper, $modelIdentifier, $level = Logger::DEBUG, $bubble = true)
-    {
+    public function __construct($classMapper, $modelIdentifier, $level = Logger::DEBUG, $bubble = TRUE) {
         $this->classMapper = $classMapper;
         $this->modelName = $modelIdentifier;
         parent::__construct($level, $bubble);
@@ -45,8 +45,7 @@ class DatabaseHandler extends AbstractProcessingHandler
     /**
      * {@inheritDoc}
      */
-    protected function write(array $record)
-    {
+    protected function write(array $record) {
         $log = $this->classMapper->createInstance($this->modelName, $record['extra']);
         $log->save();
     }
diff --git a/main/app/sprinkles/core/src/Log/MixedFormatter.php b/main/app/sprinkles/core/src/Log/MixedFormatter.php
index beae788..ce21879 100644
--- a/main/app/sprinkles/core/src/Log/MixedFormatter.php
+++ b/main/app/sprinkles/core/src/Log/MixedFormatter.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Core\Log;
 
 use Monolog\Formatter\LineFormatter;
@@ -23,13 +24,12 @@ class MixedFormatter extends LineFormatter
     /**
      * Return the JSON representation of a value
      *
-     * @param  mixed             $data
-     * @param  bool              $ignoreErrors
+     * @param  mixed $data
+     * @param  bool $ignoreErrors
      * @throws \RuntimeException if encoding fails and errors are not ignored
      * @return string
      */
-    protected function toJson($data, $ignoreErrors = false)
-    {
+    protected function toJson($data, $ignoreErrors = FALSE) {
         // suppress json_encode errors since it's twitchy with some inputs
         if ($ignoreErrors) {
             return @$this->jsonEncodePretty($data);
@@ -37,7 +37,7 @@ class MixedFormatter extends LineFormatter
 
         $json = $this->jsonEncodePretty($data);
 
-        if ($json === false) {
+        if ($json === FALSE) {
             $json = $this->handleJsonError(json_last_error(), $data);
         }
 
@@ -45,11 +45,10 @@ class MixedFormatter extends LineFormatter
     }
 
     /**
-     * @param  mixed  $data
+     * @param  mixed $data
      * @return string JSON encoded data or null on failure
      */
-    private function jsonEncodePretty($data)
-    {
+    private function jsonEncodePretty($data) {
         if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
             return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
         }