Restore the mb_convert but with checks

barryvdh · barryvdh · commit 98c2716eddc5 · 2014-06-15T22:27:23.000+02:00
check if string and if not already utf-8
diff --git a/src/Barryvdh/Debugbar/LaravelDebugBar.php b/src/Barryvdh/Debugbar/LaravelDebugBar.php
@@ -537,13 +537,59 @@ public function collectConsole(){
             $this->data[$name] = $collector->collect();
         }
 		
+        // Remove all invalid (non UTF-8) characters
+        array_walk_recursive($this->data, function(&$item){
+                if(is_string($item) && !mb_check_encoding($item, 'UTF-8')){
+                    $item = mb_convert_encoding($item, 'UTF-8', 'UTF-8');
+                }
+            });
+
         if ($this->storage !== null) {
             $this->storage->save($this->getCurrentRequestId(), $this->data);
         }
 
         return $this->data;
     }
 
+    /**
+     * Collects the data from the collectors
+     *
+     * @return array
+     */
+    public function collect()
+    {
+        /** @var Request $request */
+        $request = $this->app['request'];
+
+        $this->data = array(
+            '__meta' => array(
+                'id' => $this->getCurrentRequestId(),
+                'datetime' => date('Y-m-d H:i:s'),
+                'utime' => microtime(true),
+                'method' => $request->getMethod(),
+                'uri' => $request->getRequestUri(),
+                'ip' => $request->getClientIp()
+            )
+        );
+
+        foreach ($this->collectors as $name => $collector) {
+            $this->data[$name] = $collector->collect();
+        }
+
+        // Remove all invalid (non UTF-8) characters
+        array_walk_recursive($this->data, function(&$item){
+                if(is_string($item) && !mb_check_encoding($item, 'UTF-8')){
+                    $item = mb_convert_encoding($item, 'UTF-8', 'UTF-8');
+                }
+            });
+
+
+        if ($this->storage !== null) {
+            $this->storage->save($this->getCurrentRequestId(), $this->data);
+        }
+
+        return $this->data;
+    }
 	
     /**
      * Magic calls for adding messages
