bedezign / yii2-audit

src/components/Version.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
      * @param $id
      * @param $attribute
      * @param $version
-     * @return null|integer|float|string
+     * @return string|null
      */
     public static function findAttribute($class, $id, $attribute, $version)
     {

src/panels/CurlPanel.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
 
 use Yii;
 use bedezign\yii2\audit\components\panels\DataStoragePanel;
-use yii\grid\GridViewAsset;
 use yii\data\ArrayDataProvider;
+use yii\grid\GridViewAsset;
 
 /**
  * Class CurlPanel

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->data) . ')</small>';
+        return $this->getName().' <small>('.count($this->data).')</small>';
     }
 
     /**
@@ -137,7 +137,7 @@ 
         }
 
         if ($this->content)
-            $this->data[$id]['content']= curl_multi_getcontent($handle);
+            $this->data[$id]['content'] = curl_multi_getcontent($handle);
 
         // Cleanup empty things
         $this->data[$id] = array_filter($this->data[$id]);
@@ -208,7 +208,7 @@ 
         if (!is_resource($resource))
             return false;
 
-        $parts = explode('#', (string)$resource);
+        $parts = explode('#', (string) $resource);
         return array_pop($parts);
     }
 

Braces +18 added lines, -12 removed lines

@@ -96,19 +96,22 @@ 
             curl_setopt($handle, CURLOPT_URL, $url);
         }
 
-        if ($postData)
-            $this->data[$id]['post'] = $postData;
+        if ($postData) {
+                    $this->data[$id]['post'] = $postData;
+        }
 
-        if ($this->headers)
-            curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        if ($this->headers) {
+                    curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        }
 
         if ($this->log) {
             curl_setopt($handle, CURLOPT_VERBOSE, true);
             curl_setopt($handle, CURLOPT_STDERR, $this->_logHandles[$id] = fopen('php://temp', 'rw+'));
         }
 
-        if ($this->content)
-            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        if ($this->content) {
+                    curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        }
 
         return true;
     }
@@ -136,8 +139,9 @@ 
             unset($this->_logHandles[$id]);
         }
 
-        if ($this->content)
-            $this->data[$id]['content']= curl_multi_getcontent($handle);
+        if ($this->content) {
+                    $this->data[$id]['content']= curl_multi_getcontent($handle);
+        }
 
         // Cleanup empty things
         $this->data[$id] = array_filter($this->data[$id]);
@@ -192,8 +196,9 @@ 
     public function captureHeader($handle, $header)
     {
         $id = $this->id($handle);
-        if (!isset($this->data[$id]['headers']))
-            $this->data[$id]['headers'] = [];
+        if (!isset($this->data[$id]['headers'])) {
+                    $this->data[$id]['headers'] = [];
+        }
 
         $this->data[$id]['headers'][] = $header;
         return strlen($header);
@@ -205,8 +210,9 @@ 
      */
     protected function id($resource)
     {
-        if (!is_resource($resource))
-            return false;
+        if (!is_resource($resource)) {
+                    return false;
+        }
 
         $parts = explode('#', (string)$resource);
         return array_pop($parts);

src/panels/DbPanel.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace bedezign\yii2\audit\panels;
 
-use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use Yii;
+use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use yii\debug\models\search\Db;
 use yii\grid\GridViewAsset;
 

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
     {
         $timings = $this->calculateTimings();
         $queryCount = count($timings);
-        $queryTime = number_format($this->getTotalQueryTime($timings) * 1000) . ' ms';
-        return $this->getName() . ' <small>(' . $queryCount . ' / ' . $queryTime . ')</small>';
+        $queryTime = number_format($this->getTotalQueryTime($timings) * 1000).' ms';
+        return $this->getName().' <small>('.$queryCount.' / '.$queryTime.')</small>';
     }
 
     /**

src/panels/LogPanel.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace bedezign\yii2\audit\panels;
 
-use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use Yii;
+use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use yii\debug\models\search\Log;
 use yii\grid\GridViewAsset;
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     public function getLabel()
     {
         $messageCount = isset($this->data['messages']) ? count($this->data['messages']) : 0;
-        return $this->getName() . ($messageCount ? ' <small>(' . $messageCount . ')</small>' : '');
+        return $this->getName().($messageCount ? ' <small>('.$messageCount.')</small>' : '');
     }
 
     /**

src/panels/MailPanel.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     /**
      * @param Event $event
-     * @return null|static
+     * @return AuditMail|null
      */
     public function record($event)
     {

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     public function init()
     {
         parent::init();
-        Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function ($event) {
+        Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function($event) {
             $this->record($event);
         });
     }
@@ -115,7 +115,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->_model->mails) . ')</small>';
+        return $this->getName().' <small>('.count($this->_model->mails).')</small>';
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -167,8 +167,9 @@
     public function cleanup($maxAge = null)
     {
         $maxAge = $maxAge !== null ? $maxAge : $this->maxAge;
-        if ($maxAge === null)
-            return false;
+        if ($maxAge === null) {
+                    return false;
+        }
         return AuditMail::deleteAll([
             '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days"))
         ]);

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,15 +2,15 @@
 
 namespace bedezign\yii2\audit\panels;
 
+use Swift_Message;
+use Swift_Mime_Attachment;
+use Swift_Mime_MimePart;
+use Yii;
 use bedezign\yii2\audit\Audit;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\components\panels\RendersSummaryChartTrait;
 use bedezign\yii2\audit\models\AuditMail;
 use bedezign\yii2\audit\models\AuditMailSearch;
-use Swift_Message;
-use Swift_Mime_Attachment;
-use Swift_Mime_MimePart;
-use Yii;
 use yii\base\Event;
 use yii\grid\GridViewAsset;
 use yii\mail\BaseMailer;

src/panels/ProfilingPanel.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace bedezign\yii2\audit\panels;
 
-use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use Yii;
+use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use yii\debug\models\search\Profile;
 use yii\grid\GridViewAsset;
 

Spacing +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@ 
     public function getLabel()
     {
         $memory = isset($this->data['memory']) ? sprintf('%.1f MB', $this->data['memory'] / 1048576) : '';
-        $time = isset($this->data['time']) ? number_format($this->data['time'] * 1000) . ' ms' : '';
-        return $this->getName() . ' <small>(' . $memory . ' / ' . $time . ')</small>';
+        $time = isset($this->data['time']) ? number_format($this->data['time'] * 1000).' ms' : '';
+        return $this->getName().' <small>('.$memory.' / '.$time.')</small>';
     }
 
     /**
@@ -38,7 +38,7 @@ 
             'dataProvider' => $dataProvider,
             'searchModel' => $searchModel,
             'memory' => isset($this->data['memory']) ? sprintf('%.1f MB', $this->data['memory'] / 1048576) : '',
-            'time' => isset($this->data['time']) ? number_format($this->data['time'] * 1000) . ' ms' : '',
+            'time' => isset($this->data['time']) ? number_format($this->data['time'] * 1000).' ms' : '',
         ]);
     }
 

src/panels/SoapPanel.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace bedezign\yii2\audit\panels;
 
 use Yii;
-use bedezign\yii2\audit\models\AuditError;
 use bedezign\yii2\audit\components\panels\DataStoragePanel;
 use yii\data\ArrayDataProvider;
 

Braces +3 added lines, -2 removed lines

@@ -35,8 +35,9 @@
     {
         $this->module->registerPanel($this);
 
-        if (!is_array($this->data))
-            $this->data = [];
+        if (!is_array($this->data)) {
+                    $this->data = [];
+        }
 
         if (isset($data['error'])) {
             $error = $this->module->exception($data['error']);

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->data) . ')</small>';
+        return $this->getName().' <small>('.count($this->data).')</small>';
     }
 
     /**

src/Audit.php

Spacing +3 added lines, -3 removed lines

@@ -135,9 +135,9 @@
         // 'audit/config',
 
         // These provide special functionality and get loaded to activate it
-        'audit/error',      // Links the extra error reporting functions (`exception()` and `errorMessage()`)
-        'audit/extra',      // Links the data functions (`data()`)
-        'audit/curl',       // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
+        'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`)
+        'audit/extra', // Links the data functions (`data()`)
+        'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
     ];
 
     /**

Braces +44 added lines, -33 removed lines

@@ -239,8 +239,9 @@ 
      */
     public function registerFunction($name, $callback)
     {
-        if (isset($this->_panelFunctions[$name]))
-            throw new InvalidParamException("The '$name'-function has already been defined.");
+        if (isset($this->_panelFunctions[$name])) {
+                    throw new InvalidParamException("The '$name'-function has already been defined.");
+        }
 
         $this->_panelFunctions[$name] = $callback;
     }
@@ -260,8 +261,9 @@ 
      */
     public function __call($name, $params)
     {
-        if (!isset($this->_panelFunctions[$name]))
-            throw new \yii\base\InvalidCallException("Unknown panel function '$name'");
+        if (!isset($this->_panelFunctions[$name])) {
+                    throw new \yii\base\InvalidCallException("Unknown panel function '$name'");
+        }
 
         return call_user_func_array($this->_panelFunctions[$name], $params);
     }
@@ -333,13 +335,15 @@ 
     public function getPanel($identifier)
     {
         $config = null;
-        if (isset($this->panels[$identifier]))
-            $config = $this->panels[$identifier];
-        elseif (isset($this->_corePanels[$identifier]))
-            $config = $this->_corePanels[$identifier];
+        if (isset($this->panels[$identifier])) {
+                    $config = $this->panels[$identifier];
+        } elseif (isset($this->_corePanels[$identifier])) {
+                    $config = $this->_corePanels[$identifier];
+        }
 
-        if (!$config)
-            throw new InvalidConfigException("'$identifier' is not a valid panel identifier");
+        if (!$config) {
+                    throw new InvalidConfigException("'$identifier' is not a valid panel identifier");
+        }
 
         if (is_array($config)) {
             $config['module'] = $this;
@@ -360,11 +364,11 @@ 
         foreach ($this->panels as $key => $value) {
             if (is_numeric($key)) {
                 // The $value contains the identifier of a core panel
-                if (!isset($this->_corePanels[$value]))
-                    throw new InvalidConfigException("'$value' is not a valid panel identifier");
+                if (!isset($this->_corePanels[$value])) {
+                                    throw new InvalidConfigException("'$value' is not a valid panel identifier");
+                }
                 $panels[$value] = $this->_corePanels[$value];
-            }
-            else {
+            } else {
                 // The key contains the identifier and the value is either a class name or a full array
                 $panels[$key] = is_string($value) ? ['class' => $value] : $value;
             }
@@ -374,10 +378,11 @@ 
         // We now need one more iteration to add core classes to the panels added via the merge, if needed
         array_walk($this->panels, function(&$value, $key) {
            if (!isset($value['class'])) {
-               if (isset($this->_corePanels[$key]))
-                   $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
-               else
-                   throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+               if (isset($this->_corePanels[$key])) {
+                                  $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
+               } else {
+                                  throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+               }
            }
         });
     }
@@ -389,18 +394,21 @@ 
     {
         foreach (Yii::$app->modules as $name => $module) {
             $class = null;
-            if (is_string($module))
-                $class = $module;
-            elseif (is_array($module)) {
-                if (isset($module['class']))
-                    $class = $module['class'];
-            } else
-                /** @var Module $module */
+            if (is_string($module)) {
+                            $class = $module;
+            } elseif (is_array($module)) {
+                if (isset($module['class'])) {
+                                    $class = $module['class'];
+                }
+            } else {
+                            /** @var Module $module */
                 $class = $module::className();
+            }
 
             $parts = explode('\\', $class);
-            if ($class && strtolower(end($parts)) == 'audit')
-                return $name;
+            if ($class && strtolower(end($parts)) == 'audit') {
+                            return $name;
+            }
         }
         return null;
     }
@@ -436,18 +444,21 @@ 
             $len = strlen($compare);
             if ($compare[$len - 1] == '*') {
                 $compare = rtrim($compare, '*');
-                if (substr($route, 0, $len - 1) === $compare)
-                    return true;
+                if (substr($route, 0, $len - 1) === $compare) {
+                                    return true;
+                }
             }
 
             if ($compare[0] == '*') {
                 $compare = ltrim($compare, '*');
-                if (substr($route, - ($len - 1)) === $compare)
-                    return true;
+                if (substr($route, - ($len - 1)) === $compare) {
+                                    return true;
+                }
             }
 
-            if ($route === $compare)
-                return true;
+            if ($route === $compare) {
+                            return true;
+            }
         }
         return false;
     }

Doc Comments +3 added lines

@@ -240,6 +240,9 @@
         $this->panels = $this->loadPanels(array_keys($this->panels));
     }
 
+    /**
+     * @param ActionEvent $event
+     */
     public function shouldTrack($event, $isError = false)
     {
         $trackActions = $isError ? $this->trackErrorActions : $this->trackActions;

Unused Use Statements +1 added lines, -1 removed lines

@@ -10,9 +10,9 @@
 
 namespace bedezign\yii2\audit;
 
+use Yii;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\models\AuditEntry;
-use Yii;
 use yii\base\ActionEvent;
 use yii\base\Application;
 use yii\base\InvalidConfigException;

Indentation +10 added lines, -10 removed lines

@@ -176,7 +176,7 @@ 
     // Things required to keep the module yii2-debug compatible
     /* @see \yii\debug\Module::$traceLine (since 2.0.7) */
     public $traceLine = \yii\debug\Module::DEFAULT_IDE_TRACELINE;
-     /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */
+        /* @see \yii\debug\Module::$tracePathMappings (since 2.1.6) */
     public $tracePathMappings = [];
 
     /**
@@ -350,9 +350,9 @@ 
         // This code assumes the audit module is already loaded and can thus look for a derived instance
         $loadedModules = Yii::$app->loadedModules;
         foreach ($loadedModules as $module) {
-             if ($module instanceof self) {
-                 return self::$_me = $module;
-             }
+                if ($module instanceof self) {
+                    return self::$_me = $module;
+                }
         }
 
         // If we're still here, fall back onto the default implementation
@@ -482,12 +482,12 @@ 
 
         // We now need one more iteration to add core classes to the panels added via the merge, if needed
         array_walk($this->panels, function(&$value, $key) {
-           if (!isset($value['class'])) {
-               if (isset($this->_corePanels[$key]))
-                   $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
-               else
-                   throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
-           }
+            if (!isset($value['class'])) {
+                if (isset($this->_corePanels[$key]))
+                    $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
+                else
+                    throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+            }
         });
     }
 

src/components/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
     {
         $data = ArrayHelper::toArray($data);
         if ($simplify)
-            array_walk($data, function (&$value) {
+            array_walk($data, function(&$value) {
                 if (is_array($value) && count($value) == 1) $value = reset($value);
             });
 
@@ -167,7 +167,7 @@ 
             if (is_object($value)) {
                 $class = get_class($value);
                 // By default we just mention the object type
-                $args[$name] = 'Object(' . $class . ')';
+                $args[$name] = 'Object('.$class.')';
 
                 if ($recurseDepth > 0) {
                     // Make sure to limit the toArray to non recursive, it's much to easy to get stuck in an infinite loop
@@ -198,7 +198,7 @@ 
         $hash = bcadd(sprintf('%u', crc32($data)), 0x100000000);
         $str = '';
         do {
-            $str = $map[bcmod($hash, 62)] . $str;
+            $str = $map[bcmod($hash, 62)].$str;
             $hash = bcdiv($hash, 62);
         } while ($hash >= 1);
         return $str;

Braces +53 added lines, -35 removed lines

@@ -23,8 +23,9 @@ 
      */
     public static function serialize($data, $compact = true)
     {
-        if ($compact)
-            $data = self::compact($data);
+        if ($compact) {
+                    $data = self::compact($data);
+        }
 
         $data = serialize($data);
         $data = self::compress($data);
@@ -39,19 +40,22 @@ 
      */
     public static function unserialize($data)
     {
-        if (is_resource($data))
-            // For some databases (like Postgres) binary columns return as a resource, fetch the content first
+        if (is_resource($data)) {
+                    // For some databases (like Postgres) binary columns return as a resource, fetch the content first
             $data = stream_get_contents($data, -1, 0);
+        }
 
         $originalData = $data;
         $data = self::uncompress($data);
 
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         $data = @unserialize($data);
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         return $data;
     }
@@ -63,8 +67,9 @@ 
      */
     public static function compress($data)
     {
-        if (Audit::getInstance()->compressData)
-            $data = gzcompress($data);
+        if (Audit::getInstance()->compressData) {
+                    $data = gzcompress($data);
+        }
         return $data;
     }
 
@@ -90,15 +95,17 @@ 
     public static function compact($data, $simplify = false, $threshold = 512)
     {
         $data = ArrayHelper::toArray($data);
-        if ($simplify)
-            array_walk($data, function (&$value) {
+        if ($simplify) {
+                    array_walk($data, function (&$value) {
                 if (is_array($value) && count($value) == 1) $value = reset($value);
+        }
             });
 
         $tooBig = [];
-        foreach ($data as $index => $value)
-            if (strlen(serialize($value)) > $threshold)
+        foreach ($data as $index => $value) {
+                    if (strlen(serialize($value)) > $threshold)
                 $tooBig[] = $index;
+        }
 
         if (count($tooBig)) {
             $data = array_diff_key($data, array_flip($tooBig));
@@ -117,8 +124,9 @@ 
     {
         $trace = debug_backtrace();
         array_pop($trace); // remove the last trace since it would be the entry script, not very useful
-        if ($skip > 0)
-            $trace = array_slice($trace, $skip);
+        if ($skip > 0) {
+                    $trace = array_slice($trace, $skip);
+        }
         return self::cleanupTrace($trace);
     }
 
@@ -130,8 +138,9 @@ 
      */
     public static function cleanupTrace($trace)
     {
-        if (!is_array($trace))
-            return [];
+        if (!is_array($trace)) {
+                    return [];
+        }
 
         foreach ($trace as $n => $call) {
             $call['file'] = isset($call['file']) ? $call['file'] : 'unknown';
@@ -140,14 +149,18 @@ 
             $call['file'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $call['file']);
 
             // XDebug
-            if (isset($call['params'])) unset($call['params']);
+            if (isset($call['params'])) {
+                unset($call['params']);
+            }
 
             // Trace entry contains the class instance, also compact and include this
-            if (isset($call['object']))
-                $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            if (isset($call['object'])) {
+                            $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            }
 
-            if (isset($call['args']))
-                $call['args'] = self::cleanupTraceArguments($call['args']);
+            if (isset($call['args'])) {
+                            $call['args'] = self::cleanupTraceArguments($call['args']);
+            }
 
             $trace[$n] = $call;
         }
@@ -176,10 +189,11 @@ 
                     $args[$name] = $object;
                 }
             } else if (is_array($value)) {
-                if ($recurseDepth > 0)
-                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
-                else
-                    $args[$name] = 'Array';
+                if ($recurseDepth > 0) {
+                                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
+                } else {
+                                    $args[$name] = 'Array';
+                }
             }
         }
         return $args;
@@ -212,8 +226,9 @@ 
     public static function formatAsQuery($data)
     {
         $data = rawurldecode($data);
-        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data))
-            return null;
+        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) {
+                    return null;
+        }
 
         $result = [];
         parse_str($data, $result);
@@ -241,8 +256,9 @@ 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadXML($data))
-            return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadXML($data)) {
+                    return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 
@@ -253,14 +269,16 @@ 
      */
     public static function formatAsHTML($data)
     {
-        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml')
-            return null;
+        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') {
+                    return null;
+        }
 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadHTML($data))
-            return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadHTML($data)) {
+                    return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 }
\ No newline at end of file