diff --git a/Utils/StringUtils.php b/Utils/StringUtils.php
index c4f281a03..d3816beff 100644
--- a/Utils/StringUtils.php
+++ b/Utils/StringUtils.php
@@ -291,7 +291,11 @@ final class StringUtils
         }
 
         // @todo: this should not be necessary
-        return \str_replace(['<ins></ins>', '<del></del>', '</ins><ins>', '</del><del>'], ['', '', '', ''], $result);
+        return \str_replace(
+            ['</del></del>', '</ins></ins>', '<ins></ins>', '<del></del>', '</ins><ins>', '</del><del>', '</ins> <del>', '</del> <ins>'],
+            ['', '', '', '', '', '', '</ins><del>', '</del><ins>'],
+            $result
+        );
     }
 
     /**
diff --git a/Views/View.php b/Views/View.php
index c383c0b14..1a2bdb842 100644
--- a/Views/View.php
+++ b/Views/View.php
@@ -274,12 +274,12 @@ class View extends ViewAbstract
 
         $start = $start + \strlen($match);
         if (\strlen($this->template) < $start) {
-            throw new InvalidModuleException($this->template);
+            throw new InvalidThemeException($this->template);
         }
 
         $end = \strpos($this->template, '/', $start);
         if ($end === false) {
-            throw new InvalidModuleException($this->template);
+            throw new InvalidThemeException($this->template);
         }
 
         $this->theme = \substr($this->template, $start, $end - $start);
diff --git a/tests/Message/Mail/MailHandlerSmtpTrait.php b/tests/Message/Mail/MailHandlerSmtpTrait.php
index c81cade82..8d2156e9c 100644
--- a/tests/Message/Mail/MailHandlerSmtpTrait.php
+++ b/tests/Message/Mail/MailHandlerSmtpTrait.php
@@ -33,7 +33,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -66,7 +69,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -104,7 +110,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -131,7 +140,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -156,7 +168,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -181,7 +196,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -209,7 +227,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -235,7 +256,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -260,7 +284,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -286,7 +313,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -316,7 +346,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -346,7 +379,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
@@ -407,7 +443,10 @@ trait MailHandlerSmtpTrait
         $smtp                = new Smtp();
         $this->handler->smtp = $smtp;
 
-        if ($this->handler->mailerTool !== '' && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])) {
+        if ($this->handler->mailerTool !== ''
+            && !\file_exists(\explode(' ', $this->handler->mailerTool)[0])
+            && ($this->handler->smtp === null || !$this->handler->smtpConnect($this->handler->smtpOptions))
+        ) {
             self::markTestSkipped();
         }
 
diff --git a/tests/Uri/ArgumentTest.php b/tests/Uri/ArgumentTest.php
index 42a7d3b14..59b4f2fac 100644
--- a/tests/Uri/ArgumentTest.php
+++ b/tests/Uri/ArgumentTest.php
@@ -185,7 +185,7 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase
 
         self::assertEquals('?para1=abc ?para2=2 #frag', $obj->getQuery());
         self::assertEquals(['?para1=abc', '?para2=2', '#frag'], $obj->getQueryArray());
-        self::assertEquals('?para1=abc', $obj->getQuery('1'));
+        self::assertEquals('?para2=2', $obj->getQuery('1'));
     }
 
     /**
diff --git a/tests/coverage.xml b/tests/coverage.xml
index 2308ec344..6828db727 100644
--- a/tests/coverage.xml
+++ b/tests/coverage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1664487950">
-  <project timestamp="1664487950">
+<coverage generated="1664543892">
+  <project timestamp="1664543892">
     <file name="/home/spl1nes/Orange-Management/phpOMS/Account/Account.php">
       <class name="phpOMS\Account\Account" namespace="global">
         <metrics complexity="25" methods="18" coveredmethods="17" conditionals="0" coveredconditionals="0" statements="41" coveredstatements="40" elements="59" coveredelements="57"/>
@@ -425,7 +425,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Algorithm/Clustering/Kmeans.php">
       <class name="phpOMS\Algorithm\Clustering\Kmeans" namespace="global">
-        <metrics complexity="29" methods="6" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="68" coveredstatements="65" elements="74" coveredelements="69"/>
+        <metrics complexity="29" methods="6" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="68" coveredstatements="67" elements="74" coveredelements="72"/>
       </class>
       <line num="60" type="method" name="__construct" visibility="public" complexity="2" crap="2" count="1"/>
       <line num="62" type="stmt" count="1"/>
@@ -447,7 +447,7 @@
       <line num="100" type="stmt" count="1"/>
       <line num="110" type="method" name="getCentroids" visibility="public" complexity="1" crap="2" count="0"/>
       <line num="112" type="stmt" count="0"/>
-      <line num="125" type="method" name="generateClusters" visibility="private" complexity="14" crap="14.07" count="1"/>
+      <line num="125" type="method" name="generateClusters" visibility="private" complexity="14" crap="14" count="1"/>
       <line num="127" type="stmt" count="1"/>
       <line num="128" type="stmt" count="1"/>
       <line num="129" type="stmt" count="1"/>
@@ -468,8 +468,8 @@
       <line num="159" type="stmt" count="1"/>
       <line num="160" type="stmt" count="1"/>
       <line num="162" type="stmt" count="1"/>
-      <line num="163" type="stmt" count="0"/>
-      <line num="164" type="stmt" count="0"/>
+      <line num="163" type="stmt" count="1"/>
+      <line num="164" type="stmt" count="1"/>
       <line num="168" type="stmt" count="1"/>
       <line num="169" type="stmt" count="1"/>
       <line num="173" type="stmt" count="1"/>
@@ -501,7 +501,7 @@
       <line num="242" type="stmt" count="1"/>
       <line num="243" type="stmt" count="1"/>
       <line num="246" type="stmt" count="1"/>
-      <metrics loc="249" ncloc="155" classes="1" methods="6" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="68" coveredstatements="65" elements="74" coveredelements="69"/>
+      <metrics loc="249" ncloc="155" classes="1" methods="6" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="68" coveredstatements="67" elements="74" coveredelements="72"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Algorithm/Clustering/Point.php">
       <class name="phpOMS\Algorithm\Clustering\Point" namespace="global">
@@ -14437,7 +14437,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Stdlib/Base/SmartDateTime.php">
       <class name="phpOMS\Stdlib\Base\SmartDateTime" namespace="global">
-        <metrics complexity="34" methods="17" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="67" coveredstatements="65" elements="84" coveredelements="81"/>
+        <metrics complexity="34" methods="17" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="67" coveredstatements="66" elements="84" coveredelements="82"/>
       </class>
       <line num="55" type="method" name="__construct" visibility="public" complexity="1" crap="1" count="15"/>
       <line num="57" type="stmt" count="15"/>
@@ -14450,7 +14450,7 @@
       <line num="94" type="stmt" count="2"/>
       <line num="95" type="stmt" count="2"/>
       <line num="97" type="stmt" count="2"/>
-      <line num="112" type="method" name="smartModify" visibility="public" complexity="9" crap="9.13" count="2"/>
+      <line num="112" type="method" name="smartModify" visibility="public" complexity="9" crap="9.02" count="2"/>
       <line num="114" type="stmt" count="2"/>
       <line num="115" type="stmt" count="2"/>
       <line num="116" type="stmt" count="2"/>
@@ -14462,8 +14462,8 @@
       <line num="123" type="stmt" count="2"/>
       <line num="124" type="stmt" count="0"/>
       <line num="125" type="stmt" count="2"/>
-      <line num="126" type="stmt" count="0"/>
-      <line num="128" type="stmt" count="2"/>
+      <line num="126" type="stmt" count="1"/>
+      <line num="128" type="stmt" count="1"/>
       <line num="131" type="stmt" count="2"/>
       <line num="133" type="stmt" count="2"/>
       <line num="134" type="stmt" count="1"/>
@@ -14523,7 +14523,7 @@
       <line num="359" type="stmt" count="1"/>
       <line num="360" type="stmt" count="1"/>
       <line num="363" type="stmt" count="1"/>
-      <metrics loc="366" ncloc="186" classes="1" methods="17" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="67" coveredstatements="65" elements="84" coveredelements="81"/>
+      <metrics loc="366" ncloc="186" classes="1" methods="17" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="67" coveredstatements="66" elements="84" coveredelements="82"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Stdlib/Graph/Edge.php">
       <class name="phpOMS\Stdlib\Graph\Edge" namespace="global">
@@ -15238,7 +15238,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/System/File/Ftp/Directory.php">
       <class name="phpOMS\System\File\Ftp\Directory" namespace="global">
-        <metrics complexity="144" methods="43" coveredmethods="22" conditionals="0" coveredconditionals="0" statements="254" coveredstatements="178" elements="297" coveredelements="200"/>
+        <metrics complexity="145" methods="43" coveredmethods="22" conditionals="0" coveredconditionals="0" statements="256" coveredstatements="179" elements="299" coveredelements="201"/>
       </class>
       <line num="62" type="method" name="ftpConnect" visibility="public" complexity="3" crap="3" count="8"/>
       <line num="64" type="stmt" count="8"/>
@@ -15381,163 +15381,165 @@
       <line num="403" type="stmt" count="2"/>
       <line num="404" type="stmt" count="1"/>
       <line num="407" type="stmt" count="1"/>
-      <line num="413" type="method" name="copy" visibility="public" complexity="9" crap="29.41" count="8"/>
+      <line num="413" type="method" name="copy" visibility="public" complexity="10" crap="33.72" count="8"/>
       <line num="415" type="stmt" count="8"/>
       <line num="416" type="stmt" count="8"/>
       <line num="418" type="stmt" count="2"/>
       <line num="421" type="stmt" count="6"/>
       <line num="422" type="stmt" count="6"/>
-      <line num="423" type="stmt" count="6"/>
-      <line num="424" type="stmt" count="6"/>
-      <line num="427" type="stmt" count="0"/>
-      <line num="429" type="stmt" count="0"/>
-      <line num="430" type="stmt" count="0"/>
+      <line num="423" type="stmt" count="0"/>
+      <line num="426" type="stmt" count="6"/>
+      <line num="427" type="stmt" count="6"/>
+      <line num="428" type="stmt" count="6"/>
       <line num="431" type="stmt" count="0"/>
+      <line num="433" type="stmt" count="0"/>
       <line num="434" type="stmt" count="0"/>
-      <line num="437" type="stmt" count="0"/>
-      <line num="439" type="stmt" count="0"/>
-      <line num="440" type="stmt" count="0"/>
+      <line num="435" type="stmt" count="0"/>
+      <line num="438" type="stmt" count="0"/>
       <line num="441" type="stmt" count="0"/>
+      <line num="443" type="stmt" count="0"/>
       <line num="444" type="stmt" count="0"/>
-      <line num="447" type="stmt" count="0"/>
-      <line num="449" type="stmt" count="0"/>
-      <line num="463" type="method" name="get" visibility="public" complexity="5" crap="30" count="0"/>
-      <line num="465" type="stmt" count="0"/>
-      <line num="466" type="stmt" count="0"/>
+      <line num="445" type="stmt" count="0"/>
+      <line num="448" type="stmt" count="0"/>
+      <line num="451" type="stmt" count="0"/>
+      <line num="453" type="stmt" count="0"/>
+      <line num="467" type="method" name="get" visibility="public" complexity="5" crap="30" count="0"/>
       <line num="469" type="stmt" count="0"/>
       <line num="470" type="stmt" count="0"/>
       <line num="473" type="stmt" count="0"/>
       <line num="474" type="stmt" count="0"/>
-      <line num="475" type="stmt" count="0"/>
-      <line num="476" type="stmt" count="0"/>
+      <line num="477" type="stmt" count="0"/>
       <line num="478" type="stmt" count="0"/>
+      <line num="479" type="stmt" count="0"/>
+      <line num="480" type="stmt" count="0"/>
       <line num="482" type="stmt" count="0"/>
-      <line num="496" type="method" name="put" visibility="public" complexity="9" crap="90" count="0"/>
-      <line num="498" type="stmt" count="0"/>
-      <line num="499" type="stmt" count="0"/>
+      <line num="486" type="stmt" count="0"/>
+      <line num="500" type="method" name="put" visibility="public" complexity="9" crap="90" count="0"/>
       <line num="502" type="stmt" count="0"/>
       <line num="503" type="stmt" count="0"/>
       <line num="506" type="stmt" count="0"/>
       <line num="507" type="stmt" count="0"/>
-      <line num="508" type="stmt" count="0"/>
+      <line num="510" type="stmt" count="0"/>
       <line num="511" type="stmt" count="0"/>
       <line num="512" type="stmt" count="0"/>
-      <line num="513" type="stmt" count="0"/>
+      <line num="515" type="stmt" count="0"/>
       <line num="516" type="stmt" count="0"/>
-      <line num="518" type="stmt" count="0"/>
-      <line num="519" type="stmt" count="0"/>
-      <line num="521" type="stmt" count="0"/>
+      <line num="517" type="stmt" count="0"/>
+      <line num="520" type="stmt" count="0"/>
+      <line num="522" type="stmt" count="0"/>
       <line num="523" type="stmt" count="0"/>
-      <line num="524" type="stmt" count="0"/>
-      <line num="529" type="stmt" count="0"/>
-      <line num="544" type="method" name="move" visibility="public" complexity="7" crap="8.32" count="5"/>
-      <line num="546" type="stmt" count="5"/>
-      <line num="547" type="stmt" count="5"/>
-      <line num="549" type="stmt" count="2"/>
-      <line num="552" type="stmt" count="3"/>
-      <line num="553" type="stmt" count="0"/>
+      <line num="525" type="stmt" count="0"/>
+      <line num="527" type="stmt" count="0"/>
+      <line num="528" type="stmt" count="0"/>
+      <line num="533" type="stmt" count="0"/>
+      <line num="548" type="method" name="move" visibility="public" complexity="7" crap="8.32" count="5"/>
+      <line num="550" type="stmt" count="5"/>
+      <line num="551" type="stmt" count="5"/>
+      <line num="553" type="stmt" count="2"/>
       <line num="556" type="stmt" count="3"/>
-      <line num="558" type="stmt" count="3"/>
-      <line num="559" type="stmt" count="3"/>
-      <line num="562" type="stmt" count="0"/>
-      <line num="564" type="stmt" count="0"/>
-      <line num="570" type="method" name="sanitize" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="572" type="stmt" count="1"/>
-      <line num="578" type="method" name="dirname" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="580" type="stmt" count="1"/>
-      <line num="586" type="method" name="dirpath" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="588" type="stmt" count="1"/>
-      <line num="594" type="method" name="name" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="596" type="stmt" count="1"/>
-      <line num="602" type="method" name="basename" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="604" type="stmt" count="1"/>
-      <line num="610" type="method" name="getNode" visibility="public" complexity="4" crap="4" count="3"/>
-      <line num="612" type="stmt" count="3"/>
-      <line num="614" type="stmt" count="3"/>
-      <line num="615" type="stmt" count="3"/>
+      <line num="557" type="stmt" count="0"/>
+      <line num="560" type="stmt" count="3"/>
+      <line num="562" type="stmt" count="3"/>
+      <line num="563" type="stmt" count="3"/>
+      <line num="566" type="stmt" count="0"/>
+      <line num="568" type="stmt" count="0"/>
+      <line num="574" type="method" name="sanitize" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="576" type="stmt" count="1"/>
+      <line num="582" type="method" name="dirname" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="584" type="stmt" count="1"/>
+      <line num="590" type="method" name="dirpath" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="592" type="stmt" count="1"/>
+      <line num="598" type="method" name="name" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="600" type="stmt" count="1"/>
+      <line num="606" type="method" name="basename" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="608" type="stmt" count="1"/>
+      <line num="614" type="method" name="getNode" visibility="public" complexity="4" crap="4" count="3"/>
+      <line num="616" type="stmt" count="3"/>
       <line num="618" type="stmt" count="3"/>
-      <line num="624" type="method" name="createNode" visibility="public" complexity="2" crap="2.15" count="25"/>
-      <line num="626" type="stmt" count="25"/>
-      <line num="627" type="stmt" count="0"/>
+      <line num="619" type="stmt" count="3"/>
+      <line num="622" type="stmt" count="3"/>
+      <line num="628" type="method" name="createNode" visibility="public" complexity="2" crap="2.15" count="25"/>
       <line num="630" type="stmt" count="25"/>
-      <line num="636" type="method" name="addNode" visibility="public" complexity="1" crap="1" count="23"/>
-      <line num="638" type="stmt" count="23"/>
-      <line num="639" type="stmt" count="23"/>
-      <line num="640" type="stmt" count="23"/>
+      <line num="631" type="stmt" count="0"/>
+      <line num="634" type="stmt" count="25"/>
+      <line num="640" type="method" name="addNode" visibility="public" complexity="1" crap="1" count="23"/>
       <line num="642" type="stmt" count="23"/>
+      <line num="643" type="stmt" count="23"/>
       <line num="644" type="stmt" count="23"/>
-      <line num="650" type="method" name="getParent" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="652" type="stmt" count="1"/>
-      <line num="653" type="stmt" count="1"/>
-      <line num="655" type="stmt" count="1"/>
-      <line num="661" type="method" name="copyNode" visibility="public" complexity="2" crap="2.15" count="1"/>
-      <line num="663" type="stmt" count="1"/>
-      <line num="664" type="stmt" count="0"/>
+      <line num="646" type="stmt" count="23"/>
+      <line num="648" type="stmt" count="23"/>
+      <line num="654" type="method" name="getParent" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="656" type="stmt" count="1"/>
+      <line num="657" type="stmt" count="1"/>
+      <line num="659" type="stmt" count="1"/>
+      <line num="665" type="method" name="copyNode" visibility="public" complexity="2" crap="2.15" count="1"/>
       <line num="667" type="stmt" count="1"/>
-      <line num="673" type="method" name="moveNode" visibility="public" complexity="2" crap="2.15" count="1"/>
-      <line num="675" type="stmt" count="1"/>
-      <line num="676" type="stmt" count="0"/>
+      <line num="668" type="stmt" count="0"/>
+      <line num="671" type="stmt" count="1"/>
+      <line num="677" type="method" name="moveNode" visibility="public" complexity="2" crap="2.15" count="1"/>
       <line num="679" type="stmt" count="1"/>
-      <line num="685" type="method" name="deleteNode" visibility="public" complexity="2" crap="6" count="0"/>
-      <line num="687" type="stmt" count="0"/>
-      <line num="688" type="stmt" count="0"/>
-      <line num="693" type="stmt" count="0"/>
-      <line num="699" type="method" name="rewind" visibility="public" complexity="1" crap="2" count="0"/>
-      <line num="701" type="stmt" count="0"/>
-      <line num="707" type="method" name="current" visibility="public" complexity="3" crap="3" count="6"/>
-      <line num="709" type="stmt" count="6"/>
-      <line num="710" type="stmt" count="6"/>
-      <line num="711" type="stmt" count="1"/>
+      <line num="680" type="stmt" count="0"/>
+      <line num="683" type="stmt" count="1"/>
+      <line num="689" type="method" name="deleteNode" visibility="public" complexity="2" crap="6" count="0"/>
+      <line num="691" type="stmt" count="0"/>
+      <line num="692" type="stmt" count="0"/>
+      <line num="697" type="stmt" count="0"/>
+      <line num="703" type="method" name="rewind" visibility="public" complexity="1" crap="2" count="0"/>
+      <line num="705" type="stmt" count="0"/>
+      <line num="711" type="method" name="current" visibility="public" complexity="3" crap="3" count="6"/>
+      <line num="713" type="stmt" count="6"/>
       <line num="714" type="stmt" count="6"/>
-      <line num="720" type="method" name="key" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="722" type="stmt" count="1"/>
-      <line num="728" type="method" name="next" visibility="public" complexity="2" crap="2.15" count="8"/>
-      <line num="730" type="stmt" count="8"/>
-      <line num="731" type="stmt" count="8"/>
-      <line num="732" type="stmt" count="0"/>
-      <line num="739" type="method" name="valid" visibility="public" complexity="2" crap="2" count="2"/>
-      <line num="741" type="stmt" count="2"/>
-      <line num="743" type="stmt" count="2"/>
-      <line num="749" type="method" name="offsetSet" visibility="public" complexity="3" crap="4.12" count="1"/>
-      <line num="752" type="stmt" count="1"/>
-      <line num="753" type="stmt" count="1"/>
-      <line num="755" type="stmt" count="0"/>
-      <line num="756" type="stmt" count="0"/>
-      <line num="763" type="method" name="offsetExists" visibility="public" complexity="2" crap="2" count="1"/>
-      <line num="765" type="stmt" count="1"/>
-      <line num="767" type="stmt" count="1"/>
-      <line num="773" type="method" name="offsetUnset" visibility="public" complexity="3" crap="12" count="0"/>
-      <line num="775" type="stmt" count="0"/>
-      <line num="777" type="stmt" count="0"/>
-      <line num="778" type="stmt" count="0"/>
-      <line num="780" type="stmt" count="0"/>
-      <line num="787" type="method" name="offsetGet" visibility="public" complexity="3" crap="3.33" count="1"/>
-      <line num="789" type="stmt" count="1"/>
-      <line num="790" type="stmt" count="0"/>
+      <line num="715" type="stmt" count="1"/>
+      <line num="718" type="stmt" count="6"/>
+      <line num="724" type="method" name="key" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="726" type="stmt" count="1"/>
+      <line num="732" type="method" name="next" visibility="public" complexity="2" crap="2.15" count="8"/>
+      <line num="734" type="stmt" count="8"/>
+      <line num="735" type="stmt" count="8"/>
+      <line num="736" type="stmt" count="0"/>
+      <line num="743" type="method" name="valid" visibility="public" complexity="2" crap="2" count="2"/>
+      <line num="745" type="stmt" count="2"/>
+      <line num="747" type="stmt" count="2"/>
+      <line num="753" type="method" name="offsetSet" visibility="public" complexity="3" crap="4.12" count="1"/>
+      <line num="756" type="stmt" count="1"/>
+      <line num="757" type="stmt" count="1"/>
+      <line num="759" type="stmt" count="0"/>
+      <line num="760" type="stmt" count="0"/>
+      <line num="767" type="method" name="offsetExists" visibility="public" complexity="2" crap="2" count="1"/>
+      <line num="769" type="stmt" count="1"/>
+      <line num="771" type="stmt" count="1"/>
+      <line num="777" type="method" name="offsetUnset" visibility="public" complexity="3" crap="12" count="0"/>
+      <line num="779" type="stmt" count="0"/>
+      <line num="781" type="stmt" count="0"/>
+      <line num="782" type="stmt" count="0"/>
+      <line num="784" type="stmt" count="0"/>
+      <line num="791" type="method" name="offsetGet" visibility="public" complexity="3" crap="3.33" count="1"/>
       <line num="793" type="stmt" count="1"/>
-      <line num="805" type="method" name="isExisting" visibility="public" complexity="3" crap="3" count="1"/>
-      <line num="807" type="stmt" count="1"/>
-      <line num="808" type="stmt" count="1"/>
+      <line num="794" type="stmt" count="0"/>
+      <line num="797" type="stmt" count="1"/>
+      <line num="809" type="method" name="isExisting" visibility="public" complexity="3" crap="3" count="1"/>
       <line num="811" type="stmt" count="1"/>
-      <line num="813" type="stmt" count="1"/>
-      <line num="819" type="method" name="getList" visibility="public" complexity="2" crap="2" count="1"/>
-      <line num="821" type="stmt" count="1"/>
-      <line num="822" type="stmt" count="1"/>
-      <line num="824" type="stmt" count="1"/>
+      <line num="812" type="stmt" count="1"/>
+      <line num="815" type="stmt" count="1"/>
+      <line num="817" type="stmt" count="1"/>
+      <line num="823" type="method" name="getList" visibility="public" complexity="2" crap="2" count="1"/>
       <line num="825" type="stmt" count="1"/>
+      <line num="826" type="stmt" count="1"/>
       <line num="828" type="stmt" count="1"/>
-      <line num="844" type="method" name="listByExtension" visibility="public" complexity="6" crap="6.04" count="2"/>
-      <line num="846" type="stmt" count="2"/>
-      <line num="847" type="stmt" count="2"/>
-      <line num="849" type="stmt" count="2"/>
-      <line num="850" type="stmt" count="1"/>
-      <line num="853" type="stmt" count="1"/>
-      <line num="855" type="stmt" count="1"/>
-      <line num="856" type="stmt" count="1"/>
-      <line num="857" type="stmt" count="0"/>
+      <line num="829" type="stmt" count="1"/>
+      <line num="832" type="stmt" count="1"/>
+      <line num="848" type="method" name="listByExtension" visibility="public" complexity="6" crap="6.04" count="2"/>
+      <line num="850" type="stmt" count="2"/>
+      <line num="851" type="stmt" count="2"/>
+      <line num="853" type="stmt" count="2"/>
+      <line num="854" type="stmt" count="1"/>
+      <line num="857" type="stmt" count="1"/>
+      <line num="859" type="stmt" count="1"/>
       <line num="860" type="stmt" count="1"/>
-      <line num="863" type="stmt" count="1"/>
-      <metrics loc="866" ncloc="620" classes="1" methods="43" coveredmethods="22" conditionals="0" coveredconditionals="0" statements="254" coveredstatements="178" elements="297" coveredelements="200"/>
+      <line num="861" type="stmt" count="0"/>
+      <line num="864" type="stmt" count="1"/>
+      <line num="867" type="stmt" count="1"/>
+      <metrics loc="870" ncloc="624" classes="1" methods="43" coveredmethods="22" conditionals="0" coveredconditionals="0" statements="256" coveredstatements="179" elements="299" coveredelements="201"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/System/File/Ftp/File.php">
       <class name="phpOMS\System\File\Ftp\File" namespace="global">
@@ -16604,7 +16606,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Uri/Argument.php">
       <class name="phpOMS\Uri\Argument" namespace="global">
-        <metrics complexity="26" methods="19" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="44" coveredstatements="40" elements="63" coveredelements="56"/>
+        <metrics complexity="26" methods="19" coveredmethods="18" conditionals="0" coveredconditionals="0" statements="44" coveredstatements="43" elements="63" coveredelements="61"/>
       </class>
       <line num="158" type="method" name="__construct" visibility="public" complexity="1" crap="1" count="14"/>
       <line num="160" type="stmt" count="14"/>
@@ -16650,15 +16652,15 @@
       <line num="297" type="stmt" count="1"/>
       <line num="299" type="stmt" count="1"/>
       <line num="300" type="stmt" count="1"/>
-      <line num="306" type="method" name="getQuery" visibility="public" complexity="2" crap="2.50" count="2"/>
+      <line num="306" type="method" name="getQuery" visibility="public" complexity="2" crap="2" count="2"/>
       <line num="308" type="stmt" count="2"/>
-      <line num="309" type="stmt" count="0"/>
-      <line num="311" type="stmt" count="0"/>
+      <line num="309" type="stmt" count="1"/>
+      <line num="311" type="stmt" count="1"/>
       <line num="314" type="stmt" count="2"/>
       <line num="320" type="method" name="getPathElement" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="322" type="stmt" count="1"/>
-      <line num="328" type="method" name="getPathElements" visibility="public" complexity="1" crap="2" count="0"/>
-      <line num="330" type="stmt" count="0"/>
+      <line num="328" type="method" name="getPathElements" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="330" type="stmt" count="1"/>
       <line num="336" type="method" name="getQueryArray" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="338" type="stmt" count="1"/>
       <line num="344" type="method" name="getBase" visibility="public" complexity="1" crap="1" count="1"/>
@@ -16669,7 +16671,7 @@
       <line num="362" type="stmt" count="1"/>
       <line num="368" type="method" name="getUserInfo" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="370" type="stmt" count="1"/>
-      <metrics loc="373" ncloc="175" classes="1" methods="19" coveredmethods="16" conditionals="0" coveredconditionals="0" statements="44" coveredstatements="40" elements="63" coveredelements="56"/>
+      <metrics loc="373" ncloc="175" classes="1" methods="19" coveredmethods="18" conditionals="0" coveredconditionals="0" statements="44" coveredstatements="43" elements="63" coveredelements="61"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Uri/HttpUri.php">
       <class name="phpOMS\Uri\HttpUri" namespace="global">
@@ -20051,7 +20053,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/RnG/Text.php">
       <class name="phpOMS\Utils\RnG\Text" namespace="global">
-        <metrics complexity="43" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="100" coveredstatements="99" elements="105" coveredelements="103"/>
+        <metrics complexity="43" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="100" coveredstatements="98" elements="105" coveredelements="102"/>
       </class>
       <line num="84" type="method" name="__construct" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="86" type="stmt" count="1"/>
@@ -20099,7 +20101,7 @@
       <line num="174" type="stmt" count="1"/>
       <line num="175" type="stmt" count="1"/>
       <line num="178" type="stmt" count="1"/>
-      <line num="190" type="method" name="generatePunctuation" visibility="private" complexity="14" crap="14" count="1"/>
+      <line num="190" type="method" name="generatePunctuation" visibility="private" complexity="14" crap="14.05" count="1"/>
       <line num="192" type="stmt" count="1"/>
       <line num="193" type="stmt" count="1"/>
       <line num="194" type="stmt" count="1"/>
@@ -20118,8 +20120,8 @@
       <line num="214" type="stmt" count="1"/>
       <line num="216" type="stmt" count="1"/>
       <line num="218" type="stmt" count="1"/>
-      <line num="219" type="stmt" count="1"/>
-      <line num="220" type="stmt" count="1"/>
+      <line num="219" type="stmt" count="0"/>
+      <line num="220" type="stmt" count="0"/>
       <line num="224" type="stmt" count="1"/>
       <line num="227" type="stmt" count="1"/>
       <line num="229" type="stmt" count="1"/>
@@ -20142,7 +20144,7 @@
       <line num="270" type="stmt" count="1"/>
       <line num="271" type="stmt" count="1"/>
       <line num="274" type="stmt" count="1"/>
-      <line num="286" type="method" name="generateFormatting" visibility="private" complexity="8" crap="8.02" count="1"/>
+      <line num="286" type="method" name="generateFormatting" visibility="private" complexity="8" crap="8" count="1"/>
       <line num="288" type="stmt" count="1"/>
       <line num="289" type="stmt" count="1"/>
       <line num="290" type="stmt" count="1"/>
@@ -20154,11 +20156,11 @@
       <line num="299" type="stmt" count="1"/>
       <line num="300" type="stmt" count="1"/>
       <line num="303" type="stmt" count="1"/>
-      <line num="304" type="stmt" count="0"/>
+      <line num="304" type="stmt" count="1"/>
       <line num="307" type="stmt" count="1"/>
       <line num="308" type="stmt" count="1"/>
       <line num="312" type="stmt" count="1"/>
-      <metrics loc="315" ncloc="223" classes="1" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="100" coveredstatements="99" elements="105" coveredelements="103"/>
+      <metrics loc="315" ncloc="223" classes="1" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="100" coveredstatements="98" elements="105" coveredelements="102"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/StringCompare.php">
       <class name="phpOMS\Utils\StringCompare" namespace="global">
@@ -20244,7 +20246,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/StringUtils.php">
       <class name="phpOMS\Utils\StringUtils" namespace="global">
-        <metrics complexity="79" methods="10" coveredmethods="8" conditionals="0" coveredconditionals="0" statements="134" coveredstatements="127" elements="144" coveredelements="135"/>
+        <metrics complexity="79" methods="10" coveredmethods="8" conditionals="0" coveredconditionals="0" statements="136" coveredstatements="133" elements="146" coveredelements="141"/>
       </class>
       <line num="60" type="method" name="contains" visibility="public" complexity="3" crap="3" count="1"/>
       <line num="62" type="stmt" count="1"/>
@@ -20304,17 +20306,17 @@
       <line num="222" type="stmt" count="2"/>
       <line num="223" type="stmt" count="1"/>
       <line num="226" type="stmt" count="1"/>
-      <line num="240" type="method" name="createDiffMarkup" visibility="public" complexity="21" crap="23.91" count="1"/>
+      <line num="240" type="method" name="createDiffMarkup" visibility="public" complexity="21" crap="21.09" count="1"/>
       <line num="242" type="stmt" count="1"/>
       <line num="243" type="stmt" count="1"/>
       <line num="245" type="stmt" count="1"/>
       <line num="246" type="stmt" count="1"/>
       <line num="247" type="stmt" count="1"/>
-      <line num="249" type="stmt" count="0"/>
+      <line num="249" type="stmt" count="1"/>
       <line num="252" type="stmt" count="1"/>
       <line num="253" type="stmt" count="1"/>
       <line num="254" type="stmt" count="1"/>
-      <line num="256" type="stmt" count="0"/>
+      <line num="256" type="stmt" count="1"/>
       <line num="259" type="stmt" count="1"/>
       <line num="261" type="stmt" count="1"/>
       <line num="262" type="stmt" count="1"/>
@@ -20334,63 +20336,65 @@
       <line num="286" type="stmt" count="0"/>
       <line num="287" type="stmt" count="0"/>
       <line num="288" type="stmt" count="1"/>
-      <line num="289" type="stmt" count="0"/>
-      <line num="290" type="stmt" count="0"/>
-      <line num="293" type="stmt" count="1"/>
-      <line num="308" type="method" name="computeLCSDiff" visibility="private" complexity="12" crap="12" count="1"/>
-      <line num="310" type="stmt" count="1"/>
-      <line num="311" type="stmt" count="1"/>
-      <line num="313" type="stmt" count="1"/>
-      <line num="314" type="stmt" count="1"/>
+      <line num="289" type="stmt" count="1"/>
+      <line num="290" type="stmt" count="1"/>
+      <line num="294" type="stmt" count="1"/>
+      <line num="295" type="stmt" count="1"/>
+      <line num="296" type="stmt" count="1"/>
+      <line num="313" type="method" name="computeLCSDiff" visibility="private" complexity="12" crap="12" count="1"/>
       <line num="315" type="stmt" count="1"/>
-      <line num="317" type="stmt" count="1"/>
+      <line num="316" type="stmt" count="1"/>
       <line num="318" type="stmt" count="1"/>
-      <line num="321" type="stmt" count="1"/>
+      <line num="319" type="stmt" count="1"/>
+      <line num="320" type="stmt" count="1"/>
       <line num="322" type="stmt" count="1"/>
-      <line num="325" type="stmt" count="1"/>
+      <line num="323" type="stmt" count="1"/>
       <line num="326" type="stmt" count="1"/>
       <line num="327" type="stmt" count="1"/>
-      <line num="328" type="stmt" count="1"/>
-      <line num="329" type="stmt" count="1"/>
+      <line num="330" type="stmt" count="1"/>
+      <line num="331" type="stmt" count="1"/>
+      <line num="332" type="stmt" count="1"/>
       <line num="333" type="stmt" count="1"/>
       <line num="334" type="stmt" count="1"/>
-      <line num="335" type="stmt" count="1"/>
-      <line num="336" type="stmt" count="1"/>
-      <line num="337" type="stmt" count="1"/>
       <line num="338" type="stmt" count="1"/>
       <line num="339" type="stmt" count="1"/>
+      <line num="340" type="stmt" count="1"/>
       <line num="341" type="stmt" count="1"/>
+      <line num="342" type="stmt" count="1"/>
+      <line num="343" type="stmt" count="1"/>
       <line num="344" type="stmt" count="1"/>
-      <line num="345" type="stmt" count="1"/>
       <line num="346" type="stmt" count="1"/>
-      <line num="347" type="stmt" count="1"/>
       <line num="349" type="stmt" count="1"/>
+      <line num="350" type="stmt" count="1"/>
+      <line num="351" type="stmt" count="1"/>
       <line num="352" type="stmt" count="1"/>
-      <line num="353" type="stmt" count="1"/>
       <line num="354" type="stmt" count="1"/>
-      <line num="355" type="stmt" count="1"/>
+      <line num="357" type="stmt" count="1"/>
       <line num="358" type="stmt" count="1"/>
       <line num="359" type="stmt" count="1"/>
-      <line num="361" type="stmt" count="1"/>
-      <line num="373" type="method" name="intHash" visibility="public" complexity="2" crap="2" count="4"/>
-      <line num="375" type="stmt" count="4"/>
-      <line num="376" type="stmt" count="4"/>
-      <line num="377" type="stmt" count="4"/>
-      <line num="379" type="stmt" count="4"/>
+      <line num="360" type="stmt" count="1"/>
+      <line num="363" type="stmt" count="1"/>
+      <line num="364" type="stmt" count="1"/>
+      <line num="366" type="stmt" count="1"/>
+      <line num="378" type="method" name="intHash" visibility="public" complexity="2" crap="2" count="4"/>
       <line num="380" type="stmt" count="4"/>
       <line num="381" type="stmt" count="4"/>
+      <line num="382" type="stmt" count="4"/>
       <line num="384" type="stmt" count="4"/>
-      <line num="396" type="method" name="isShellSafe" visibility="public" complexity="6" crap="6" count="35"/>
-      <line num="398" type="stmt" count="35"/>
-      <line num="399" type="stmt" count="35"/>
-      <line num="401" type="stmt" count="1"/>
+      <line num="385" type="stmt" count="4"/>
+      <line num="386" type="stmt" count="4"/>
+      <line num="389" type="stmt" count="4"/>
+      <line num="401" type="method" name="isShellSafe" visibility="public" complexity="6" crap="6" count="35"/>
+      <line num="403" type="stmt" count="35"/>
       <line num="404" type="stmt" count="35"/>
-      <line num="406" type="stmt" count="35"/>
-      <line num="407" type="stmt" count="35"/>
+      <line num="406" type="stmt" count="1"/>
       <line num="409" type="stmt" count="35"/>
-      <line num="410" type="stmt" count="1"/>
+      <line num="411" type="stmt" count="35"/>
+      <line num="412" type="stmt" count="35"/>
       <line num="414" type="stmt" count="35"/>
-      <metrics loc="417" ncloc="265" classes="1" methods="10" coveredmethods="8" conditionals="0" coveredconditionals="0" statements="134" coveredstatements="127" elements="144" coveredelements="135"/>
+      <line num="415" type="stmt" count="1"/>
+      <line num="419" type="stmt" count="35"/>
+      <metrics loc="422" ncloc="269" classes="1" methods="10" coveredmethods="8" conditionals="0" coveredconditionals="0" statements="136" coveredstatements="133" elements="146" coveredelements="141"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/TaskSchedule/Cron.php">
       <class name="phpOMS\Utils\TaskSchedule\Cron" namespace="global">
@@ -20400,15 +20404,17 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/TaskSchedule/CronJob.php">
       <class name="phpOMS\Utils\TaskSchedule\CronJob" namespace="global">
-        <metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="4" coveredstatements="4" elements="6" coveredelements="6"/>
+        <metrics complexity="4" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="8" coveredelements="8"/>
       </class>
-      <line num="30" type="method" name="__toString" visibility="public" complexity="1" crap="1" count="2"/>
+      <line num="30" type="method" name="__toString" visibility="public" complexity="3" crap="3" count="2"/>
       <line num="32" type="stmt" count="2"/>
-      <line num="38" type="method" name="createWith" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="40" type="stmt" count="1"/>
-      <line num="41" type="stmt" count="1"/>
+      <line num="33" type="stmt" count="1"/>
+      <line num="34" type="stmt" count="2"/>
+      <line num="40" type="method" name="createWith" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="42" type="stmt" count="1"/>
       <line num="43" type="stmt" count="1"/>
-      <metrics loc="46" ncloc="21" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="4" coveredstatements="4" elements="6" coveredelements="6"/>
+      <line num="45" type="stmt" count="1"/>
+      <metrics loc="48" ncloc="23" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="8" coveredelements="8"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Utils/TaskSchedule/Interval.php">
       <class name="phpOMS\Utils\TaskSchedule\Interval" namespace="global">
@@ -20729,9 +20735,9 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Validation/Finance/CreditCard.php">
       <class name="phpOMS\Validation\Finance\CreditCard" namespace="global">
-        <metrics complexity="9" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="22" coveredstatements="22" elements="24" coveredelements="24"/>
+        <metrics complexity="5" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="14" coveredstatements="14" elements="15" coveredelements="15"/>
       </class>
-      <line num="32" type="method" name="isValid" visibility="public" complexity="6" crap="6" count="2"/>
+      <line num="32" type="method" name="isValid" visibility="public" complexity="5" crap="5" count="2"/>
       <line num="34" type="stmt" count="2"/>
       <line num="35" type="stmt" count="1"/>
       <line num="38" type="stmt" count="1"/>
@@ -20746,16 +20752,7 @@
       <line num="53" type="stmt" count="1"/>
       <line num="57" type="stmt" count="1"/>
       <line num="61" type="stmt" count="1"/>
-      <line num="73" type="method" name="luhnTest" visibility="public" complexity="3" crap="3" count="1"/>
-      <line num="75" type="stmt" count="1"/>
-      <line num="76" type="stmt" count="1"/>
-      <line num="78" type="stmt" count="1"/>
-      <line num="79" type="stmt" count="1"/>
-      <line num="81" type="stmt" count="1"/>
-      <line num="82" type="stmt" count="1"/>
-      <line num="84" type="stmt" count="1"/>
-      <line num="88" type="stmt" count="1"/>
-      <metrics loc="91" ncloc="54" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="22" coveredstatements="22" elements="24" coveredelements="24"/>
+      <metrics loc="64" ncloc="36" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="14" coveredstatements="14" elements="15" coveredelements="15"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Validation/Finance/Iban.php">
       <class name="phpOMS\Validation\Finance\Iban" namespace="global">
@@ -20966,7 +20963,7 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Views/View.php">
       <class name="phpOMS\Views\View" namespace="global">
-        <metrics complexity="28" methods="15" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="45" coveredstatements="43" elements="60" coveredelements="57"/>
+        <metrics complexity="31" methods="15" coveredmethods="13" conditionals="0" coveredconditionals="0" statements="51" coveredstatements="48" elements="66" coveredelements="61"/>
       </class>
       <line num="99" type="method" name="__construct" visibility="public" complexity="2" crap="2" count="30"/>
       <line num="101" type="stmt" count="30"/>
@@ -20997,38 +20994,44 @@
       <line num="213" type="stmt" count="2"/>
       <line num="215" type="stmt" count="2"/>
       <line num="217" type="stmt" count="2"/>
-      <line num="231" type="method" name="setModuleDynamically" visibility="private" complexity="4" crap="4" count="4"/>
+      <line num="231" type="method" name="setModuleDynamically" visibility="private" complexity="5" crap="5" count="4"/>
       <line num="233" type="stmt" count="4"/>
       <line num="235" type="stmt" count="4"/>
       <line num="236" type="stmt" count="1"/>
       <line num="239" type="stmt" count="4"/>
       <line num="240" type="stmt" count="4"/>
-      <line num="242" type="stmt" count="3"/>
-      <line num="243" type="stmt" count="1"/>
-      <line num="246" type="stmt" count="2"/>
-      <line num="248" type="stmt" count="2"/>
-      <line num="264" type="method" name="setThemeDynamically" visibility="private" complexity="3" crap="3" count="3"/>
-      <line num="266" type="stmt" count="3"/>
-      <line num="268" type="stmt" count="3"/>
-      <line num="269" type="stmt" count="1"/>
-      <line num="272" type="stmt" count="3"/>
-      <line num="273" type="stmt" count="3"/>
-      <line num="274" type="stmt" count="2"/>
-      <line num="276" type="stmt" count="2"/>
-      <line num="292" type="method" name="getHtml" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="294" type="stmt" count="1"/>
-      <line num="307" type="method" name="getNumeric" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="309" type="stmt" count="1"/>
-      <line num="322" type="method" name="getPercentage" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="324" type="stmt" count="1"/>
-      <line num="339" type="method" name="getCurrency" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="341" type="stmt" count="1"/>
-      <line num="354" type="method" name="getDateTime" visibility="public" complexity="1" crap="1" count="1"/>
-      <line num="356" type="stmt" count="1"/>
-      <line num="369" type="method" name="renderUserName" visibility="public" complexity="2" crap="6" count="0"/>
-      <line num="371" type="stmt" count="0"/>
-      <line num="373" type="stmt" count="0"/>
-      <metrics loc="376" ncloc="159" classes="1" methods="15" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="45" coveredstatements="43" elements="60" coveredelements="57"/>
+      <line num="241" type="stmt" count="1"/>
+      <line num="244" type="stmt" count="3"/>
+      <line num="245" type="stmt" count="3"/>
+      <line num="246" type="stmt" count="1"/>
+      <line num="249" type="stmt" count="2"/>
+      <line num="251" type="stmt" count="2"/>
+      <line num="267" type="method" name="setThemeDynamically" visibility="private" complexity="5" crap="5.02" count="3"/>
+      <line num="269" type="stmt" count="3"/>
+      <line num="271" type="stmt" count="3"/>
+      <line num="272" type="stmt" count="1"/>
+      <line num="275" type="stmt" count="3"/>
+      <line num="276" type="stmt" count="3"/>
+      <line num="277" type="stmt" count="1"/>
+      <line num="280" type="stmt" count="2"/>
+      <line num="281" type="stmt" count="2"/>
+      <line num="282" type="stmt" count="0"/>
+      <line num="285" type="stmt" count="2"/>
+      <line num="287" type="stmt" count="2"/>
+      <line num="303" type="method" name="getHtml" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="305" type="stmt" count="1"/>
+      <line num="318" type="method" name="getNumeric" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="320" type="stmt" count="1"/>
+      <line num="333" type="method" name="getPercentage" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="335" type="stmt" count="1"/>
+      <line num="350" type="method" name="getCurrency" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="352" type="stmt" count="1"/>
+      <line num="365" type="method" name="getDateTime" visibility="public" complexity="1" crap="1" count="1"/>
+      <line num="367" type="stmt" count="1"/>
+      <line num="380" type="method" name="renderUserName" visibility="public" complexity="2" crap="6" count="0"/>
+      <line num="382" type="stmt" count="0"/>
+      <line num="384" type="stmt" count="0"/>
+      <metrics loc="387" ncloc="170" classes="1" methods="15" coveredmethods="13" conditionals="0" coveredconditionals="0" statements="51" coveredstatements="48" elements="66" coveredelements="61"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/Views/ViewAbstract.php">
       <class name="phpOMS\Views\ViewAbstract" namespace="global">
@@ -21835,9 +21838,9 @@
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/tests/Message/Mail/MailHandlerSmtpTrait.php">
       <class name="phpOMS\tests\Message\Mail\MailHandlerSmtpTrait" namespace="global">
-        <metrics complexity="40" methods="13" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="251" coveredstatements="238" elements="264" coveredelements="238"/>
+        <metrics complexity="66" methods="13" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="277" coveredstatements="264" elements="290" coveredelements="264"/>
       </class>
-      <line num="26" type="method" name="testSendTextWithSmtp" visibility="public" complexity="3" crap="3" count="1"/>
+      <line num="26" type="method" name="testSendTextWithSmtp" visibility="public" complexity="5" crap="5" count="1"/>
       <line num="28" type="stmt" count="1"/>
       <line num="29" type="stmt" count="1"/>
       <line num="30" type="stmt" count="1"/>
@@ -21845,10 +21848,9 @@
       <line num="33" type="stmt" count="1"/>
       <line num="34" type="stmt" count="1"/>
       <line num="36" type="stmt" count="1"/>
-      <line num="37" type="stmt" count="0"/>
-      <line num="40" type="stmt" count="1"/>
-      <line num="41" type="stmt" count="1"/>
-      <line num="42" type="stmt" count="1"/>
+      <line num="37" type="stmt" count="1"/>
+      <line num="38" type="stmt" count="1"/>
+      <line num="40" type="stmt" count="0"/>
       <line num="43" type="stmt" count="1"/>
       <line num="44" type="stmt" count="1"/>
       <line num="45" type="stmt" count="1"/>
@@ -21861,22 +21863,21 @@
       <line num="52" type="stmt" count="1"/>
       <line num="53" type="stmt" count="1"/>
       <line num="54" type="stmt" count="1"/>
+      <line num="55" type="stmt" count="1"/>
       <line num="56" type="stmt" count="1"/>
-      <line num="59" type="method" name="testSendHtmlWithSmtp" visibility="public" complexity="3" crap="3" count="1"/>
-      <line num="61" type="stmt" count="1"/>
-      <line num="62" type="stmt" count="1"/>
-      <line num="63" type="stmt" count="1"/>
+      <line num="57" type="stmt" count="1"/>
+      <line num="59" type="stmt" count="1"/>
+      <line num="62" type="method" name="testSendHtmlWithSmtp" visibility="public" complexity="5" crap="5" count="1"/>
       <line num="64" type="stmt" count="1"/>
+      <line num="65" type="stmt" count="1"/>
       <line num="66" type="stmt" count="1"/>
       <line num="67" type="stmt" count="1"/>
       <line num="69" type="stmt" count="1"/>
-      <line num="70" type="stmt" count="0"/>
+      <line num="70" type="stmt" count="1"/>
+      <line num="72" type="stmt" count="1"/>
       <line num="73" type="stmt" count="1"/>
       <line num="74" type="stmt" count="1"/>
-      <line num="75" type="stmt" count="1"/>
-      <line num="76" type="stmt" count="1"/>
-      <line num="77" type="stmt" count="1"/>
-      <line num="78" type="stmt" count="1"/>
+      <line num="76" type="stmt" count="0"/>
       <line num="79" type="stmt" count="1"/>
       <line num="80" type="stmt" count="1"/>
       <line num="81" type="stmt" count="1"/>
@@ -21884,168 +21885,169 @@
       <line num="83" type="stmt" count="1"/>
       <line num="84" type="stmt" count="1"/>
       <line num="85" type="stmt" count="1"/>
+      <line num="86" type="stmt" count="1"/>
       <line num="87" type="stmt" count="1"/>
       <line num="88" type="stmt" count="1"/>
       <line num="89" type="stmt" count="1"/>
       <line num="90" type="stmt" count="1"/>
       <line num="91" type="stmt" count="1"/>
-      <line num="92" type="stmt" count="1"/>
+      <line num="93" type="stmt" count="1"/>
       <line num="94" type="stmt" count="1"/>
-      <line num="97" type="method" name="testSendInlineWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
-      <line num="99" type="stmt" count="1"/>
+      <line num="95" type="stmt" count="1"/>
+      <line num="96" type="stmt" count="1"/>
+      <line num="97" type="stmt" count="1"/>
+      <line num="98" type="stmt" count="1"/>
       <line num="100" type="stmt" count="1"/>
-      <line num="101" type="stmt" count="1"/>
-      <line num="102" type="stmt" count="1"/>
-      <line num="104" type="stmt" count="1"/>
+      <line num="103" type="method" name="testSendInlineWithSmtp" visibility="public" complexity="5" crap="5" count="1"/>
       <line num="105" type="stmt" count="1"/>
+      <line num="106" type="stmt" count="1"/>
       <line num="107" type="stmt" count="1"/>
-      <line num="108" type="stmt" count="0"/>
+      <line num="108" type="stmt" count="1"/>
+      <line num="110" type="stmt" count="1"/>
       <line num="111" type="stmt" count="1"/>
-      <line num="112" type="stmt" count="1"/>
       <line num="113" type="stmt" count="1"/>
       <line num="114" type="stmt" count="1"/>
       <line num="115" type="stmt" count="1"/>
-      <line num="116" type="stmt" count="1"/>
-      <line num="117" type="stmt" count="1"/>
-      <line num="118" type="stmt" count="1"/>
-      <line num="119" type="stmt" count="1"/>
+      <line num="117" type="stmt" count="0"/>
+      <line num="120" type="stmt" count="1"/>
       <line num="121" type="stmt" count="1"/>
-      <line num="124" type="method" name="testSendAttachmentWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
+      <line num="122" type="stmt" count="1"/>
+      <line num="123" type="stmt" count="1"/>
+      <line num="124" type="stmt" count="1"/>
+      <line num="125" type="stmt" count="1"/>
       <line num="126" type="stmt" count="1"/>
       <line num="127" type="stmt" count="1"/>
       <line num="128" type="stmt" count="1"/>
-      <line num="129" type="stmt" count="1"/>
-      <line num="131" type="stmt" count="1"/>
-      <line num="132" type="stmt" count="1"/>
-      <line num="134" type="stmt" count="1"/>
-      <line num="135" type="stmt" count="0"/>
+      <line num="130" type="stmt" count="1"/>
+      <line num="133" type="method" name="testSendAttachmentWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
+      <line num="135" type="stmt" count="1"/>
+      <line num="136" type="stmt" count="1"/>
+      <line num="137" type="stmt" count="1"/>
       <line num="138" type="stmt" count="1"/>
-      <line num="139" type="stmt" count="1"/>
       <line num="140" type="stmt" count="1"/>
       <line num="141" type="stmt" count="1"/>
-      <line num="142" type="stmt" count="1"/>
       <line num="143" type="stmt" count="1"/>
       <line num="144" type="stmt" count="1"/>
-      <line num="146" type="stmt" count="1"/>
-      <line num="149" type="method" name="testSendAltWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
+      <line num="145" type="stmt" count="1"/>
+      <line num="147" type="stmt" count="0"/>
+      <line num="150" type="stmt" count="1"/>
       <line num="151" type="stmt" count="1"/>
       <line num="152" type="stmt" count="1"/>
       <line num="153" type="stmt" count="1"/>
       <line num="154" type="stmt" count="1"/>
+      <line num="155" type="stmt" count="1"/>
       <line num="156" type="stmt" count="1"/>
-      <line num="157" type="stmt" count="1"/>
-      <line num="159" type="stmt" count="1"/>
-      <line num="160" type="stmt" count="0"/>
+      <line num="158" type="stmt" count="1"/>
+      <line num="161" type="method" name="testSendAltWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
       <line num="163" type="stmt" count="1"/>
       <line num="164" type="stmt" count="1"/>
       <line num="165" type="stmt" count="1"/>
       <line num="166" type="stmt" count="1"/>
-      <line num="167" type="stmt" count="1"/>
       <line num="168" type="stmt" count="1"/>
       <line num="169" type="stmt" count="1"/>
       <line num="171" type="stmt" count="1"/>
-      <line num="174" type="method" name="testSendAltInlineWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
-      <line num="176" type="stmt" count="1"/>
-      <line num="177" type="stmt" count="1"/>
+      <line num="172" type="stmt" count="1"/>
+      <line num="173" type="stmt" count="1"/>
+      <line num="175" type="stmt" count="0"/>
       <line num="178" type="stmt" count="1"/>
       <line num="179" type="stmt" count="1"/>
+      <line num="180" type="stmt" count="1"/>
       <line num="181" type="stmt" count="1"/>
       <line num="182" type="stmt" count="1"/>
+      <line num="183" type="stmt" count="1"/>
       <line num="184" type="stmt" count="1"/>
-      <line num="185" type="stmt" count="0"/>
-      <line num="188" type="stmt" count="1"/>
-      <line num="189" type="stmt" count="1"/>
-      <line num="190" type="stmt" count="1"/>
+      <line num="186" type="stmt" count="1"/>
+      <line num="189" type="method" name="testSendAltInlineWithSmtp" visibility="public" complexity="5" crap="5" count="1"/>
       <line num="191" type="stmt" count="1"/>
       <line num="192" type="stmt" count="1"/>
       <line num="193" type="stmt" count="1"/>
       <line num="194" type="stmt" count="1"/>
-      <line num="195" type="stmt" count="1"/>
       <line num="196" type="stmt" count="1"/>
       <line num="197" type="stmt" count="1"/>
       <line num="199" type="stmt" count="1"/>
-      <line num="202" type="method" name="testSendAltAttachmentWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
-      <line num="204" type="stmt" count="1"/>
-      <line num="205" type="stmt" count="1"/>
+      <line num="200" type="stmt" count="1"/>
+      <line num="201" type="stmt" count="1"/>
+      <line num="203" type="stmt" count="0"/>
       <line num="206" type="stmt" count="1"/>
       <line num="207" type="stmt" count="1"/>
+      <line num="208" type="stmt" count="1"/>
       <line num="209" type="stmt" count="1"/>
       <line num="210" type="stmt" count="1"/>
+      <line num="211" type="stmt" count="1"/>
       <line num="212" type="stmt" count="1"/>
-      <line num="213" type="stmt" count="0"/>
-      <line num="216" type="stmt" count="1"/>
+      <line num="213" type="stmt" count="1"/>
+      <line num="214" type="stmt" count="1"/>
+      <line num="215" type="stmt" count="1"/>
       <line num="217" type="stmt" count="1"/>
-      <line num="218" type="stmt" count="1"/>
-      <line num="219" type="stmt" count="1"/>
-      <line num="220" type="stmt" count="1"/>
-      <line num="221" type="stmt" count="1"/>
+      <line num="220" type="method" name="testSendAltAttachmentWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
       <line num="222" type="stmt" count="1"/>
       <line num="223" type="stmt" count="1"/>
+      <line num="224" type="stmt" count="1"/>
       <line num="225" type="stmt" count="1"/>
-      <line num="228" type="method" name="testSendPlainWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
+      <line num="227" type="stmt" count="1"/>
+      <line num="228" type="stmt" count="1"/>
       <line num="230" type="stmt" count="1"/>
       <line num="231" type="stmt" count="1"/>
       <line num="232" type="stmt" count="1"/>
-      <line num="233" type="stmt" count="1"/>
-      <line num="235" type="stmt" count="1"/>
-      <line num="236" type="stmt" count="1"/>
+      <line num="234" type="stmt" count="0"/>
+      <line num="237" type="stmt" count="1"/>
       <line num="238" type="stmt" count="1"/>
-      <line num="239" type="stmt" count="0"/>
+      <line num="239" type="stmt" count="1"/>
+      <line num="240" type="stmt" count="1"/>
+      <line num="241" type="stmt" count="1"/>
       <line num="242" type="stmt" count="1"/>
       <line num="243" type="stmt" count="1"/>
       <line num="244" type="stmt" count="1"/>
-      <line num="245" type="stmt" count="1"/>
       <line num="246" type="stmt" count="1"/>
-      <line num="247" type="stmt" count="1"/>
-      <line num="248" type="stmt" count="1"/>
-      <line num="250" type="stmt" count="1"/>
-      <line num="253" type="method" name="testSendPlainDKIMWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
-      <line num="255" type="stmt" count="1"/>
+      <line num="249" type="method" name="testSendPlainWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
+      <line num="251" type="stmt" count="1"/>
+      <line num="252" type="stmt" count="1"/>
+      <line num="253" type="stmt" count="1"/>
+      <line num="254" type="stmt" count="1"/>
       <line num="256" type="stmt" count="1"/>
       <line num="257" type="stmt" count="1"/>
-      <line num="258" type="stmt" count="1"/>
+      <line num="259" type="stmt" count="1"/>
       <line num="260" type="stmt" count="1"/>
       <line num="261" type="stmt" count="1"/>
-      <line num="263" type="stmt" count="1"/>
-      <line num="264" type="stmt" count="0"/>
+      <line num="263" type="stmt" count="0"/>
+      <line num="266" type="stmt" count="1"/>
       <line num="267" type="stmt" count="1"/>
       <line num="268" type="stmt" count="1"/>
       <line num="269" type="stmt" count="1"/>
       <line num="270" type="stmt" count="1"/>
       <line num="271" type="stmt" count="1"/>
       <line num="272" type="stmt" count="1"/>
-      <line num="273" type="stmt" count="1"/>
       <line num="274" type="stmt" count="1"/>
-      <line num="276" type="stmt" count="1"/>
-      <line num="279" type="method" name="testSendPlainDKIMSignWithSmtp" visibility="public" complexity="3" crap="3" count="1"/>
+      <line num="277" type="method" name="testSendPlainDKIMWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
+      <line num="279" type="stmt" count="1"/>
+      <line num="280" type="stmt" count="1"/>
       <line num="281" type="stmt" count="1"/>
       <line num="282" type="stmt" count="1"/>
-      <line num="283" type="stmt" count="1"/>
       <line num="284" type="stmt" count="1"/>
-      <line num="286" type="stmt" count="1"/>
+      <line num="285" type="stmt" count="1"/>
       <line num="287" type="stmt" count="1"/>
+      <line num="288" type="stmt" count="1"/>
       <line num="289" type="stmt" count="1"/>
-      <line num="290" type="stmt" count="0"/>
-      <line num="293" type="stmt" count="1"/>
+      <line num="291" type="stmt" count="0"/>
       <line num="294" type="stmt" count="1"/>
       <line num="295" type="stmt" count="1"/>
       <line num="296" type="stmt" count="1"/>
       <line num="297" type="stmt" count="1"/>
       <line num="298" type="stmt" count="1"/>
       <line num="299" type="stmt" count="1"/>
+      <line num="300" type="stmt" count="1"/>
       <line num="301" type="stmt" count="1"/>
-      <line num="302" type="stmt" count="1"/>
       <line num="303" type="stmt" count="1"/>
-      <line num="304" type="stmt" count="1"/>
-      <line num="306" type="stmt" count="1"/>
-      <line num="309" type="method" name="testSendPlainSignWithSmtp" visibility="public" complexity="3" crap="3.00" count="1"/>
+      <line num="306" type="method" name="testSendPlainDKIMSignWithSmtp" visibility="public" complexity="5" crap="5" count="1"/>
+      <line num="308" type="stmt" count="1"/>
+      <line num="309" type="stmt" count="1"/>
+      <line num="310" type="stmt" count="1"/>
       <line num="311" type="stmt" count="1"/>
-      <line num="312" type="stmt" count="1"/>
       <line num="313" type="stmt" count="1"/>
       <line num="314" type="stmt" count="1"/>
       <line num="316" type="stmt" count="1"/>
       <line num="317" type="stmt" count="1"/>
-      <line num="319" type="stmt" count="1"/>
+      <line num="318" type="stmt" count="1"/>
       <line num="320" type="stmt" count="0"/>
       <line num="323" type="stmt" count="1"/>
       <line num="324" type="stmt" count="1"/>
@@ -22055,53 +22057,80 @@
       <line num="328" type="stmt" count="1"/>
       <line num="329" type="stmt" count="1"/>
       <line num="331" type="stmt" count="1"/>
+      <line num="332" type="stmt" count="1"/>
       <line num="333" type="stmt" count="1"/>
-      <line num="339" type="method" name="testSendICalAltWithSmtp" visibility="public" complexity="3" crap="3" count="3"/>
-      <line num="341" type="stmt" count="3"/>
-      <line num="342" type="stmt" count="3"/>
-      <line num="343" type="stmt" count="3"/>
-      <line num="344" type="stmt" count="3"/>
-      <line num="346" type="stmt" count="3"/>
-      <line num="347" type="stmt" count="3"/>
-      <line num="349" type="stmt" count="3"/>
-      <line num="350" type="stmt" count="0"/>
-      <line num="353" type="stmt" count="3"/>
-      <line num="354" type="stmt" count="3"/>
-      <line num="355" type="stmt" count="3"/>
-      <line num="356" type="stmt" count="3"/>
-      <line num="357" type="stmt" count="3"/>
-      <line num="358" type="stmt" count="3"/>
-      <line num="359" type="stmt" count="3"/>
-      <line num="360" type="stmt" count="3"/>
-      <line num="361" type="stmt" count="3"/>
-      <line num="387" type="stmt" count="3"/>
+      <line num="334" type="stmt" count="1"/>
+      <line num="336" type="stmt" count="1"/>
+      <line num="339" type="method" name="testSendPlainSignWithSmtp" visibility="public" complexity="5" crap="5.00" count="1"/>
+      <line num="341" type="stmt" count="1"/>
+      <line num="342" type="stmt" count="1"/>
+      <line num="343" type="stmt" count="1"/>
+      <line num="344" type="stmt" count="1"/>
+      <line num="346" type="stmt" count="1"/>
+      <line num="347" type="stmt" count="1"/>
+      <line num="349" type="stmt" count="1"/>
+      <line num="350" type="stmt" count="1"/>
+      <line num="351" type="stmt" count="1"/>
+      <line num="353" type="stmt" count="0"/>
+      <line num="356" type="stmt" count="1"/>
+      <line num="357" type="stmt" count="1"/>
+      <line num="358" type="stmt" count="1"/>
+      <line num="359" type="stmt" count="1"/>
+      <line num="360" type="stmt" count="1"/>
+      <line num="361" type="stmt" count="1"/>
+      <line num="362" type="stmt" count="1"/>
+      <line num="364" type="stmt" count="1"/>
+      <line num="366" type="stmt" count="1"/>
+      <line num="372" type="method" name="testSendICalAltWithSmtp" visibility="public" complexity="5" crap="5" count="3"/>
+      <line num="374" type="stmt" count="3"/>
+      <line num="375" type="stmt" count="3"/>
+      <line num="376" type="stmt" count="3"/>
+      <line num="377" type="stmt" count="3"/>
+      <line num="379" type="stmt" count="3"/>
+      <line num="380" type="stmt" count="3"/>
+      <line num="382" type="stmt" count="3"/>
+      <line num="383" type="stmt" count="3"/>
+      <line num="384" type="stmt" count="3"/>
+      <line num="386" type="stmt" count="0"/>
       <line num="389" type="stmt" count="3"/>
       <line num="390" type="stmt" count="3"/>
+      <line num="391" type="stmt" count="3"/>
       <line num="392" type="stmt" count="3"/>
-      <line num="400" type="method" name="testSendICalAltAttachmentWithSmtp" visibility="public" complexity="3" crap="3" count="3"/>
-      <line num="402" type="stmt" count="3"/>
-      <line num="403" type="stmt" count="3"/>
-      <line num="404" type="stmt" count="3"/>
-      <line num="405" type="stmt" count="3"/>
-      <line num="407" type="stmt" count="3"/>
-      <line num="408" type="stmt" count="3"/>
-      <line num="410" type="stmt" count="3"/>
-      <line num="411" type="stmt" count="0"/>
-      <line num="414" type="stmt" count="3"/>
-      <line num="415" type="stmt" count="3"/>
-      <line num="416" type="stmt" count="3"/>
-      <line num="417" type="stmt" count="3"/>
-      <line num="418" type="stmt" count="3"/>
-      <line num="419" type="stmt" count="3"/>
-      <line num="420" type="stmt" count="3"/>
-      <line num="421" type="stmt" count="3"/>
-      <line num="422" type="stmt" count="3"/>
+      <line num="393" type="stmt" count="3"/>
+      <line num="394" type="stmt" count="3"/>
+      <line num="395" type="stmt" count="3"/>
+      <line num="396" type="stmt" count="3"/>
+      <line num="397" type="stmt" count="3"/>
       <line num="423" type="stmt" count="3"/>
-      <line num="449" type="stmt" count="3"/>
-      <line num="451" type="stmt" count="3"/>
-      <line num="452" type="stmt" count="3"/>
+      <line num="425" type="stmt" count="3"/>
+      <line num="426" type="stmt" count="3"/>
+      <line num="428" type="stmt" count="3"/>
+      <line num="436" type="method" name="testSendICalAltAttachmentWithSmtp" visibility="public" complexity="5" crap="5" count="3"/>
+      <line num="438" type="stmt" count="3"/>
+      <line num="439" type="stmt" count="3"/>
+      <line num="440" type="stmt" count="3"/>
+      <line num="441" type="stmt" count="3"/>
+      <line num="443" type="stmt" count="3"/>
+      <line num="444" type="stmt" count="3"/>
+      <line num="446" type="stmt" count="3"/>
+      <line num="447" type="stmt" count="3"/>
+      <line num="448" type="stmt" count="3"/>
+      <line num="450" type="stmt" count="0"/>
+      <line num="453" type="stmt" count="3"/>
       <line num="454" type="stmt" count="3"/>
-      <metrics loc="479" ncloc="460" classes="1" methods="13" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="251" coveredstatements="238" elements="264" coveredelements="238"/>
+      <line num="455" type="stmt" count="3"/>
+      <line num="456" type="stmt" count="3"/>
+      <line num="457" type="stmt" count="3"/>
+      <line num="458" type="stmt" count="3"/>
+      <line num="459" type="stmt" count="3"/>
+      <line num="460" type="stmt" count="3"/>
+      <line num="461" type="stmt" count="3"/>
+      <line num="462" type="stmt" count="3"/>
+      <line num="488" type="stmt" count="3"/>
+      <line num="490" type="stmt" count="3"/>
+      <line num="491" type="stmt" count="3"/>
+      <line num="493" type="stmt" count="3"/>
+      <metrics loc="518" ncloc="499" classes="1" methods="13" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="277" coveredstatements="264" elements="290" coveredelements="264"/>
     </file>
     <file name="/home/spl1nes/Orange-Management/phpOMS/tests/Module/Testmodule/Admin/Installer.php">
       <class name="Modules\Testmodule\Admin\Installer" namespace="global">
@@ -22297,6 +22326,6 @@
       </class>
       <metrics loc="27" ncloc="16" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
     </file>
-    <metrics files="611" loc="100485" ncloc="56561" classes="369" methods="2822" coveredmethods="2259" conditionals="0" coveredconditionals="0" statements="16052" coveredstatements="13711" elements="18874" coveredelements="15970"/>
+    <metrics files="611" loc="100519" ncloc="56603" classes="369" methods="2821" coveredmethods="2260" conditionals="0" coveredconditionals="0" statements="16082" coveredstatements="13748" elements="18903" coveredelements="16008"/>
   </project>
 </coverage>