diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 0000000..031b40e
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,16 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__. "/src")
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@PSR12' => true,
+        'multiline_comment_opening_closing' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        //'strict_param' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;
diff --git a/src/Auth.php b/src/Auth.php
index be8d649..615787c 100644
--- a/src/Auth.php
+++ b/src/Auth.php
@@ -1,28 +1,34 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication (abstract class) */
+/**
+ * User authentication (abstract class)
+ */
 class Auth
 {
-    /** The application name */
+    /**
+     * The application name
+     */
     public $appName = null;
 
-    /** Display the authentication page
-      * The message is displayed to the user in case of error
-      * The url is the caller url to go back if authentication is correct
-      * @param string $baseURL The URL base to use for the links
-      * @param string|null $message Message to display to the user
-      * @param string|null $url URL to go back after successful authentication
-      * @param mixed $alreadyAuth If the user is already authenticated, the value
-      * will be displayed if the user is coming on the page.
-      */
+    /**
+     * Display the authentication page
+     * The message is displayed to the user in case of error
+     * The url is the caller url to go back if authentication is correct
+     * @param string $baseURL The URL base to use for the links
+     * @param string|null $message Message to display to the user
+     * @param string|null $url URL to go back after successful authentication
+     * @param mixed $alreadyAuth If the user is already authenticated, the value
+     * will be displayed if the user is coming on the page.
+     */
     public function pageHTML($baseURL, $message = "", $url = "", $alreadyAuth = false)
     {
         $res = "";
@@ -155,8 +161,9 @@ class Auth
         return $res;
     }
 
-    /** Establish the connection to authentication server
-      */
+    /**
+     * Establish the connection to authentication server
+     */
     public function connect()
     {
         throw new \Exception(
@@ -168,12 +175,13 @@ class Auth
         );
     }
 
-    /** Check if the email and password are correct
-      * Return TRUE if the authentication is correct
-      * Return an exception if there is a problem
-      * @param string $email Email to authenticate
-      * @param string $password Password to authenticate
-      */
+    /**
+     * Check if the email and password are correct
+     * Return TRUE if the authentication is correct
+     * Return an exception if there is a problem
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         throw new \Exception(dgettext(
@@ -182,8 +190,9 @@ class Auth
         ), 405);
     }
 
-    /** Return all the parameters recorded for the authenticate user
-      */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         throw new \Exception(dgettext(
@@ -192,11 +201,12 @@ class Auth
         ), 405);
     }
 
-    /** Method to change the password
-      * @param string $oldpassword The old password (to check if the user have the
-      *    rights to change the password)
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     *    rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -205,12 +215,13 @@ class Auth
         ), 405);
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-      * Must be reserved to the administrators. For the users, use changepassword
-      * method
-      * @param string $email the user identifier to select
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -219,9 +230,10 @@ class Auth
         ), 405);
     }
 
-    /** List all the users available in the database
-      * Return firstname, lastname, mail, with mail is an array
-      */
+    /**
+     * List all the users available in the database
+     * Return firstname, lastname, mail, with mail is an array
+     */
     public function listusers()
     {
         throw new \Exception(dgettext(
@@ -230,8 +242,9 @@ class Auth
         ), 405);
     }
 
-    /** Method to disconnect the authenticated user
-      */
+    /**
+     * Method to disconnect the authenticated user
+     */
     public function logout()
     {
         throw new \Exception(dgettext(
diff --git a/src/Authentication.php b/src/Authentication.php
index dbd7bf2..b8cead9 100644
--- a/src/Authentication.php
+++ b/src/Authentication.php
@@ -1,88 +1,113 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** All the authentication protocol */
+/**
+ * All the authentication protocol
+ */
 class Authentication
 {
-    /** The email of the authenticated/nonauthenticated user */
+    /**
+     * The email of the authenticated/nonauthenticated user
+     */
     //private $email = "anonymous";
 
-    /** The debug of the authentication methods */
+    /**
+     * The debug of the authentication methods
+     */
     public $debug = 0;
 
-    /** The route object */
+    /**
+     * The route object
+     */
     private $route;
 
-    /** Number of authentication maximum by minute */
+    /**
+     * Number of authentication maximum by minute
+     */
     public $ratelimitAuth = 3;
 
-    /** Directory to store the ratelimit files */
+    /**
+     * Directory to store the ratelimit files
+     */
     public $ratelimitDir = "/tmp/ratelimit/";
 
-    /** The rest authentication methods. Can be post, session, http, shibboleth,
-      * jwt
-      * Attention : session case = CSRF !
-      */
-    public $restMethods = array("http", "jwt");
+    /**
+     * The rest authentication methods. Can be post, session, http, shibboleth,
+     * jwt
+     * Attention : session case = CSRF !
+     */
+    public $restMethods = ["http", "jwt"];
 
-    /** The html authentication methods. Can be : post, session, http, shibboleth,
-      * jwt
-      * The "post" is already used when using verifAuthLoginPage method (usually
-      * only in authentication page)
-      */
-    public $htmlMethods = array("session");
+    /**
+     * The html authentication methods. Can be : post, session, http, shibboleth,
+     * jwt
+     * The "post" is already used when using verifAuthLoginPage method (usually
+     * only in authentication page)
+     */
+    public $htmlMethods = ["session"];
 
-    /** The authentication methods. Can be ldap, sympa...*/
-    public $authMethods = array();
+    /**
+     * The authentication methods. Can be ldap, sympa...
+     */
+    public $authMethods = [];
 
-    /** The authentication servers configuration
-      * array ("authXXXX" => array (
-      *     array ("ldapserver"       => "ldaps://server.domain.fr",
-      *            "ldapport"         => 636,
-      *            "ldaptimeout"      => 5,
-      *            "ldapauth"         => "uid=XXX,dc=domain,dc=fr",
-      *            "ldappwd"          => "XXX",
-      *            "ldapbase"         => "",
-      *            "ldapfilter"       => "(mail=%s)",
-      *            "ldapfield"        => "mail",
-      *            "ldapfiltersearch" => "(objectClass=inetOrgPerson)"
-      *     ),
-      *   ),
-      * );
-      */
-    public $authServers = array();
+    /**
+     * The authentication servers configuration
+     * array ("authXXXX" => array (
+     *     array ("ldapserver"       => "ldaps://server.domain.fr",
+     *            "ldapport"         => 636,
+     *            "ldaptimeout"      => 5,
+     *            "ldapauth"         => "uid=XXX,dc=domain,dc=fr",
+     *            "ldappwd"          => "XXX",
+     *            "ldapbase"         => "",
+     *            "ldapfilter"       => "(mail=%s)",
+     *            "ldapfield"        => "mail",
+     *            "ldapfiltersearch" => "(objectClass=inetOrgPerson)"
+     *     ),
+     *   ),
+     * );
+     */
+    public $authServers = [];
 
-    /** The application Name displayed on authentication page */
+    /**
+     * The application Name displayed on authentication page
+     */
     public $appName = null;
 
-    /** The class and method to use to log the errors */
+    /**
+     * The class and method to use to log the errors
+     */
     public $loggingFunc;
 
-    /** The constructor
-      * @param object $route The route object
-      */
+    /**
+     * The constructor
+     * @param object $route The route object
+     */
     public function __construct($route)
     {
         $this->route = $route;
-        $this->loggingFunc = array($this, "logging");
+        $this->loggingFunc = [$this, "logging"];
     }
 
     /*  public function email ()
       {
         return $this->email;
-      }*/
+      }
+ */
 
-    /** Setter/Getter for debug
-      * @param integer|null $debug The debug value to get/set
-      * @return integer|self the actual value or this
-      */
+    /**
+     * Setter/Getter for debug
+     * @param integer|null $debug The debug value to get/set
+     * @return integer|self the actual value or this
+     */
     public function debug($debug = null)
     {
         if ($debug === null) {
@@ -92,10 +117,11 @@ class Authentication
         return $this;
     }
 
-    /** Disconnect the user
-      * @param string|null $url The url to be redirected after a valid
-      * logout
-      */
+    /**
+     * Disconnect the user
+     * @param string|null $url The url to be redirected after a valid
+     * logout
+     */
     public function logout($url = "")
     {
         // TODO : Foreach authentication methods->logout ();
@@ -163,10 +189,11 @@ class Authentication
         }
     }
 
-    /** Display the login page
-      * @param string|null $url The url to be redirected after a valid
-      * authentication
-      */
+    /**
+     * Display the login page
+     * @param string|null $url The url to be redirected after a valid
+     * authentication
+     */
     public function pageHTML($url = "")
     {
         // If the user is already connected, redirect to the main page of the site
@@ -174,7 +201,7 @@ class Authentication
             session_start();
         }
         $auth = new Auth();
-        $authparams = new Authparams(array("session"));
+        $authparams = new Authparams(["session"]);
         if (isset($_SESSION["domframework"]["authentication"]["message"])) {
             $message = $_SESSION["domframework"]["authentication"]["message"];
         } else {
@@ -197,10 +224,11 @@ class Authentication
         );
     }
 
-    /** Check the authentication page
-      * @param string|null $url The url to be redirected after a valid
-      * authentication
-      */
+    /**
+     * Check the authentication page
+     * @param string|null $url The url to be redirected after a valid
+     * authentication
+     */
     public function verifAuthLoginPage($url = "")
     {
         if (session_id() === "") {
@@ -236,7 +264,7 @@ class Authentication
                 $this->route->redirect("/authentication/$url", "");
             }
         }
-        $authparams = new Authparams(array("post"));
+        $authparams = new Authparams(["post"]);
         $res = $this->verifAuth($authparams->email, $authparams->password);
         if (! is_array($res)) {
             if ($this->debug) {
@@ -299,11 +327,12 @@ class Authentication
         }
     }
 
-    /** Check all the REST API
-      * @param boolean|null $savePassword return the user password if the
-      * authentication is valid
-      * @return array The details provided by the authentication mecanism
-      */
+    /**
+     * Check all the REST API
+     * @param boolean|null $savePassword return the user password if the
+     * authentication is valid
+     * @return array The details provided by the authentication mecanism
+     */
     public function verifAuthREST($savePassword = false)
     {
         if ($this->debug) {
@@ -311,7 +340,7 @@ class Authentication
             print_r($this->restMethods, true) . ")\n";
         }
         $authparams = new Authparams($this->restMethods);
-        $res = array("email" => "anonymous", "password" => "anonymous");
+        $res = ["email" => "anonymous", "password" => "anonymous"];
         if (
             $authparams->email !== "anonymous" &&
             $authparams->password !== "anonymous"
@@ -336,12 +365,13 @@ class Authentication
         return $res;
     }
 
-    /** Return the JSON Web Token
-      * @param string|array $auth The user data to store in JSON Web Token cache.
-      * The $this->authServers["authjwt"]["algorithm"],
-      *     $this->authServers["authjwt"]["cipherKey"] and
-      *     $this->authServers["authjwt"]["serverKey"] can be set
-      */
+    /**
+     * Return the JSON Web Token
+     * @param string|array $auth The user data to store in JSON Web Token cache.
+     * The $this->authServers["authjwt"]["algorithm"],
+     *     $this->authServers["authjwt"]["cipherKey"] and
+     *     $this->authServers["authjwt"]["serverKey"] can be set
+     */
     public function createJwtToken($auth)
     {
         if (isset($this->authServers["authjwt"]["serverKey"])) {
@@ -358,7 +388,7 @@ class Authentication
             if (isset($this->authServers["authjwt"]["cacheDir"])) {
                 $cacheDir = $this->authServers["authjwt"]["cacheDir"];
             }
-            $payloadArray = array();
+            $payloadArray = [];
             $payloadArray["email"] = $auth;
             if (is_array($auth)) {
                 $payloadArray = $auth;
@@ -378,9 +408,10 @@ class Authentication
         }
     }
 
-    /** Check all the others pages of the site
-      * @return array The details provided by the authentication mecanism
-      */
+    /**
+     * Check all the others pages of the site
+     * @return array The details provided by the authentication mecanism
+     */
     public function verifAuthHTML()
     {
         // Do not force the session_start ! We don't want the cookie on all the
@@ -395,8 +426,8 @@ class Authentication
             if ($this->debug) {
                 echo "Anonymous\n";
             }
-            return array("email" => "anonymous", "lastname" => "Anonymous",
-                    "firstname" => "", "password" => "");
+            return ["email" => "anonymous", "lastname" => "Anonymous",
+                    "firstname" => "", "password" => ""];
         }
         if ($this->debug) {
             echo "verifAuth ($authparams->email, $authparams->password)\n";
@@ -420,14 +451,15 @@ class Authentication
         return $res;
     }
 
-    /** Do the real authentication process on all the providers defined in the
-      * properties of the class.
-      * @param string $email The email to check
-      * @param string $password The password to check
-      * @return array containing the user data if the authentication is
-      *         correct,
-      *         an exception if noting is found
-      */
+    /**
+     * Do the real authentication process on all the providers defined in the
+     * properties of the class.
+     * @param string $email The email to check
+     * @param string $password The password to check
+     * @return array containing the user data if the authentication is
+     *         correct,
+     *         an exception if noting is found
+     */
     private function verifAuth($email, $password)
     {
         if ($this->debug) {
@@ -469,7 +501,7 @@ class Authentication
             // If only one server is defined, the parameters can directely be pushed
             // to the classname
             if (! is_array(reset($authServers[$classname]))) {
-                $authServers[$classname] = array($authServers[$classname]);
+                $authServers[$classname] = [$authServers[$classname]];
             }
             if ($this->debug >= 2) {
                 echo "Authentication method=$method : authServers=" .
@@ -523,9 +555,10 @@ class Authentication
         return dgettext("domframework", "Bad login/password");
     }
 
-    /** Add the authentication routes to the routing model for HTML
-      * authentication. Not needed if using shibboleth, HTTP auth...
-      */
+    /**
+     * Add the authentication routes to the routing model for HTML
+     * authentication. Not needed if using shibboleth, HTTP auth...
+     */
     public function routes()
     {
         $authObj = $this;
@@ -561,11 +594,12 @@ class Authentication
         $this->route->authenticationURL = "/authentication/";
     }
 
-    /** The default method to display the error messages.
-      * Do not display the debug messages, and write the errors on screen
-      * @param integer $priority The priority of the message
-      * @param string $message The message to log
-      */
+    /**
+     * The default method to display the error messages.
+     * Do not display the debug messages, and write the errors on screen
+     * @param integer $priority The priority of the message
+     * @param string $message The message to log
+     */
     private function logging($priority, $message)
     {
         if ($this->debug === 0 && $priority > 4) {
diff --git a/src/Authhtpasswd.php b/src/Authhtpasswd.php
index 6585040..87f6b65 100644
--- a/src/Authhtpasswd.php
+++ b/src/Authhtpasswd.php
@@ -1,26 +1,34 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against .htpasswd file
-    A .htpasswd can be created by the 'htpasswd' command for Apache, and contain
-    toto@toto.com:$2y$05$uHCUNqicE7Pku3MK1qZaDuJxP/pocqCcEAnacZBjsfWgW9EcuG5y2
-  */
+/**
+ * User authentication against .htpasswd file
+ * A .htpasswd can be created by the 'htpasswd' command for Apache, and contain
+ * toto@toto.com:$2y$05$uHCUNqicE7Pku3MK1qZaDuJxP/pocqCcEAnacZBjsfWgW9EcuG5y2
+ */
 class Authhtpasswd extends Auth
 {
-    /** The .htpasswd file to use for authentication */
+    /**
+     * The .htpasswd file to use for authentication
+     */
     public $htpasswdFile;
 
-    /** The details to return if the user is authenticated */
+    /**
+     * The details to return if the user is authenticated
+     */
     private $details = null;
 
-    /** There is no real connection to htpasswd */
+    /**
+     * There is no real connection to htpasswd
+     */
     public function connect()
     {
         if (! file_exists($this->htpasswdFile)) {
@@ -43,9 +51,11 @@ class Authhtpasswd extends Auth
         }
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         // Redo the checks of connect to not have a property to add
@@ -70,23 +80,27 @@ class Authhtpasswd extends Auth
                 if (crypt($password, $cryptedPassword) !== $cryptedPassword) {
                     throw new \Exception("Bad password for '$email'", 401);
                 }
-                $this->details = array("email" => $email);
+                $this->details = ["email" => $email];
                 return true;
             }
         }
         throw new \Exception("Unable to find the user : '$email'", 401);
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         return $this->details;
     }
 
-    /** Method to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(
@@ -98,11 +112,13 @@ class Authhtpasswd extends Auth
         );
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-      Must be reserved to the administrators. For the users, use changepassword
-      method
-      @param string $email the user identifier to select
-      @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
diff --git a/src/Authimap.php b/src/Authimap.php
index 8954d19..baa603e 100644
--- a/src/Authimap.php
+++ b/src/Authimap.php
@@ -1,29 +1,44 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against IMAP server */
+/**
+ * User authentication against IMAP server
+ */
 class Authimap extends Auth
 {
-    /** IMAP server */
+    /**
+     * IMAP server
+     */
     public $imapServer = "localhost";
-    /** IMAP TCP port (143 by default) */
+    /**
+     * IMAP TCP port (143 by default)
+     */
     public $imapPort = 143;
-    /** IMAP SSL connection */
+    /**
+     * IMAP SSL connection
+     */
     public $imapSSL = false;
-    /** IMAP SSL CheckCertificate */
+    /**
+     * IMAP SSL CheckCertificate
+     */
     public $imapSSLCheckCertificates = true;
 
-    /** The details available after authentication */
+    /**
+     * The details available after authentication
+     */
     private $details = null;
 
-    /** Check the availablity of the IMAP support in PHP */
+    /**
+     * Check the availablity of the IMAP support in PHP
+     */
     public function __construct()
     {
         if (!function_exists("imap_open")) {
@@ -31,16 +46,20 @@ class Authimap extends Auth
         }
     }
 
-    /** Establish the connection to IMAP server. Don't do anything as the
-        needed parameters are username and password */
+    /**
+     * Establish the connection to IMAP server. Don't do anything as the
+     * needed parameters are username and password
+     */
     public function connect()
     {
         // Nothing to do
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         $imap = new Imap(
@@ -51,21 +70,25 @@ class Authimap extends Auth
             $this->imapSSL,
             $this->imapSSLCheckCertificates
         );
-        $this->details = array("email" => $email);
+        $this->details = ["email" => $email];
         // Let the throw Exception be catched by the parent
         return true;
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         return $this->details;
     }
 
-    /** Method to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -74,11 +97,13 @@ class Authimap extends Auth
         ), 405);
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user identifier to select
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
@@ -90,8 +115,10 @@ class Authimap extends Auth
         );
     }
 
-    /** List all the users available in the database
-        Return firstname, lastname, mail, with mail is an array */
+    /**
+     * List all the users available in the database
+     * Return firstname, lastname, mail, with mail is an array
+     */
     public function listusers()
     {
         throw new \Exception(dgettext(
diff --git a/src/Authjwt.php b/src/Authjwt.php
index 53ae76d..dc06b3c 100644
--- a/src/Authjwt.php
+++ b/src/Authjwt.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
@@ -15,50 +16,59 @@ namespace Domframework;
 class Authjwt extends Auth
 {
     // PROPERTIES SET BY AUTH
-    /** The JSON Web Token Server key if used
-      */
+    /**
+     * The JSON Web Token Server key if used
+     */
     public $serverKey = null;
 
-    /** The cipher key to decrypt the token
-      */
+    /**
+     * The cipher key to decrypt the token
+     */
     public $cipherKey = null;
 
-    /** The allowed algorithms in array format
-      * If null, all the algorithms are allowed
-      * allowed : ['HS256', 'HS512', 'HS384']
-      */
+    /**
+     * The allowed algorithms in array format
+     * If null, all the algorithms are allowed
+     * allowed : ['HS256', 'HS512', 'HS384']
+     */
     public $allowedAlg = null;
 
-    /** The algorithm to use, in $allowedAlg list
-      */
+    /**
+     * The algorithm to use, in $allowedAlg list
+     */
     public $algorithm = "HS256";
 
-    /** The directory to store the user credentials
-      */
+    /**
+     * The directory to store the user credentials
+     */
     public $cacheDir = "data/jwtCache";
 
     // INTERNAL PROPERTIES
-    /** If the user is valid, return the payload in details
-      */
+    /**
+     * If the user is valid, return the payload in details
+     */
     private $payload = null;
 
-    /** Save the token
-      */
+    /**
+     * Save the token
+     */
     private $token = null;
 
-    /** No connection to JWT
-      */
+    /**
+     * No connection to JWT
+     */
     public function connect()
     {
         return true;
     }
 
-    /** Try to authenticate the email/password of the user
-      * If the token is valid, return all the data available in payload. Can
-      * return a value without email attribute !
-      * @param string $email Email not used (wait for Bearer)
-      * @param string $password Password not used (wait for Bearer)
-      */
+    /**
+     * Try to authenticate the email/password of the user
+     * If the token is valid, return all the data available in payload. Can
+     * return a value without email attribute !
+     * @param string $email Email not used (wait for Bearer)
+     * @param string $password Password not used (wait for Bearer)
+     */
     public function authentication($email, $password)
     {
         if (! isset($_SERVER["HTTP_AUTHENTICATION"])) {
@@ -86,16 +96,17 @@ class Authjwt extends Auth
         $payload = $cachefile->read((string)$uuid);
         // The JWT was tested in authparams. End of process
         if (empty($uuid) || empty($payload) || ! key_exists("email", $payload)) {
-            return array("lastname"  => "anonymous",
+            return ["lastname"  => "anonymous",
                     "firstname" => "",
-                    "email"     => "anonymous");
+                    "email"     => "anonymous"];
         }
         $this->payload = $payload;
         return $payload;
     }
 
-    /** Return all the parameters recorded for the authenticate user
-      */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         if (
@@ -103,18 +114,19 @@ class Authjwt extends Auth
             key_exists("email", $this->payload) &&
             $this->payload["email"] === "anonymous"
         ) {
-            return array("lastname"  => "anonymous",
+            return ["lastname"  => "anonymous",
                     "firstname" => "",
-                    "email"     => "anonymous");
+                    "email"     => "anonymous"];
         }
         return $this->payload;
     }
 
-    /** Save the auth data in cache directory and return the JWT token
-      * Do not allow to store data if the $auth is anonymous
-      * @param array $auth The authentication to save
-      * @return string JWT token
-      */
+    /**
+     * Save the auth data in cache directory and return the JWT token
+     * Do not allow to store data if the $auth is anonymous
+     * @param array $auth The authentication to save
+     * @return string JWT token
+     */
     public function createJwtToken($auth)
     {
         if ($this->serverKey === null) {
@@ -145,11 +157,12 @@ class Authjwt extends Auth
         );
     }
 
-    /** Method to change the password : unavailable in SESSION auth
-      * @param string $oldpassword The old password (to check if the user have the
-      * rights to change the password)
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to change the password : unavailable in SESSION auth
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -158,12 +171,13 @@ class Authjwt extends Auth
         ), 405);
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-      * Must be reserved to the administrators. For the users, use changepassword
-      * method
-      * @param string $email the user identifier to select
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -172,8 +186,9 @@ class Authjwt extends Auth
         ), 405);
     }
 
-    /** Remove the information from the session
-      */
+    /**
+     * Remove the information from the session
+     */
     public function logout()
     {
         if (! isset($_SERVER["HTTP_AUTHENTICATION"])) {
diff --git a/src/Authldap.php b/src/Authldap.php
index 48ba68c..4436f26 100644
--- a/src/Authldap.php
+++ b/src/Authldap.php
@@ -1,41 +1,68 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against LDAP server */
+/**
+ * User authentication against LDAP server
+ */
 class Authldap extends Auth
 {
-    /** LDAP server : can be ldaps://server.domain.tld if LDAPS */
+    /**
+     * LDAP server : can be ldaps://server.domain.tld if LDAPS
+     */
     public $ldapserver = "localhost";
-    /** LDAP TCP Port (389 by default) */
+    /**
+     * LDAP TCP Port (389 by default)
+     */
     public $ldapport = 389;
-    /** LDAP Connection timeout (5s by default) */
+    /**
+     * LDAP Connection timeout (5s by default)
+     */
     public $ldaptimeout = 5;
-    /** LDAP authentication to search user */
+    /**
+     * LDAP authentication to search user
+     */
     public $ldapauth = "";
-    /** LDAP authentication password */
+    /**
+     * LDAP authentication password
+     */
     public $ldappwd = "";
-    /** LDAP Search base */
+    /**
+     * LDAP Search base
+     */
     public $ldapbase = "";
-    /** Filter used to search user */
+    /**
+     * Filter used to search user
+     */
     public $ldapfilter = "(mail=%s)";
-    /** Field used to identify a user */
+    /**
+     * Field used to identify a user
+     */
     public $ldapfield = "mail";
-    /** Filter used to find the available data of an authenticated user */
+    /**
+     * Filter used to find the available data of an authenticated user
+     */
     public $ldapfiltersearch = "(objectClass=inetOrgPerson)";
 
-    /** The opened LDAP connection identifier */
+    /**
+     * The opened LDAP connection identifier
+     */
     private $ldapconn = null;
-    /** The DN of the user when found */
+    /**
+     * The DN of the user when found
+     */
     private $ldapdnuser = null;
 
-    /** Check the availability of LDAP functions in PHP */
+    /**
+     * Check the availability of LDAP functions in PHP
+     */
     public function __construct()
     {
         if (!function_exists("ldap_connect")) {
@@ -43,9 +70,11 @@ class Authldap extends Auth
         }
     }
 
-    /** Establish a connection to a LDAP server
-        $server can be "ldaps://ldap.domain:636"
-        If $user is "", there is no authentication (anonymous mode) */
+    /**
+     * Establish a connection to a LDAP server
+     * $server can be "ldaps://ldap.domain:636"
+     * If $user is "", there is no authentication (anonymous mode)
+     */
     public function connect()
     {
         $this->ldapconn = ldap_connect($this->ldapserver, $this->ldapport);
@@ -61,9 +90,11 @@ class Authldap extends Auth
         }
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         $filter = sprintf($this->ldapfilter, $email, $email, $email, $email);
@@ -71,7 +102,7 @@ class Authldap extends Auth
             $this->ldapconn,
             $this->ldapbase,
             $filter,
-            array($this->ldapfield)
+            [$this->ldapfield]
         );
         if ($search === false) {
             throw new \Exception("Unable to search in LDAP", 500);
@@ -91,7 +122,9 @@ class Authldap extends Auth
         $this->ldapdnuser = $dn;
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         if ($this->ldapdnuser === null) {
@@ -106,20 +139,22 @@ class Authldap extends Auth
             throw new \Exception("Can not found the details for user", 401);
         }
         $data = ldap_get_entries($this->ldapconn, $search);
-        $res = array();
+        $res = [];
         if (isset($data[0])) {
-            $res = array("lastname" => $data[0]["sn"][0],
+            $res = ["lastname" => $data[0]["sn"][0],
                     "firstname" => $data[0]["givenname"][0],
-                    "email" => $data[0]["mail"][0]);
+                    "email" => $data[0]["mail"][0]];
         }
 
         return $res;
     }
 
-    /** Method to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(dgettext(
@@ -128,11 +163,13 @@ class Authldap extends Auth
         ), 405);
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user identifier to select
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
@@ -144,8 +181,10 @@ class Authldap extends Auth
         );
     }
 
-    /** List all the users available in the database
-        Return firstname, lastname, mail, with mail is an array */
+    /**
+     * List all the users available in the database
+     * Return firstname, lastname, mail, with mail is an array
+     */
     public function listusers()
     {
         if ($this->ldapconn === null) {
@@ -155,13 +194,13 @@ class Authldap extends Auth
             $this->ldapconn,
             $this->ldapbase,
             $this->ldapfiltersearch,
-            array("mail", "sn", "givenname")
+            ["mail", "sn", "givenname"]
         );
         if ($search === false) {
             throw new \Exception("Unable to search the users in LDAP", 500);
         }
         $info = ldap_get_entries($this->ldapconn, $search);
-        $data = array();
+        $data = [];
         foreach ($info as $key => $vals) {
             if ($key === "count") {
                 continue;
@@ -170,9 +209,9 @@ class Authldap extends Auth
                 isset($vals["sn"][0]) && isset($vals["givenname"][0]) &&
                 isset($vals["mail"])
             ) {
-                $data[$key] = array("lastname" => $vals["sn"][0],
+                $data[$key] = ["lastname" => $vals["sn"][0],
                               "firstname" => $vals["givenname"][0],
-                              "email" => $vals["mail"][0]);
+                              "email" => $vals["mail"][0]];
             }
 
             unset($data[$key]["mail"]["count"]);
@@ -181,7 +220,9 @@ class Authldap extends Auth
         return $data;
     }
 
-    /** Close the LDAP connection when closing the object or PHP */
+    /**
+     * Close the LDAP connection when closing the object or PHP
+     */
     public function __destruct()
     {
         if (isset($this->ldapconn)) {
diff --git a/src/Authorization.php b/src/Authorization.php
index 7229e61..d95d23f 100644
--- a/src/Authorization.php
+++ b/src/Authorization.php
@@ -1,100 +1,131 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** All the needed functions to authorize or deny access to an authenticated
-    user */
+/**
+ * All the needed functions to authorize or deny access to an authenticated
+ * user
+ */
 class Authorization
 {
-    /** Separator between differents modules/objects */
+    /**
+     * Separator between differents modules/objects
+     */
     private $separator = "/";
 
-    /** The user ID of the authenticated user */
+    /**
+     * The user ID of the authenticated user
+     */
     public $authiduser = "";        // user id
-    /** The groups ID of the authenticated user */
-    public $authgroups = array(); // List of user's groups id
+    /**
+     * The groups ID of the authenticated user
+     */
+    public $authgroups = []; // List of user's groups id
 
-    /** Establish a connexion to the authorization database */
+    /**
+     * Establish a connexion to the authorization database
+     */
     public function connect()
     {
     }
 
-    /** Create the structure to store the authorization database */
+    /**
+     * Create the structure to store the authorization database
+     */
     public function initialize()
     {
     }
 
-    /** Return if the user right is NONE, READ, WRITE, EXECUTE
-        if the object doesn't exists, or is not readable, throw an exception
-        @param string $object The object path to examine
-        @return string NONE, READ, WRITE, EXECUTE */
+    /**
+     * Return if the user right is NONE, READ, WRITE, EXECUTE
+     * if the object doesn't exists, or is not readable, throw an exception
+     * @param string $object The object path to examine
+     * @return string NONE, READ, WRITE, EXECUTE
+     */
     public function validate($object)
     {
         return "NONE";
     }
 
-    /** Add a new object, with owner and group, and mode bits
-        @param string $object Object path to add
-        @param integer $owner Owner ID of the object
-        @param integer $group Group ID of the object
-        @param integer $modbits Bits of authorization */
+    /**
+     * Add a new object, with owner and group, and mode bits
+     * @param string $object Object path to add
+     * @param integer $owner Owner ID of the object
+     * @param integer $group Group ID of the object
+     * @param integer $modbits Bits of authorization
+     */
     public function add($object, $owner, $group, $modbits)
     {
     }
 
-    /** Remove the information about an object and all its sub-objects
-        @param string $object Object path to drop */
+    /**
+     * Remove the information about an object and all its sub-objects
+     * @param string $object Object path to drop
+     */
     public function drop($object)
     {
     }
 
-    /** Change the owner of an object
-        Need to be the root administrator
-        @param string $object Object path to add
-        @param integer $owner Owner ID of the object */
+    /**
+     * Change the owner of an object
+     * Need to be the root administrator
+     * @param string $object Object path to add
+     * @param integer $owner Owner ID of the object
+     */
     public function chown($object, $owner)
     {
     }
 
-    /** Change the group of an object
-        Need to be the owner of the object or the root administrator
-        @param string $object Object path to add
-        @param integer $group Group ID of the object */
+    /**
+     * Change the group of an object
+     * Need to be the owner of the object or the root administrator
+     * @param string $object Object path to add
+     * @param integer $group Group ID of the object
+     */
     public function chgrp($object, $group)
     {
     }
 
-    /** Change mode bits for an object
-        Need to be the owner of the object or the root administrator
-        @param string $object Object path to change
-        @param integer $mod Bits of authorization */
+    /**
+     * Change mode bits for an object
+     * Need to be the owner of the object or the root administrator
+     * @param string $object Object path to change
+     * @param integer $mod Bits of authorization
+     */
     public function chmod($object, $mod)
     {
     }
 
-    /** Return the mode bits for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine */
+    /**
+     * Return the mode bits for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     */
     public function lsmod($object)
     {
     }
 
-    /** Return the owner for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine */
+    /**
+     * Return the owner for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     */
     public function lsown($object)
     {
     }
 
-    /** Return the owner for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine */
+    /**
+     * Return the owner for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     */
     public function lsgrp($object)
     {
     }
diff --git a/src/Authorizationdb.php b/src/Authorizationdb.php
index ad419d1..e80e3e5 100644
--- a/src/Authorizationdb.php
+++ b/src/Authorizationdb.php
@@ -1,30 +1,41 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** All the needed functions to authorize or deny access to an authenticated
-    user */
+/**
+ * All the needed functions to authorize or deny access to an authenticated
+ * user
+ */
 class Authorizationdb extends Authorization
 {
-    /** Separator between differents modules/objects */
+    /**
+     * Separator between differents modules/objects
+     */
     private $separator = "/";
-    /** Database PDO connector */
+    /**
+     * Database PDO connector
+     */
     private $db = null;
-    /** The prefix for the table */
+    /**
+     * The prefix for the table
+     */
     public $tableprefix = "";
 
-    /** Establish a connexion to the authorization database
-        @param string $dsn The DSN needed to connect to database
-        @param string|null $username The username needed to connect to database
-        @param string|null $password The password needed to connect to database
-        @param string|null $driver_options The driver options need to connect to
-                                           database */
+    /**
+     * Establish a connexion to the authorization database
+     * @param string $dsn The DSN needed to connect to database
+     * @param string|null $username The username needed to connect to database
+     * @param string|null $password The password needed to connect to database
+     * @param string|null $driver_options The driver options need to connect to
+     * database
+     */
     public function connectdb(
         $dsn,
         $username = null,
@@ -35,16 +46,18 @@ class Authorizationdb extends Authorization
         $this->db = new Dblayer($dsn, $username, $password, $driver_options);
         $this->db->table = "domframework_authorization";
         $this->db->tableprefix = $this->tableprefix;
-        $this->db->fields = array(
-                    "object" => array("varchar", "255", "not null"),
-                    "ownerid" => array("integer", "not null"),
-                    "groupid" => array("integer", "not null"),
-                    "modbits" => array("integer", "not null"));
+        $this->db->fields = [
+                    "object" => ["varchar", "255", "not null"],
+                    "ownerid" => ["integer", "not null"],
+                    "groupid" => ["integer", "not null"],
+                    "modbits" => ["integer", "not null"]];
         $this->db->primary = "object";
-        $this->db->unique = array("object");
+        $this->db->unique = ["object"];
     }
 
-    /** Create the structure to store the authorization database */
+    /**
+     * Create the structure to store the authorization database
+     */
     public function initialize()
     {
         if ($this->db === null) {
@@ -54,18 +67,20 @@ class Authorizationdb extends Authorization
             ), 500);
         }
         $tables = $this->db->listTables();
-        if (!in_array($this->db->tableprefix . $this->db->table, $tables)) {
+        if (!in_array($this->db->tableprefix . $this->db->table, $tables, true)) {
             $this->db->createTable();
-            $first = array("object" => "/", "ownerid" => 0, "groupid" => 0,
-                      "modbits" => 755);
+            $first = ["object" => "/", "ownerid" => 0, "groupid" => 0,
+                      "modbits" => 755];
             $this->db->create($first);
         }
     }
 
-    /** Return if the user right is NONE, READ, WRITE, EXECUTE
-        if the object doesn't exists, or is not readable, throw an exception
-        @param string $object The object path to examine
-        @return array with READ, WRITE, EXECUTE */
+    /**
+     * Return if the user right is NONE, READ, WRITE, EXECUTE
+     * if the object doesn't exists, or is not readable, throw an exception
+     * @param string $object The object path to examine
+     * @return array with READ, WRITE, EXECUTE
+     */
     public function validate($object)
     {
         if ($this->db === null) {
@@ -98,7 +113,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(
@@ -116,10 +131,10 @@ class Authorizationdb extends Authorization
         $groupid = intval($search["groupid"]);
         $modbits = octdec($search["modbits"]);
         if ($this->authiduser === 0) {
-            return array("READ", "WRITE", "EXECUTE");
+            return ["READ", "WRITE", "EXECUTE"];
         }
 
-        $res = array();
+        $res = [];
         if ($this->authiduser === $ownerid) {
             if (($modbits & 0100) === 0100) {
                 $res[] = "EXECUTE";
@@ -160,12 +175,14 @@ class Authorizationdb extends Authorization
         return array_unique($res);
     }
 
-    /** Add a new object, with ownerid and groupid, and mode bits
-        @param string $object Object path to add
-        @param integer $ownerid Owner ID of the object
-        @param integer $groupid Group ID of the object
-        @param integer $modbits Bits of authorization
-        @return boolean TRUE or an exception with the error message */
+    /**
+     * Add a new object, with ownerid and groupid, and mode bits
+     * @param string $object Object path to add
+     * @param integer $ownerid Owner ID of the object
+     * @param integer $groupid Group ID of the object
+     * @param integer $modbits Bits of authorization
+     * @return boolean TRUE or an exception with the error message
+     */
     public function add($object, $ownerid, $groupid, $modbits)
     {
         if ($this->db === null) {
@@ -198,7 +215,7 @@ class Authorizationdb extends Authorization
                 "Can't create object not owned by myself"
             ), 406);
         }
-        if ($this->authiduser !== 0 && !in_array($groupid, $this->authgroups)) {
+        if ($this->authiduser !== 0 && !in_array($groupid, $this->authgroups, true)) {
             throw new \Exception(dgettext(
                 "domframework",
                 "Can't create object with not owned group"
@@ -212,7 +229,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search)) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -226,10 +243,10 @@ class Authorizationdb extends Authorization
         // All the folder structure is accessible. Check if we can add the file in
         // the last folder (Write modbit). Root can always write.
         if ($this->authiduser === 0) {
-            $this->db->create(array("object" => $object,
+            $this->db->create(["object" => $object,
                                 "ownerid" => $ownerid,
                                 "groupid" => $groupid,
-                                "modbits" => $modbits));
+                                "modbits" => $modbits]);
             return true;
         }
 
@@ -239,16 +256,18 @@ class Authorizationdb extends Authorization
             throw new \Exception($e->getMessage(), 405);
         }
 
-        $this->db->create(array("object" => $object,
+        $this->db->create(["object" => $object,
                               "ownerid" => $ownerid,
                               "groupid" => $groupid,
-                              "modbits" => $modbits));
+                              "modbits" => $modbits]);
         return true;
     }
 
-    /** Remove the information about an object and all its sub-objects
-        @param string $object Object path to drop
-        @return boolean TRUE or an exception with the error message */
+    /**
+     * Remove the information about an object and all its sub-objects
+     * @param string $object Object path to drop
+     * @return boolean TRUE or an exception with the error message
+     */
     public function drop($object)
     {
         if ($this->db === null) {
@@ -287,7 +306,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(sprintf(
                 dgettext(
@@ -341,11 +360,13 @@ class Authorizationdb extends Authorization
         return true;
     }
 
-    /** Change the owner of an object
-        Need to be the root administrator
-        @param string $object Object path to add
-        @param integer $ownerid Owner ID of the object
-        @return boolean TRUE or an exception with the error message */
+    /**
+     * Change the owner of an object
+     * Need to be the root administrator
+     * @param string $object Object path to add
+     * @param integer $ownerid Owner ID of the object
+     * @return boolean TRUE or an exception with the error message
+     */
     public function chown($object, $ownerid)
     {
         if ($this->db === null) {
@@ -384,7 +405,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -395,15 +416,17 @@ class Authorizationdb extends Authorization
             );
         }
         $search = reset($search);
-        $this->db->update($object, array("ownerid" => $ownerid));
+        $this->db->update($object, ["ownerid" => $ownerid]);
         return true;
     }
 
-    /** Change the group of an object
-        Need to be the ownerid of the object or the root administrator
-        @param string $object Object path to add
-        @param integer $groupid Group ID of the object
-        @return boolean TRUE or an exception with the error message */
+    /**
+     * Change the group of an object
+     * Need to be the ownerid of the object or the root administrator
+     * @param string $object Object path to add
+     * @param integer $groupid Group ID of the object
+     * @return boolean TRUE or an exception with the error message
+     */
     public function chgrp($object, $groupid)
     {
         if ($this->db === null) {
@@ -428,13 +451,13 @@ class Authorizationdb extends Authorization
                 "Not authenticated"
             ), 401);
         }
-        if ($this->authiduser !== 0 && !in_array($groupid, $this->authgroups)) {
+        if ($this->authiduser !== 0 && !in_array($groupid, $this->authgroups, true)) {
             throw new \Exception(dgettext(
                 "domframework",
                 "The user must be in the wanted group"
             ), 405);
         }
-        if (!in_array("WRITE", $this->validate($object))) {
+        if (!in_array("WRITE", $this->validate($object), true)) {
             throw new \Exception(sprintf(dgettext(
                 "domframework",
                 "%s is write protected"
@@ -448,7 +471,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -459,15 +482,17 @@ class Authorizationdb extends Authorization
             );
         }
         $search = reset($search);
-        $this->db->update($object, array("groupid" => $groupid));
+        $this->db->update($object, ["groupid" => $groupid]);
         return true;
     }
 
-    /** Change mode bits for an object
-        Need to be the owner of the object or the root administrator
-        @param string $object Object path to change
-        @param integer $mod Bits of authorization
-        @return boolean TRUE or an exception with the error message */
+    /**
+     * Change mode bits for an object
+     * Need to be the owner of the object or the root administrator
+     * @param string $object Object path to change
+     * @param integer $mod Bits of authorization
+     * @return boolean TRUE or an exception with the error message
+     */
     public function chmod($object, $mod)
     {
         if ($this->db === null) {
@@ -492,7 +517,7 @@ class Authorizationdb extends Authorization
                 "Not authenticated"
             ), 401);
         }
-        if (!in_array("WRITE", $this->validate($object))) {
+        if (!in_array("WRITE", $this->validate($object), true)) {
             throw new \Exception(sprintf(dgettext(
                 "domframework",
                 "%s is write protected"
@@ -506,7 +531,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -518,14 +543,16 @@ class Authorizationdb extends Authorization
         }
         $search = reset($search);
         // TODO : Don't update if the user is not the owner of the file
-        $this->db->update($object, array("modbits" => $modbits));
+        $this->db->update($object, ["modbits" => $modbits]);
         return true;
     }
 
-    /** Return the mode bits for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine
-        @return int|float the modbits or an exception with the error message */
+    /**
+     * Return the mode bits for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     * @return int|float the modbits or an exception with the error message
+     */
     public function lsmod($object)
     {
         if ($this->db === null) {
@@ -558,7 +585,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -572,10 +599,12 @@ class Authorizationdb extends Authorization
         return octdec($search["modbits"]);
     }
 
-    /** Return the ownerid for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine
-        @return integer the ownerid or an exception with the error message */
+    /**
+     * Return the ownerid for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     * @return integer the ownerid or an exception with the error message
+     */
     public function lsown($object)
     {
         if ($this->db === null) {
@@ -608,7 +637,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -622,10 +651,12 @@ class Authorizationdb extends Authorization
         return intval($search["ownerid"]);
     }
 
-    /** Return the groupid for an object if all his parents are readable for
-        the user
-        @param string $object Object path to examine
-        @return integer the groupid or an exception with the error message */
+    /**
+     * Return the groupid for an object if all his parents are readable for
+     * the user
+     * @param string $object Object path to examine
+     * @return integer the groupid or an exception with the error message
+     */
     public function lsgrp($object)
     {
         if ($this->db === null) {
@@ -658,7 +689,7 @@ class Authorizationdb extends Authorization
 
         // All the folder structure is accessible. Check if the object already
         // exists
-        $search = $this->db->read(array(array("object", $object)));
+        $search = $this->db->read([["object", $object]]);
         if (count($search) === 0) {
             throw new \Exception(
                 sprintf(dgettext(
@@ -675,9 +706,11 @@ class Authorizationdb extends Authorization
     ////////////////////
     //   TREE CHECK   //
     ////////////////////
-    /** Check if all the parent objects are executable
-        @param string $object The object to test
-        @return boolean TRUE or an exception in case of error */
+    /**
+     * Check if all the parent objects are executable
+     * @param string $object The object to test
+     * @return boolean TRUE or an exception in case of error
+     */
     private function treecheckExecute($object)
     {
         if ($this->db === null) {
@@ -687,7 +720,7 @@ class Authorizationdb extends Authorization
             ), 500);
         }
         // Search all the parents in an array
-        $parents = array();
+        $parents = [];
         $par = $object;
         while ($par !== "/") {
             $par = dirname($par);
@@ -758,13 +791,15 @@ class Authorizationdb extends Authorization
         return true;
     }
 
-    /** Check if the parent of object is writeable
-        @param string $object The object to found
-        @return boolean TRUE or an exception */
+    /**
+     * Check if the parent of object is writeable
+     * @param string $object The object to found
+     * @return boolean TRUE or an exception
+     */
     private function treecheckWrite($object)
     {
         $parent = dirname($object);
-        $search = $this->db->read(array(array("object", $parent)));
+        $search = $this->db->read([["object", $parent]]);
         $search = reset($search);
         $parentOwner = intval($search["ownerid"]);
         $parentGroup = intval($search["groupid"]);
@@ -775,8 +810,8 @@ class Authorizationdb extends Authorization
 
         if ((($parentModbits & 0020) === 16)) {
             if (
-                in_array($parentGroup, $this->authgroups) ||
-                in_array(0, $this->authgroups)
+                in_array($parentGroup, $this->authgroups, true) ||
+                in_array(0, $this->authgroups, true)
             ) {
                 return true;
             }
diff --git a/src/Authparams.php b/src/Authparams.php
index 5ce680d..4e14eea 100644
--- a/src/Authparams.php
+++ b/src/Authparams.php
@@ -1,29 +1,39 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Takes the email and the password of the user */
+/**
+ * Takes the email and the password of the user
+ */
 class Authparams
 {
-    /** The email of the user when provided */
+    /**
+     * The email of the user when provided
+     */
     public $email = null;
-    /** The password of the user when provided */
+    /**
+     * The password of the user when provided
+     */
     public $password = null;
-    /** The method used to get the authentication data */
+    /**
+     * The method used to get the authentication data
+     */
     public $method = null;
 
-    /** Parse the different authentication processes to found the email/password
-      * of the user.
-      * If non is found, return "anonymous", "anonymous"
-      * @param array|null $authprocesses The authentication process to use
-      */
-    public function __construct($authprocesses = array("session", "post"))
+    /**
+     * Parse the different authentication processes to found the email/password
+     * of the user.
+     * If non is found, return "anonymous", "anonymous"
+     * @param array|null $authprocesses The authentication process to use
+     */
+    public function __construct($authprocesses = ["session", "post"])
     {
         if (php_sapi_name() === "cli") {
             $this->email = "cli";
@@ -46,19 +56,21 @@ class Authparams
         }
     }
 
-    /** Get information from $POST variables
-      */
+    /**
+     * Get information from $POST variables
+     */
     public function post()
     {
         if (!isset($_POST["email"]) || !isset($_POST["password"])) {
             throw new \Exception("No POST provided", 403);
         }
-        return array("email"    => trim($_POST["email"]),
-                  "password" => $_POST["password"]);
+        return ["email"    => trim($_POST["email"]),
+                  "password" => $_POST["password"]];
     }
 
-    /** Get information from previous recorded session
-      */
+    /**
+     * Get information from previous recorded session
+     */
     public function session()
     {
         if (!isset($_SESSION) || session_id() === "") {
@@ -70,12 +82,13 @@ class Authparams
         ) {
             throw new \Exception("No previous email in session", 403);
         }
-        return array("email"    => $_SESSION["domframework"]["auth"]["email"],
-                  "password" => $_SESSION["domframework"]["auth"]["password"]);
+        return ["email"    => $_SESSION["domframework"]["auth"]["email"],
+                  "password" => $_SESSION["domframework"]["auth"]["password"]];
     }
 
-    /** Get information from a HTTP authentication
-      */
+    /**
+     * Get information from a HTTP authentication
+     */
     public function http()
     {
         $realm = dgettext("domframework", "Restricted access");
@@ -88,13 +101,14 @@ class Authparams
             if (! array_key_exists("PHP_AUTH_PW", $_SERVER)) {
                 $_SERVER["PHP_AUTH_PW"] = null;
             }
-            return array("email"    => trim($_SERVER["PHP_AUTH_USER"]),
-                    "password" => $_SERVER["PHP_AUTH_PW"]);
+            return ["email"    => trim($_SERVER["PHP_AUTH_USER"]),
+                    "password" => $_SERVER["PHP_AUTH_PW"]];
         }
     }
 
-    /** Get the information from a shibboleth provider
-      */
+    /**
+     * Get the information from a shibboleth provider
+     */
     public function shibboleth()
     {
         if (! isset($_SERVER["Shib-Session-ID"])) {
@@ -103,23 +117,24 @@ class Authparams
         if (! isset($_SERVER["mail"])) {
             throw new \Exception("No Shibboleth email provided", 403);
         }
-        return array("email"    => $_SERVER["mail"],
-                  "password" => "NONE IN SHIBBOLETH");
+        return ["email"    => $_SERVER["mail"],
+                  "password" => "NONE IN SHIBBOLETH"];
     }
 
-    /** Get the information from a Bearer Token
-      * The token MUST be set in HTTP Header :
-      *     Authentication: Bearer <token>
-      * Ex in curl :
-      * curl -s -u "login:password" -X POST \
-      *    http://localhost/rest/authentication/ | jq -r
-      * curl -s \
-      *   -H "Accept: application/json" \
-      *   -H "Authentication: Bearer {$BearerToken}" \
-      *   http://localhost/rest/api/
-      * The real verification are done in authjwt, as we can not have the
-      * jwtServerKey defined in property : the execution is done in constructor
-      */
+    /**
+     * Get the information from a Bearer Token
+     * The token MUST be set in HTTP Header :
+     *     Authentication: Bearer <token>
+     * Ex in curl :
+     * curl -s -u "login:password" -X POST \
+     *    http://localhost/rest/authentication/ | jq -r
+     * curl -s \
+     *   -H "Accept: application/json" \
+     *   -H "Authentication: Bearer {$BearerToken}" \
+     *   http://localhost/rest/api/
+     * The real verification are done in authjwt, as we can not have the
+     * jwtServerKey defined in property : the execution is done in constructor
+     */
     public function bearer()
     {
         if (! isset($_SERVER["HTTP_AUTHENTICATION"])) {
@@ -129,7 +144,7 @@ class Authparams
             throw new \Exception("No Bearer Authentication available", 401);
         }
         $token = substr($_SERVER["HTTP_AUTHENTICATION"], 7);
-        return array("email"    => "NOT YET VALID : TOKEN IN JWT",
-                  "password" => "NONE IN JWT");
+        return ["email"    => "NOT YET VALID : TOKEN IN JWT",
+                  "password" => "NONE IN JWT"];
     }
 }
diff --git a/src/Authsession.php b/src/Authsession.php
index 9e62888..a1f19dc 100644
--- a/src/Authsession.php
+++ b/src/Authsession.php
@@ -1,17 +1,21 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against SESSION */
+/**
+ * User authentication against SESSION
+ */
 class Authsession extends Auth
 {
-    /** Check if there is already a session or the user can not be authenticated
+    /**
+     * Check if there is already a session or the user can not be authenticated
      */
     public function __construct()
     {
@@ -20,16 +24,19 @@ class Authsession extends Auth
         }
     }
 
-    /** No connection to session */
+    /**
+     * No connection to session
+     */
     public function connect()
     {
         return true;
     }
 
-    /** Try to authenticate the email/password of the user
-      * @param string $email Email to authenticate
-      * @param string $password Password to authenticate
-      */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         if (
@@ -46,24 +53,27 @@ class Authsession extends Auth
         }
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         if (! isset($_SESSION["domframework"]["auth"]["email"])) {
-            return array("lastname" => "anonymous",
+            return ["lastname" => "anonymous",
                     "firstname" => "",
-                    "email" => "anonymous");
+                    "email" => "anonymous"];
         }
-        return array("lastname" => $_SESSION["domframework"]["auth"]["lastname"],
+        return ["lastname" => $_SESSION["domframework"]["auth"]["lastname"],
                   "firstname" => $_SESSION["domframework"]["auth"]["firstname"],
-                  "email" => $_SESSION["domframework"]["auth"]["email"]);
+                  "email" => $_SESSION["domframework"]["auth"]["email"]];
     }
 
-    /** Method to change the password : unavailable in SESSION auth
-      * @param string $oldpassword The old password (to check if the user have the
-      *    rights to change the password)
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to change the password : unavailable in SESSION auth
+     * @param string $oldpassword The old password (to check if the user have the
+     *    rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(
@@ -75,12 +85,13 @@ class Authsession extends Auth
         );
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-      * Must be reserved to the administrators. For the users, use changepassword
-      * method
-      * @param string $email the user identifier to select
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
@@ -92,23 +103,26 @@ class Authsession extends Auth
         );
     }
 
-    /** Save the data in session
-      * @param string $email The email to store in the session
-      * @param string $password The password to store in the session
-      * @param string $lastname The lastname to store in the session
-      * @param string $firstname The firstname to store in the session
-      * @deprecated 0.23  */
+    /**
+     * Save the data in session
+     * @param string $email The email to store in the session
+     * @param string $password The password to store in the session
+     * @param string $lastname The lastname to store in the session
+     * @param string $firstname The firstname to store in the session
+     * @deprecated 0.23
+     */
     public function savedatas($email, $password, $lastname, $firstname)
     {
         return $this->savedata($email, $password, $lastname, $firstname);
     }
 
-    /** Save the data in session
-      * @param string $email The email to store in the session
-      * @param string $password The password to store in the session
-      * @param string $lastname The lastname to store in the session
-      * @param string $firstname The firstname to store in the session
-      */
+    /**
+     * Save the data in session
+     * @param string $email The email to store in the session
+     * @param string $password The password to store in the session
+     * @param string $lastname The lastname to store in the session
+     * @param string $firstname The firstname to store in the session
+     */
     public function savedata($email, $password, $lastname, $firstname)
     {
         $_SESSION["domframework"]["auth"]["lastname"] = $lastname;
@@ -117,7 +131,9 @@ class Authsession extends Auth
         $_SESSION["domframework"]["auth"]["password"] = $password;
     }
 
-    /** Remove the information from the session */
+    /**
+     * Remove the information from the session
+     */
     public function logout()
     {
         if (isset($_SESSION["domframework"]["auth"]["lastname"])) {
diff --git a/src/Authshibboleth.php b/src/Authshibboleth.php
index 6aeed93..f02e6cc 100644
--- a/src/Authshibboleth.php
+++ b/src/Authshibboleth.php
@@ -1,40 +1,61 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against Shibboleth */
+/**
+ * User authentication against Shibboleth
+ */
 class Authshibboleth extends Auth
 {
-    /** The Lastname parameter returned by Shibboleth server */
+    /**
+     * The Lastname parameter returned by Shibboleth server
+     */
     public $lastnameParam = "sn";
-    /** The Firstname parameter returned by Shibboleth server */
+    /**
+     * The Firstname parameter returned by Shibboleth server
+     */
     public $firstnameParam = "givenName";
-    /** The mail parameter returned by Shibboleth server */
+    /**
+     * The mail parameter returned by Shibboleth server
+     */
     public $mailParam = "mail";
-    /** The others parameters returned by Shibboleth server */
-    public $otherFields = array("ou", "o");
-    /** The optional URL use to authenticate the users */
+    /**
+     * The others parameters returned by Shibboleth server
+     */
+    public $otherFields = ["ou", "o"];
+    /**
+     * The optional URL use to authenticate the users
+     */
     public $urlAuthentificated = "";
-    /** The optional URL to disconnect the users */
+    /**
+     * The optional URL to disconnect the users
+     */
     public $urlLogout = "";
-    /** The optional URL to change the user password */
+    /**
+     * The optional URL to change the user password
+     */
     public $urlPasswd = "";
 
-    /** No connection to shibboleth */
+    /**
+     * No connection to shibboleth
+     */
     public function connect()
     {
         return true;
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         if (!isset($_SERVER["mail"])) {
@@ -46,17 +67,19 @@ class Authshibboleth extends Auth
         }
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         if (! isset($_SERVER[$this->mailParam])) {
-            return array("lastname" => "anonymous",
+            return ["lastname" => "anonymous",
                     "firstname" => "",
-                    "email" => "anonymous");
+                    "email" => "anonymous"];
         }
-        $res = array("lastname" => $_SERVER[$this->lastnameParam],
+        $res = ["lastname" => $_SERVER[$this->lastnameParam],
                   "firstname" => $_SERVER[$this->firstnameParam],
-                  "email" => $_SERVER[$this->mailParam]);
+                  "email" => $_SERVER[$this->mailParam]];
         foreach ($this->otherFields as $field) {
             if (array_key_exists($field, $_SERVER)) {
                 $res[$field] = $_SERVER[$field];
@@ -65,10 +88,12 @@ class Authshibboleth extends Auth
         return $res;
     }
 
-    /** Method to change the password : unavailable in SESSION auth
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password : unavailable in SESSION auth
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         // Redirect to Shibboleth IDP
@@ -85,11 +110,13 @@ class Authshibboleth extends Auth
         $route->redirect($this->urlPasswdChange);
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user identifier to select
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
@@ -101,7 +128,9 @@ class Authshibboleth extends Auth
         );
     }
 
-    /** Remove the information from the session */
+    /**
+     * Remove the information from the session
+     */
     public function logout()
     {
         // Redirect to Shibboleth IDP
diff --git a/src/Authsql.php b/src/Authsql.php
index ba03e91..94b70f9 100644
--- a/src/Authsql.php
+++ b/src/Authsql.php
@@ -1,46 +1,77 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against SQL database */
+/**
+ * User authentication against SQL database
+ */
 class Authsql extends Auth
 {
-    /** The DSN to use to connect to SQL database */
+    /**
+     * The DSN to use to connect to SQL database
+     */
     public $dsn = null;
-    /** The username to connect to the database */
+    /**
+     * The username to connect to the database
+     */
     public $username = null;
-    /** The password to use to connecto to the database */
+    /**
+     * The password to use to connecto to the database
+     */
     public $password = null;
-    /** The driver options for the PDO driver */
+    /**
+     * The driver options for the PDO driver
+     */
     public $driver_options = null;
-    /** The table name to use */
+    /**
+     * The table name to use
+     */
     public $table = null;
-    /** The tableprefix text to prepend to table name (Should finish by _)
-        Just allow chars ! */
+    /**
+     * The tableprefix text to prepend to table name (Should finish by _)
+     * Just allow chars !
+     */
     public $tableprefix = "";
-    /** The password field name */
+    /**
+     * The password field name
+     */
     public $fieldPassword = "password";
-    /** The identifier field name (maybe email) */
+    /**
+     * The identifier field name (maybe email)
+     */
     public $fieldIdentifier = "email";
-    /** The field name containing the lastname of the user */
+    /**
+     * The field name containing the lastname of the user
+     */
     public $fieldLastname = null;
-    /** The field name containing the Firstname of the user */
+    /**
+     * The field name containing the Firstname of the user
+     */
     public $fieldFirstname = null;
-    /** The information fields (in an array) */
-    public $fieldsInfo = array();
+    /**
+     * The information fields (in an array)
+     */
+    public $fieldsInfo = [];
 
-    /** The DBLayer pointer */
+    /**
+     * The DBLayer pointer
+     */
     private $db = null;
-    /** The details of the authenticated user */
+    /**
+     * The details of the authenticated user
+     */
     private $details = null;
 
-    /** Establish a connection to a SQL server */
+    /**
+     * Establish a connection to a SQL server
+     */
     public function connect()
     {
         if (! function_exists("openssl_random_pseudo_bytes")) {
@@ -89,22 +120,24 @@ class Authsql extends Auth
             ), 500);
         }
         $fields = array_merge(
-            array($this->fieldIdentifier, $this->fieldPassword,
-                                  $this->fieldLastname, $this->fieldFirstname),
+            [$this->fieldIdentifier, $this->fieldPassword,
+                                  $this->fieldLastname, $this->fieldFirstname],
             $this->fieldsInfo
         );
         $fields = array_flip($fields);
         foreach ($fields as $key => $val) {
-            $fields[$key] = array("varchar", "255");
+            $fields[$key] = ["varchar", "255"];
         }
         $this->db->table = $this->table;
         $this->db->fields = $fields;
         $this->db->primary = $this->fieldIdentifier;
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         if ($this->db === null) {
@@ -114,12 +147,12 @@ class Authsql extends Auth
             ), 500);
         }
         $data = $this->db->read(
-            array(array($this->fieldIdentifier, $email)),
+            [[$this->fieldIdentifier, $email]],
             array_merge(
-                array($this->fieldIdentifier,
+                [$this->fieldIdentifier,
                                                  $this->fieldFirstname,
                                                  $this->fieldLastname,
-                                                 $this->fieldPassword),
+                                                 $this->fieldPassword],
                 $this->fieldsInfo
             )
         );
@@ -160,16 +193,20 @@ class Authsql extends Auth
         $this->details = $content;
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         return $this->details;
     }
 
-    /** Method to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         if ($this->db === null) {
@@ -191,10 +228,10 @@ class Authsql extends Auth
             );
         }
         $data = $this->db->read(
-            array(array($this->fieldIdentifier,
-                                       $this->details[$this->fieldIdentifier])),
-            array($this->fieldIdentifier,
-                                           $this->fieldPassword)
+            [[$this->fieldIdentifier,
+                                       $this->details[$this->fieldIdentifier]]],
+            [$this->fieldIdentifier,
+                                           $this->fieldPassword]
         );
         $cryptedPassword = $data[0][$this->fieldPassword];
         if (crypt($oldpassword, $cryptedPassword) !== $cryptedPassword) {
@@ -206,16 +243,16 @@ class Authsql extends Auth
         $cost = 11;
         $salt = substr(base64_encode(openssl_random_pseudo_bytes(17)), 0, 22);
         $salt = str_replace("+", ".", $salt);
-        $param = '$' . implode('$', array(
+        $param = '$' . implode('$', [
            "2y", //select the most secure version of blowfish (>=PHP 5.3.7)
            str_pad($cost, 2, "0", STR_PAD_LEFT), //add the cost in two digits
            $salt //add the salt
-        ));
+        ]);
         //now do the actual hashing
         $cryptpassword = crypt($newpassword, $param);
         $rc = $this->db->update(
             $this->details[$this->fieldIdentifier],
-            array($this->fieldPassword => $cryptpassword)
+            [$this->fieldPassword => $cryptpassword]
         );
         if ($rc !== 1) {
             throw new \Exception(dgettext(
@@ -225,11 +262,13 @@ class Authsql extends Auth
         }
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user identifier to select
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         if ($this->db === null) {
@@ -239,9 +278,9 @@ class Authsql extends Auth
             ), 500);
         }
         $data = $this->db->read(
-            array(array($this->fieldIdentifier, $email)),
-            array($this->fieldIdentifier,
-                                           $this->fieldPassword)
+            [[$this->fieldIdentifier, $email]],
+            [$this->fieldIdentifier,
+                                           $this->fieldPassword]
         );
         if (count($data) === 0) {
             throw new \Exception(sprintf(
@@ -255,16 +294,16 @@ class Authsql extends Auth
         $cost = 11;
         $salt = substr(base64_encode(openssl_random_pseudo_bytes(17)), 0, 22);
         $salt = str_replace("+", ".", $salt);
-        $param = '$' . implode('$', array(
+        $param = '$' . implode('$', [
            "2y", //select the most secure version of blowfish (>=PHP 5.3.7)
            str_pad($cost, 2, "0", STR_PAD_LEFT), //add the cost in two digits
            $salt //add the salt
-        ));
+        ]);
         //now do the actual hashing
         $cryptpassword = crypt($newpassword, $param);
         $rc = $this->db->update(
             $email,
-            array($this->fieldPassword => $cryptpassword)
+            [$this->fieldPassword => $cryptpassword]
         );
         if ($rc !== 1) {
             throw new \Exception(dgettext(
@@ -273,8 +312,10 @@ class Authsql extends Auth
             ), 500);
         }
     }
-    /** List all the users available in the database
-        Return firstname, lastname, mail, with mail is an array */
+    /**
+     * List all the users available in the database
+     * Return firstname, lastname, mail, with mail is an array
+     */
     public function listusers()
     {
         if ($this->db === null) {
@@ -284,9 +325,9 @@ class Authsql extends Auth
             ), 500);
         }
         $data = $this->db->read(null, array_merge(
-            array($this->fieldIdentifier,
+            [$this->fieldIdentifier,
                                                        $this->fieldFirstname,
-                                                       $this->fieldLastname),
+                                                       $this->fieldLastname],
             $this->fieldsInfo
         ));
         return $data;
diff --git a/src/Authsympa.php b/src/Authsympa.php
index 4a945ed..3fceba2 100644
--- a/src/Authsympa.php
+++ b/src/Authsympa.php
@@ -1,47 +1,63 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** User authentication against SYMPA server
-    Sympa is a mailling list server. It can handle authentication with
-    - a username (a email adress)
-    - a password
-    - a list to check if the user is recorded in
-    - a Sympa SOAP server WSDL
-    - the part of list which should be test : subscriber, owner, editor
-    It use the SOAP protocol. So the PHP SOAP library is needed and the network
-    must be open between the Web server and the Sympa server.
-POC :
-$auth = new Authsympa ();
-$auth->wsdl = "https://lists.domain.tld/sympa/wsdl";
-$auth->list = "listtest@lists.domain.tld";
-$auth->connect ();
-var_dump ($auth->authentication ("user@domain.tld", "Pa$$word!"));
-*/
+/**
+ * User authentication against SYMPA server
+ * Sympa is a mailling list server. It can handle authentication with
+ * - a username (a email adress)
+ * - a password
+ * - a list to check if the user is recorded in
+ * - a Sympa SOAP server WSDL
+ * - the part of list which should be test : subscriber, owner, editor
+ * It use the SOAP protocol. So the PHP SOAP library is needed and the network
+ * must be open between the Web server and the Sympa server.
+ * POC :
+ * $auth = new Authsympa ();
+ * $auth->wsdl = "https://lists.domain.tld/sympa/wsdl";
+ * $auth->list = "listtest@lists.domain.tld";
+ * $auth->connect ();
+ * var_dump ($auth->authentication ("user@domain.tld", "Pa$$word!"));
+ */
 class Authsympa extends Auth
 {
-    /** URL of the WSDL Sympa server */
+    /**
+     * URL of the WSDL Sympa server
+     */
     public $wsdl = null;
-    /** Mailling list to be checked if user is present */
+    /**
+     * Mailling list to be checked if user is present
+     */
     public $list = null;
-    /** Function of the user in the mailling list
-        can be subscriber, owner, editor */
+    /**
+     * Function of the user in the mailling list
+     * can be subscriber, owner, editor
+     */
     public $function = "subscriber";
 
-    /** Soap Client identifier */
+    /**
+     * Soap Client identifier
+     */
     private $client = null;
-    /** Temporary auth key used betwwen commands */
+    /**
+     * Temporary auth key used betwwen commands
+     */
     private $authkey = null;
-    /** Email of the user if the authentication is correct */
+    /**
+     * Email of the user if the authentication is correct
+     */
     private $details = null;
 
-    /** Check if the SOAP module is available in PHP */
+    /**
+     * Check if the SOAP module is available in PHP
+     */
     public function __construct()
     {
         if (! class_exists("SoapClient")) {
@@ -52,7 +68,9 @@ class Authsympa extends Auth
         }
     }
 
-    /** Connect to the Sympa server */
+    /**
+     * Connect to the Sympa server
+     */
     public function connect()
     {
         if ($this->wsdl === null) {
@@ -64,9 +82,11 @@ class Authsympa extends Auth
         $this->client = new \SoapClient($this->wsdl);
     }
 
-    /** Try to authenticate the email/password of the user
-        @param string $email Email to authenticate
-        @param string $password Password to authenticate */
+    /**
+     * Try to authenticate the email/password of the user
+     * @param string $email Email to authenticate
+     * @param string $password Password to authenticate
+     */
     public function authentication($email, $password)
     {
         if ($this->client === null) {
@@ -95,7 +115,7 @@ class Authsympa extends Auth
             $email,
             $this->authkey,
             'amI',
-            array($this->list, $this->function, $email)
+            [$this->list, $this->function, $email]
         );
         if ($rc === null || $rc === false) {
             throw new \Exception(dgettext(
@@ -103,20 +123,24 @@ class Authsympa extends Auth
                 "User not in Sympa list or bad password"
             ), 401);
         }
-        $this->details = array("email" => $email);
+        $this->details = ["email" => $email];
         return $rc;
     }
 
-    /** Return all the parameters recorded for the authenticate user */
+    /**
+     * Return all the parameters recorded for the authenticate user
+     */
     public function getdetails()
     {
         return $this->details;
     }
 
-    /** Method to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     * rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($oldpassword, $newpassword)
     {
         throw new \Exception(
@@ -128,11 +152,13 @@ class Authsympa extends Auth
         );
     }
 
-    /** Method to overwrite the password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user identifier to select
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Method to overwrite the password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user identifier to select
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
         throw new \Exception(
diff --git a/src/Authzgroups.php b/src/Authzgroups.php
index bde8668..00e8233 100644
--- a/src/Authzgroups.php
+++ b/src/Authzgroups.php
@@ -1,15 +1,18 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** All the needed functions to authorize or deny access to an authenticated
-    user by its groups membership */
+/**
+ * All the needed functions to authorize or deny access to an authenticated
+ * user by its groups membership
+ */
 class Authzgroups
 {
     /**
@@ -17,28 +20,41 @@ class Authzgroups
      * @var string
      */
     public $tableprefix = "";
-    /** The dblayer object use to manage the Object table */
+    /**
+     * The dblayer object use to manage the Object table
+     */
     private $dbObject = null;
-    /** The dblayer object use to manage the Group table */
+    /**
+     * The dblayer object use to manage the Group table
+     */
     private $dbGroup = null;
-    /** The dblayer object use to manage the GroupMember table */
+    /**
+     * The dblayer object use to manage the GroupMember table
+     */
     private $dbGroupMember = null;
-    /** The dblayer object use to manage the Right table */
+    /**
+     * The dblayer object use to manage the Right table
+     */
     private $dbRight = null;
-    /** Set the debug level */
+    /**
+     * Set the debug level
+     */
     public $debug = 0;
-    /** A local cache of the rights if multiple tests are needed */
+    /**
+     * A local cache of the rights if multiple tests are needed
+     */
     private $rightCache = null;
 
     /////////////////////
     //   USER RIGHTS   //
     /////////////////////
-    /** Return an array with all the rights of the user in the module.
-      * Cache this information to be quicker with next requests
-      * Remove the entries where path is not at least readable
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      */
+    /**
+     * Return an array with all the rights of the user in the module.
+     * Cache this information to be quicker with next requests
+     * Remove the entries where path is not at least readable
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     */
     public function userrightsget($module, $user)
     {
         //    if (isset ($_SESSION["domframework"]["authzgroups"][$module][$user]))
@@ -99,7 +115,7 @@ class Authzgroups
             }
             throw new \Exception($e->getMessage(), 500);
         }
-        $res = array();
+        $res = [];
         while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
             $res[$d["object"]] = $d["right"];
         }
@@ -126,47 +142,32 @@ class Authzgroups
         return $res;
     }
 
-    /** Return the right defined for this user in the module for one object
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to return the rights for the user
-      */
+    /**
+     * Return the right defined for this user in the module for one object
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to return the rights for the user
+     */
     public function allow($module, $user, $object)
     {
         $ressource = $this->userrightsget($module, $user);
         // The complete tree should not be readable for the user : it can have
         // access to a card, but not to all the cards (group -> reject,
         // group/XXX->allow)
-        /*// Limit to allowed trees : if a member of the path is not recorded (is
-        // unreadable), return NO.
-        // Can be the last entry (the complete object) too
-        $path = explode ("/", $object);
-        $completePath = "/";
-        foreach ($path as $k=>$p)
-        {
-          if ($k>1)
-            $completePath .= "/";
-          $completePath .= "$p";
-          if (! isset ($ressource[$completePath]))
-          {
-            if ($this->debug)
-              echo "DEBUG allow : REJECT because $completePath is not found\n";
-            return "NO";
-          }
-        }*/
         if (! isset($ressource[$object])) {
             return "NO";
         }
         return $ressource[$object];
     }
 
-    /** Return TRUE if the user right allow to see the object (RO or RW)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to see the object (RO or RW)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessRight($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -211,13 +212,14 @@ class Authzgroups
         throw new \Exception(dgettext("domframework", "Access forbidden"), 403);
     }
 
-    /** Return TRUE if the user right allow to edit the object (RW only)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to edit the object (RW only)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessWrite($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -265,14 +267,15 @@ class Authzgroups
         );
     }
 
-    /** Return TRUE if the user right allow to see but without modification
-      * the object  (RO only)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to see but without modification
+     * the object  (RO only)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessReadOnly($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -320,14 +323,15 @@ class Authzgroups
     /////////////////////////
     //  DATABASE STORAGE   //
     /////////////////////////
-    /** Connect to the database before using it
-      * @param string $dsn The DSN to use to connect to the database
-      * @param string|null $username The username to use to connect to the
-      * database
-      * @param string|null $password The password to use to connect to the
-      * database
-      * @param array|null $driver_options The options to pass to PDO driver
-      */
+    /**
+     * Connect to the database before using it
+     * @param string $dsn The DSN to use to connect to the database
+     * @param string|null $username The username to use to connect to the
+     * database
+     * @param string|null $password The password to use to connect to the
+     * database
+     * @param array|null $driver_options The options to pass to PDO driver
+     */
     public function connect(
         $dsn,
         $username = null,
@@ -338,35 +342,35 @@ class Authzgroups
         $this->dbObject->debug = $this->debug;
         $this->dbObject->table = "authzobject";
         $this->dbObject->tableprefix = $this->tableprefix;
-        $this->dbObject->fields = array(
-        "idobject" => array("integer", "not null", "autoincrement"),
-        "module"   => array("varchar", "255", "not null"),
-        "object"   => array("varchar", "255", "not null"),
-        "comment"  => array("varchar", "255"));
+        $this->dbObject->fields = [
+        "idobject" => ["integer", "not null", "autoincrement"],
+        "module"   => ["varchar", "255", "not null"],
+        "object"   => ["varchar", "255", "not null"],
+        "comment"  => ["varchar", "255"]];
         $this->dbObject->primary = "idobject";
-        $this->dbObject->unique = array("idobject", array("object", "module"));
-        $this->dbObject->titles = array(
+        $this->dbObject->unique = ["idobject", ["object", "module"]];
+        $this->dbObject->titles = [
         "idobject" => dgettext("domframework", "idobject"),
         "module"   => dgettext("domframework", "Module"),
         "object"   => dgettext("domframework", "Object"),
-        "comment"  => dgettext("domframework", "Comment"));
+        "comment"  => dgettext("domframework", "Comment")];
 
         $this->dbGroup = new Dblayer($dsn, $username, $password, $driver_options);
         $this->dbGroup->debug = $this->debug;
         $this->dbGroup->table = "authzgroup";
         $this->dbGroup->tableprefix = $this->tableprefix;
-        $this->dbGroup->fields = array(
-        "idgroup" => array("integer", "not null", "autoincrement"),
-        "module"  => array("varchar", "255", "not null"),
-        "group"   => array("varchar", "255", "not null"),
-        "comment" => array("varchar", "255"));
+        $this->dbGroup->fields = [
+        "idgroup" => ["integer", "not null", "autoincrement"],
+        "module"  => ["varchar", "255", "not null"],
+        "group"   => ["varchar", "255", "not null"],
+        "comment" => ["varchar", "255"]];
         $this->dbGroup->primary = "idgroup";
-        $this->dbGroup->unique = array("idgroup", array("module", "group"));
-        $this->dbGroup->titles = array(
+        $this->dbGroup->unique = ["idgroup", ["module", "group"]];
+        $this->dbGroup->titles = [
         "idgroup" => dgettext("domframework", "idgroup"),
         "module"  => dgettext("domframework", "Module"),
         "group"   => dgettext("domframework", "Group"),
-        "comment" => dgettext("domframework", "Comment"));
+        "comment" => dgettext("domframework", "Comment")];
 
         $this->dbGroupMember = new Dblayer(
             $dsn,
@@ -377,59 +381,61 @@ class Authzgroups
         $this->dbGroupMember->debug = $this->debug;
         $this->dbGroupMember->table = "authzgroupmember";
         $this->dbGroupMember->tableprefix = $this->tableprefix;
-        $this->dbGroupMember->fields = array(
-        "idgroupmember" => array("integer", "not null", "autoincrement"),
-        "user"          => array("varchar", "255", "not null"),
-        "idgroup"       => array("integer", "not null"),
-        "comment"       => array("varchar", "255"));
+        $this->dbGroupMember->fields = [
+        "idgroupmember" => ["integer", "not null", "autoincrement"],
+        "user"          => ["varchar", "255", "not null"],
+        "idgroup"       => ["integer", "not null"],
+        "comment"       => ["varchar", "255"]];
         $this->dbGroupMember->primary = "idgroupmember";
-        $this->dbGroupMember->unique = array("idgroupmember",
-                                          array("user", "idgroup"));
-        $this->dbGroupMember->foreign = array(
-        "idgroup" => array("authzgroup", "idgroup",
-                        "ON UPDATE CASCADE ON DELETE CASCADE"));
-        $this->dbGroupMember->titles = array(
+        $this->dbGroupMember->unique = ["idgroupmember",
+                                          ["user", "idgroup"]];
+        $this->dbGroupMember->foreign = [
+        "idgroup" => ["authzgroup", "idgroup",
+                        "ON UPDATE CASCADE ON DELETE CASCADE"]];
+        $this->dbGroupMember->titles = [
         "idgroupmember" => dgettext("domframework", "idgroupmember"),
         "user" => dgettext("domframework", "User"),
         "idgroup" => dgettext("domframework", "idgroup"),
-        "comment" => dgettext("domframework", "Comment"));
+        "comment" => dgettext("domframework", "Comment")];
 
         $this->dbRight = new Dblayer($dsn, $username, $password, $driver_options);
         $this->dbRight->debug = $this->debug;
         $this->dbRight->table = "authzright";
         $this->dbRight->tableprefix = $this->tableprefix;
-        $this->dbRight->fields = array(
-        "idright" => array("integer", "not null", "autoincrement"),
-        "idgroup" => array("integer", "not null"),
-        "idobject" => array("integer", "not null"),
-        "right" =>   array("varchar", "2", "not null"), // RO, RW
-        "comment" => array("varchar", "255"));
+        $this->dbRight->fields = [
+        "idright" => ["integer", "not null", "autoincrement"],
+        "idgroup" => ["integer", "not null"],
+        "idobject" => ["integer", "not null"],
+        "right" =>   ["varchar", "2", "not null"], // RO, RW
+        "comment" => ["varchar", "255"]];
         $this->dbRight->primary = "idright";
-        $this->dbRight->unique = array("idright", array("idgroup", "idobject"));
-        $this->dbRight->foreign = array(
-        "idgroup" => array("authzgroup", "idgroup",
-        "ON UPDATE CASCADE ON DELETE CASCADE"),
-        "idobject" => array("authzobject", "idobject",
-        "ON UPDATE CASCADE ON DELETE CASCADE"),
-        );
-        $this->dbRight->titles = array(
+        $this->dbRight->unique = ["idright", ["idgroup", "idobject"]];
+        $this->dbRight->foreign = [
+        "idgroup" => ["authzgroup", "idgroup",
+        "ON UPDATE CASCADE ON DELETE CASCADE"],
+        "idobject" => ["authzobject", "idobject",
+        "ON UPDATE CASCADE ON DELETE CASCADE"],
+        ];
+        $this->dbRight->titles = [
         "idright"  => dgettext("domframework", "idright"),
         "idgroup"  => dgettext("domframework", "idgroup"),
         "idobject" => dgettext("domframework", "idobject"),
         "right"    => dgettext("domframework", "Right"),
-        "comment"  => dgettext("domframework", "Comment"));
+        "comment"  => dgettext("domframework", "Comment")];
         return true;
     }
 
-    /** Disconnect from the database. Should be only used in the unit tests
-      */
+    /**
+     * Disconnect from the database. Should be only used in the unit tests
+     */
     public function disconnect()
     {
         $this->dbObject->disconnect();
     }
 
-    /** Create the tables in the database to store the data
-      */
+    /**
+     * Create the tables in the database to store the data
+     */
     public function createTables()
     {
         if ($this->dbObject == null) {
@@ -459,7 +465,7 @@ class Authzgroups
                 "DB for Right is not connected"
             ), 500);
         }
-        $tables = array("Object", "Group", "GroupMember", "Right");
+        $tables = ["Object", "Group", "GroupMember", "Right"];
         foreach ($tables as $table) {
             try {
                 $class = "db$table";
@@ -474,12 +480,13 @@ class Authzgroups
     /////////////////
     //   OBJECTS   //
     /////////////////
-    /** Add a new object to object list
-      * Return the idobject created
-      * @param string $module The module to use
-      * @param string $object The object to create
-      * @param string|null $comment The comment to save
-      */
+    /**
+     * Add a new object to object list
+     * Return the idobject created
+     * @param string $module The module to use
+     * @param string $object The object to create
+     * @param string|null $comment The comment to save
+     */
     public function objectAdd($module, $object, $comment = "")
     {
         if ($this->dbObject == null) {
@@ -490,15 +497,16 @@ class Authzgroups
         }
         // TODO : Check parameters before saving them
         $this->rightCache = null;
-        return $this->dbObject->insert(array("module" => $module,
+        return $this->dbObject->insert(["module" => $module,
                                            "object" => $object,
-                                           "comment" => $comment));
+                                           "comment" => $comment]);
     }
 
-    /** Remove an object from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $object The object to delete
-      */
+    /**
+     * Remove an object from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $object The object to delete
+     */
     public function objectDel($module, $object)
     {
         if ($this->dbObject == null) {
@@ -518,10 +526,11 @@ class Authzgroups
         return $this->dbObject->delete($idobjects[0]["idobject"]);
     }
 
-    /** Remove an object from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idobject The object to delete
-      */
+    /**
+     * Remove an object from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idobject The object to delete
+     */
     public function objectDelByID($module, $idobject)
     {
         if ($this->dbObject == null) {
@@ -541,12 +550,13 @@ class Authzgroups
         return $this->dbObject->delete($idobjects[0]["idobject"]);
     }
 
-    /** Update an object in the database
-      * @param string $module The module to use
-      * @param string $object The object to update
-      * @param string $newobject The new name of the object
-      * @param string|null $newcomment The new comment of the object
-      */
+    /**
+     * Update an object in the database
+     * @param string $module The module to use
+     * @param string $object The object to update
+     * @param string $newobject The new name of the object
+     * @param string|null $newcomment The new comment of the object
+     */
     public function objectUpdate($module, $object, $newobject, $newcomment = "")
     {
         if ($this->dbObject == null) {
@@ -565,17 +575,18 @@ class Authzgroups
         $this->rightCache = null;
         return $this->dbObject->update(
             $idobjects[0]["idobject"],
-            array("object" => $newobject,
-                                           "comment" => $newcomment)
+            ["object" => $newobject,
+                                           "comment" => $newcomment]
         );
     }
 
-    /** Update an object in the database
-      * @param string $module The module to use
-      * @param integer $idobject The object to update
-      * @param string $newobject The new name of the object
-      * @param string|null $newcomment The new comment of the object
-      */
+    /**
+     * Update an object in the database
+     * @param string $module The module to use
+     * @param integer $idobject The object to update
+     * @param string $newobject The new name of the object
+     * @param string|null $newcomment The new comment of the object
+     */
     public function objectUpdateByID(
         $module,
         $idobject,
@@ -598,16 +609,17 @@ class Authzgroups
         $this->rightCache = null;
         return $this->dbObject->update(
             $idobjects[0]["idobject"],
-            array("object" => $newobject,
-                                           "comment" => $newcomment)
+            ["object" => $newobject,
+                                           "comment" => $newcomment]
         );
     }
 
-    /** Return an array with all the available objects in the module, or only
-      * one object if $object is provided
-      * @param string $module The module to use
-      * @param string $object The name of the object to get
-      */
+    /**
+     * Return an array with all the available objects in the module, or only
+     * one object if $object is provided
+     * @param string $module The module to use
+     * @param string $object The name of the object to get
+     */
     public function objectRead($module, $object = null)
     {
         if ($this->dbObject == null) {
@@ -616,22 +628,23 @@ class Authzgroups
                 "DB for Object is not connected"
             ), 500);
         }
-        $select[] = array("module", $module);
+        $select[] = ["module", $module];
         if ($object !== null) {
-            $select[] = array("object", $object);
+            $select[] = ["object", $object];
         }
         return $this->dbObject->read(
             $select,
             null,
-            array(array("object", "ASC"))
+            [["object", "ASC"]]
         );
     }
 
-    /** Return an array with all the available objects in the module, or only
-      * one object if $object is provided
-      * @param string $module The module to use
-      * @param integer $idobject The name of the object to get
-      */
+    /**
+     * Return an array with all the available objects in the module, or only
+     * one object if $object is provided
+     * @param string $module The module to use
+     * @param integer $idobject The name of the object to get
+     */
     public function objectReadByID($module, $idobject = null)
     {
         if ($this->dbObject == null) {
@@ -640,26 +653,28 @@ class Authzgroups
                 "DB for Object is not connected"
             ), 500);
         }
-        $select[] = array("module", $module);
+        $select[] = ["module", $module];
         if ($idobject !== null) {
-            $select[] = array("idobject", $idobject);
+            $select[] = ["idobject", $idobject];
         }
         return $this->dbObject->read($select);
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function objectTitles()
     {
         return $this->dbObject->titles;
     }
 
-    /** Check if the provided data are compliant with the object specification
-      * @param array $data The name of the object to get
-      * @param integer|null $idobject The object to check
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compliant with the object specification
+     * @param array $data The name of the object to get
+     * @param integer|null $idobject The object to check
+     * @return array The errors found in the data
+     */
     public function objectVerify($data, $idobject = false)
     {
         return $this->dbObject->verify($data, $idobject);
@@ -668,12 +683,13 @@ class Authzgroups
     ////////////////
     //   GROUPS   //
     ////////////////
-    /** Add a new group to group list
-      * Return the idgroup created
-      * @param string $module The module to use
-      * @param string $group The group to create
-      * @param string|null $comment The comment to add with the group
-      */
+    /**
+     * Add a new group to group list
+     * Return the idgroup created
+     * @param string $module The module to use
+     * @param string $group The group to create
+     * @param string|null $comment The comment to add with the group
+     */
     public function groupAdd($module, $group, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -683,15 +699,16 @@ class Authzgroups
             ), 500);
         }
         // TODO : Check parameters before saving them
-        return $this->dbGroup->insert(array("module" => $module,
+        return $this->dbGroup->insert(["module" => $module,
                                           "group" => $group,
-                                          "comment" => $comment));
+                                          "comment" => $comment]);
     }
 
-    /** Remove an group from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to delete
-      */
+    /**
+     * Remove an group from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to delete
+     */
     public function groupDel($module, $group)
     {
         if ($this->dbGroup == null) {
@@ -710,10 +727,11 @@ class Authzgroups
         return $this->dbGroup->delete($idgroups[0]["idgroup"]);
     }
 
-    /** Remove an group from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idgroup The group to delete
-      */
+    /**
+     * Remove an group from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idgroup The group to delete
+     */
     public function groupDelByID($module, $idgroup)
     {
         if ($this->dbGroup == null) {
@@ -732,12 +750,13 @@ class Authzgroups
         return $this->dbGroup->delete($idgroups[0]["idgroup"]);
     }
 
-    /** Update an group in the database
-      * @param string $module The module to use
-      * @param string $group The group to update
-      * @param string $newgroup The new group name
-      * @param string|null $comment The comment for the group
-      */
+    /**
+     * Update an group in the database
+     * @param string $module The module to use
+     * @param string $group The group to update
+     * @param string $newgroup The new group name
+     * @param string|null $comment The comment for the group
+     */
     public function groupUpdate($module, $group, $newgroup, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -755,17 +774,18 @@ class Authzgroups
         }
         return $this->dbGroup->update(
             $idgroups[0]["idgroup"],
-            array("group" => $newgroup,
-                                          "comment" => $comment)
+            ["group" => $newgroup,
+                                          "comment" => $comment]
         );
     }
 
-    /** Update an group in the database
-      * @param string $module The module to use
-      * @param integer $idgroup The group to update
-      * @param string $newgroup The new group name
-      * @param string|null $comment The comment for the group
-      */
+    /**
+     * Update an group in the database
+     * @param string $module The module to use
+     * @param integer $idgroup The group to update
+     * @param string $newgroup The new group name
+     * @param string|null $comment The comment for the group
+     */
     public function groupUpdateByID($module, $idgroup, $newgroup, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -783,15 +803,16 @@ class Authzgroups
         }
         return $this->dbGroup->update(
             $idgroups[0]["idgroup"],
-            array("group" => $newgroup,
-                                          "comment" => $comment)
+            ["group" => $newgroup,
+                                          "comment" => $comment]
         );
     }
 
-    /** Return an array with all the available groups in the module
-      * @param string $module The module to use
-      * @param string|null $group The group to check if exists
-      */
+    /**
+     * Return an array with all the available groups in the module
+     * @param string $module The module to use
+     * @param string|null $group The group to check if exists
+     */
     public function groupRead($module, $group = null)
     {
         if ($this->dbGroup == null) {
@@ -800,18 +821,19 @@ class Authzgroups
                 "DB for Group is not connected"
             ), 500);
         }
-        $select[] = array("module", $module);
+        $select[] = ["module", $module];
         if ($group !== null) {
-            $select[] = array("group", $group);
+            $select[] = ["group", $group];
         }
-        return $this->dbGroup->read($select, null, array(array("group", "ASC")));
+        return $this->dbGroup->read($select, null, [["group", "ASC"]]);
     }
 
 
-    /** Return an array with all the available groups in the module
-      * @param string $module The module to use
-      * @param integer $idgroup The group to check if exists
-      */
+    /**
+     * Return an array with all the available groups in the module
+     * @param string $module The module to use
+     * @param integer $idgroup The group to check if exists
+     */
     public function groupReadByID($module, $idgroup)
     {
         if ($this->dbGroup == null) {
@@ -820,24 +842,26 @@ class Authzgroups
                 "DB for Group is not connected"
             ), 500);
         }
-        $select[] = array("module", $module);
-        $select[] = array("idgroup", $idgroup);
+        $select[] = ["module", $module];
+        $select[] = ["idgroup", $idgroup];
         return $this->dbGroup->read($select);
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function groupTitles()
     {
         return $this->dbGroup->titles;
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data to check
-      * @param integer|null $idgroup The idgroup to check
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data to check
+     * @param integer|null $idgroup The idgroup to check
+     * @return array The errors found in the data
+     */
     public function groupVerify($data, $idgroup = false)
     {
         return $this->dbGroup->verify($data, $idgroup);
@@ -846,13 +870,14 @@ class Authzgroups
     //////////////////////
     //   GROUP MEMBER   //
     //////////////////////
-    /** Add a new groupmember to groupmember list
-      * Return the idgroupmember created
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to add in group
-      * @param string|null $comment The comment to save
-      */
+    /**
+     * Add a new groupmember to groupmember list
+     * Return the idgroupmember created
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to add in group
+     * @param string|null $comment The comment to save
+     */
     public function groupmemberAdd($module, $group, $user, $comment = "")
     {
         if ($this->dbGroupMember == null) {
@@ -872,17 +897,18 @@ class Authzgroups
             ), 404);
         }
         $this->rightCache = null;
-        return $this->dbGroupMember->insert(array(
+        return $this->dbGroupMember->insert([
                                            "user" => $user,
                                            "idgroup" => $groups[0]["idgroup"],
-                                           "comment" => $comment));
+                                           "comment" => $comment]);
     }
 
-    /** Remove an groupmember from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to remove
-      */
+    /**
+     * Remove an groupmember from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to remove
+     */
     public function groupmemberDel($module, $group, $user)
     {
         if ($this->dbGroupMember == null) {
@@ -901,9 +927,9 @@ class Authzgroups
                 "Wanted group not found"
             ), 404);
         }
-        $groupsMembers = $this->dbGroupMember->read(array(
-                                    array("user", $user),
-                                    array("idgroup", $groups[0]["idgroup"])));
+        $groupsMembers = $this->dbGroupMember->read([
+                                    ["user", $user],
+                                    ["idgroup", $groups[0]["idgroup"]]]);
         if (! isset($groupsMembers[0]["idgroupmember"])) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -914,11 +940,12 @@ class Authzgroups
         return $this->dbGroupMember->delete($groupsMembers[0]["idgroupmember"]);
     }
 
-    /** Remove an groupmember from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $idgroupmember The user to remove
-      */
+    /**
+     * Remove an groupmember from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $idgroupmember The user to remove
+     */
     public function groupmemberDelByID($module, $idgroup, $idgroupmember)
     {
         if ($this->dbGroupMember == null) {
@@ -934,9 +961,9 @@ class Authzgroups
                 "Wanted group not found"
             ), 404);
         }
-        $groupsMembers = $this->dbGroupMember->read(array(
-                                    array("idgroupmember", $idgroupmember),
-                                    array("idgroup", $idgroup)));
+        $groupsMembers = $this->dbGroupMember->read([
+                                    ["idgroupmember", $idgroupmember],
+                                    ["idgroup", $idgroup]]);
         if (! isset($groupsMembers[0]["idgroupmember"])) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -947,25 +974,27 @@ class Authzgroups
         return $this->dbGroupMember->delete($groupsMembers[0]["idgroupmember"]);
     }
 
-    /** Update an groupmember in the database
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to update
-      * @param string|null $comment The comment to update
-      */
+    /**
+     * Update an groupmember in the database
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to update
+     * @param string|null $comment The comment to update
+     */
     public function groupmemberUpdate($module, $group, $user, $comment = "")
     {
         $this->rightCache = null;
         die("This function is not available : contact us if you need it\n");
     }
 
-    /** Update an groupmember in the database
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $iduser The user to update
-      * @param string $user The new user name
-      * @param string|null $comment The comment to update
-      */
+    /**
+     * Update an groupmember in the database
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $iduser The user to update
+     * @param string $user The new user name
+     * @param string|null $comment The comment to update
+     */
     public function groupmemberUpdateByID(
         $module,
         $idgroup,
@@ -983,16 +1012,17 @@ class Authzgroups
         $this->rightCache = null;
         return $this->dbGroupMember->update(
             $iduser,
-            array("user" => $user,
-                                                "comment" => $comment)
+            ["user" => $user,
+                                                "comment" => $comment]
         );
     }
 
 
-    /** Return an array with all the groups where the user is in and in the module
-      * @param string $module The module to use
-      * @param string $user The user to search
-      */
+    /**
+     * Return an array with all the groups where the user is in and in the module
+     * @param string $module The module to use
+     * @param string $user The user to search
+     */
     public function groupmemberReadUser($module, $user)
     {
         if ($this->dbGroupMember == null) {
@@ -1006,24 +1036,25 @@ class Authzgroups
         }
         $idgrouptmps = $this->groupRead($module);
         // Create an array with idgroup=>group
-        $idgroups = array();
+        $idgroups = [];
         foreach ($idgrouptmps as $val) {
             $idgroups[$val["idgroup"]] = $val["group"];
         }
-        $select = array();
-        $select[] = array("user", $user);
+        $select = [];
+        $select[] = ["user", $user];
         $idgroupmembers = $this->dbGroupMember->read($select);
-        $res = array();
+        $res = [];
         foreach ($idgroupmembers as $idmembers) {
             $res[$idmembers["idgroup"]] = $idgroups[$idmembers["idgroup"]];
         }
         return $res;
     }
 
-    /** Return an array with all the groups where the user is in and in the module
-      * @param string $module The module to use
-      * @param integer $idgroupmember The user to search
-      */
+    /**
+     * Return an array with all the groups where the user is in and in the module
+     * @param string $module The module to use
+     * @param integer $idgroupmember The user to search
+     */
     public function groupmemberReadUserByID($module, $idgroupmember)
     {
         if ($this->dbGroupMember == null) {
@@ -1037,25 +1068,26 @@ class Authzgroups
         }
         $idgrouptmps = $this->groupRead($module);
         // Create an array with idgroup=>group
-        $idgroups = array();
+        $idgroups = [];
         foreach ($idgrouptmps as $val) {
             $idgroups[$val["idgroup"]] = $val["group"];
         }
-        $select = array();
-        $select[] = array("idgroupmember", $idgroupmember);
+        $select = [];
+        $select[] = ["idgroupmember", $idgroupmember];
         $idgroupmembers = $this->dbGroupMember->read($select);
-        $res = array();
+        $res = [];
         foreach ($idgroupmembers as $idmembers) {
             $res[$idmembers["idgroup"]] = $idgroups[$idmembers["idgroup"]];
         }
         return $res;
     }
 
-    /** Return an array with all the available users in the group and in the
-      * module
-      * @param string $module The module to use
-      * @param string $group The group to search
-      */
+    /**
+     * Return an array with all the available users in the group and in the
+     * module
+     * @param string $module The module to use
+     * @param string $group The group to search
+     */
     public function groupmemberReadGroup($module, $group)
     {
         if ($this->dbGroupMember == null) {
@@ -1074,15 +1106,16 @@ class Authzgroups
                 "Wanted group not found"
             ), 404);
         }
-        $select[] = array("idgroup", $groups[0]["idgroup"]);
-        return $this->dbGroupMember->read($select, array("user"));
+        $select[] = ["idgroup", $groups[0]["idgroup"]];
+        return $this->dbGroupMember->read($select, ["user"]);
     }
 
-    /** Return an array with all the available users in the group and in the
-      * module
-      * @param string $module The module to use
-      * @param integer $idgroup The group to search
-      */
+    /**
+     * Return an array with all the available users in the group and in the
+     * module
+     * @param string $module The module to use
+     * @param integer $idgroup The group to search
+     */
     public function groupmemberReadGroupByID($module, $idgroup)
     {
         if ($this->dbGroupMember == null) {
@@ -1101,15 +1134,16 @@ class Authzgroups
                 "Wanted group not found"
             ), 404);
         }
-        $select[] = array("idgroup", $groups[0]["idgroup"]);
+        $select[] = ["idgroup", $groups[0]["idgroup"]];
         return $this->dbGroupMember->read($select);
     }
 
-    /** Return an array containing the information of a user in a specific group
-      * @param string $module The module to use
-      * @param integer $idgroup The group to search
-      * @param integer $iduser The user to search
-      */
+    /**
+     * Return an array containing the information of a user in a specific group
+     * @param string $module The module to use
+     * @param integer $idgroup The group to search
+     * @param integer $iduser The user to search
+     */
     public function groupmemberReadUserDataByID($module, $idgroup, $iduser)
     {
         if ($this->dbGroupMember == null) {
@@ -1128,24 +1162,26 @@ class Authzgroups
                 "Wanted group not found"
             ), 404);
         }
-        $select[] = array("idgroup", $groups[0]["idgroup"]);
-        $select[] = array("idgroupmember", $iduser);
+        $select[] = ["idgroup", $groups[0]["idgroup"]];
+        $select[] = ["idgroupmember", $iduser];
         return $this->dbGroupMember->read($select);
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function groupmembersTitles()
     {
         return $this->dbGroupMember->titles;
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data to check
-      * @param integer|null $idgroupmember The group member associated to verify
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data to check
+     * @param integer|null $idgroupmember The group member associated to verify
+     * @return array The errors found in the data
+     */
     public function groupmembersVerify($data, $idgroupmember = false)
     {
         return $this->dbGroupMember->verify($data, $idgroupmember);
@@ -1154,14 +1190,15 @@ class Authzgroups
     ////////////////
     //   RIGHTS   //
     ////////////////
-    /** Add a new right to right list
-      * Return the idright created
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $object The object to use
-      * @param string $right The right to add
-      * @param string|null $comment The comment to add
-      */
+    /**
+     * Add a new right to right list
+     * Return the idright created
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $object The object to use
+     * @param string $right The right to add
+     * @param string|null $comment The comment to add
+     */
     public function rightAdd($module, $group, $object, $right, $comment = "")
     {
         if ($this->dbRight == null) {
@@ -1201,20 +1238,21 @@ class Authzgroups
             ), 404);
         }
         $this->rightCache = null;
-        return $this->dbRight->insert(array("idgroup" => $groups[0]["idgroup"],
+        return $this->dbRight->insert(["idgroup" => $groups[0]["idgroup"],
                                           "idobject" => $objects[0]["idobject"],
                                           "right" => $right,
-                                          "comment" => $comment));
+                                          "comment" => $comment]);
     }
 
-    /** Add a new right to right list by ID
-      * Return the idright created
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $idobject The object to use
-      * @param integer $idright The right to add
-      * @param string|null $comment The comment to add
-      */
+    /**
+     * Add a new right to right list by ID
+     * Return the idright created
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $idobject The object to use
+     * @param integer $idright The right to add
+     * @param string|null $comment The comment to add
+     */
     public function rightAddByID(
         $module,
         $idgroup,
@@ -1259,17 +1297,18 @@ class Authzgroups
             ), 404);
         }
         $this->rightCache = null;
-        return $this->dbRight->insert(array("idgroup" => $groups[0]["idgroup"],
+        return $this->dbRight->insert(["idgroup" => $groups[0]["idgroup"],
                                           "idobject" => $objects[0]["idobject"],
                                           "right" => $right,
-                                          "comment" => $comment));
+                                          "comment" => $comment]);
     }
 
-    /** Remove an right from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $object The object to remove the rights
-      */
+    /**
+     * Remove an right from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $object The object to remove the rights
+     */
     public function rightDel($module, $group, $object)
     {
         if ($this->dbRight == null) {
@@ -1289,10 +1328,11 @@ class Authzgroups
         return $this->dbRight->delete($idrights[0]["idright"]);
     }
 
-    /** Remove an right from database by ID and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idright The idright to be deleted
-      */
+    /**
+     * Remove an right from database by ID and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idright The idright to be deleted
+     */
     public function rightDelByID($module, $idright)
     {
         if ($this->dbRight == null) {
@@ -1312,13 +1352,14 @@ class Authzgroups
         return $this->dbRight->delete($idrights[0]["idright"]);
     }
 
-    /** Update a right in the database
-      * @param string $module The module to use
-      * @param string $group The group to update the right
-      * @param string $object The object ot update the right
-      * @param string $newright The new right to save
-      * @param string|null $newcomment The new comment to save
-      */
+    /**
+     * Update a right in the database
+     * @param string $module The module to use
+     * @param string $group The group to update the right
+     * @param string $object The object ot update the right
+     * @param string $newright The new right to save
+     * @param string|null $newcomment The new comment to save
+     */
     public function rightUpdate(
         $module,
         $group,
@@ -1358,18 +1399,19 @@ class Authzgroups
         $this->rightCache = null;
         return $this->dbRight->update(
             $idrights[0]["idright"],
-            array("right" => $newright,
-                                          "comment" => $newcomment)
+            ["right" => $newright,
+                                          "comment" => $newcomment]
         );
     }
 
-    /** Update a right by ID in the database
-      * @param string $module The module to use
-      * @param integer $idright The idright to update the right
-      * @param integer $newidobject The object ot update the right
-      * @param integer $newright The new right to save
-      * @param string|null $newcomment The new comment to save
-      */
+    /**
+     * Update a right by ID in the database
+     * @param string $module The module to use
+     * @param integer $idright The idright to update the right
+     * @param integer $newidobject The object ot update the right
+     * @param integer $newright The new right to save
+     * @param string|null $newcomment The new comment to save
+     */
     public function rightUpdateByID(
         $module,
         $idright,
@@ -1409,19 +1451,20 @@ class Authzgroups
         $this->rightCache = null;
         return $this->dbRight->update(
             $idrights[0]["idright"],
-            array("idobject" => $newidobject,
+            ["idobject" => $newidobject,
                                           "right" => $newright,
-                                          "comment" => $newcomment)
+                                          "comment" => $newcomment]
         );
     }
 
 
-    /** Return an array with all the available rights in the module, for a group,
-      * and concerning an object
-      * @param string $module The module to use
-      * @param string $group The group to get the rights
-      * @param string $object The object to get the rights
-      */
+    /**
+     * Return an array with all the available rights in the module, for a group,
+     * and concerning an object
+     * @param string $module The module to use
+     * @param string $group The group to get the rights
+     * @param string $object The object to get the rights
+     */
     public function rightRead($module, $group, $object)
     {
         if ($this->dbRight == null) {
@@ -1444,15 +1487,16 @@ class Authzgroups
                 "Wanted object not found"
             ), 404);
         }
-        $select[] = array("idgroup", $groups[0]["idgroup"]);
-        $select[] = array("idobject", $objects[0]["idobject"]);
+        $select[] = ["idgroup", $groups[0]["idgroup"]];
+        $select[] = ["idobject", $objects[0]["idobject"]];
         return $this->dbRight->read($select);
     }
 
-    /** Return an array with all the available rights for a module and a group
-      * @param string $module The module to use
-      * @param string $group The group to get the rights
-      */
+    /**
+     * Return an array with all the available rights for a module and a group
+     * @param string $module The module to use
+     * @param string $group The group to get the rights
+     */
     public function rightReadByGroup($module, $group)
     {
         if ($this->dbRight == null) {
@@ -1471,10 +1515,11 @@ class Authzgroups
         return $this->rightReadByGroupByID($module, $groups[0]["idgroup"]);
     }
 
-    /** Return an array with all the available rights for a module and a group
-      * @param string $module The module to use
-      * @param integer $idgroup The group to get the rights
-      */
+    /**
+     * Return an array with all the available rights for a module and a group
+     * @param string $module The module to use
+     * @param integer $idgroup The group to get the rights
+     */
     public function rightReadByGroupByID($module, $idgroup)
     {
         if ($this->dbRight == null) {
@@ -1483,15 +1528,16 @@ class Authzgroups
                 "DB for Right is not connected"
             ), 500);
         }
-        $select[] = array("idgroup", $idgroup);
+        $select[] = ["idgroup", $idgroup];
         return $this->dbRight->read($select);
     }
 
-    /** Return an array with all the information concerning a right selected by
-      * @param string $module The module to use
-      * @param integer $idright The right to search
-      * ID
-      */
+    /**
+     * Return an array with all the information concerning a right selected by
+     * @param string $module The module to use
+     * @param integer $idright The right to search
+     * ID
+     */
     public function rightReadByID($module, $idright)
     {
         if ($this->dbRight == null) {
@@ -1500,14 +1546,15 @@ class Authzgroups
                 "DB for Right is not connected"
             ), 500);
         }
-        $select[] = array("idright", $idright);
+        $select[] = ["idright", $idright];
         return $this->dbRight->read($select);
     }
 
-    /** Return an array with all the available rights for a module and an object
-      * @param string $module The module to use
-      * @param string $object The object to search
-      */
+    /**
+     * Return an array with all the available rights for a module and an object
+     * @param string $module The module to use
+     * @param string $object The object to search
+     */
     public function rightReadByObject($module, $object)
     {
         if ($this->dbRight == null) {
@@ -1523,14 +1570,15 @@ class Authzgroups
                 "Wanted object not found"
             ), 404);
         }
-        $select[] = array("idobject", $objects[0]["idobject"]);
+        $select[] = ["idobject", $objects[0]["idobject"]];
         return $this->dbRight->read($select);
     }
 
-    /** Return an array with all the available rights for a module and an idobject
-      * @param string $module The module to use
-      * @param integer $idobject The object to search
-      */
+    /**
+     * Return an array with all the available rights for a module and an idobject
+     * @param string $module The module to use
+     * @param integer $idobject The object to search
+     */
     public function rightReadByObjectByID($module, $idobject)
     {
         if ($this->dbRight == null) {
@@ -1540,31 +1588,34 @@ class Authzgroups
             ), 500);
         }
         // FIXME : Do not use $module ?
-        $select[] = array("idobject", $idobject);
+        $select[] = ["idobject", $idobject];
         return $this->dbRight->read($select);
     }
 
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function rightTitles()
     {
         return $this->dbRight->titles;
     }
 
-    /** Return all the types of rights available (RO and RW)
-      */
+    /**
+     * Return all the types of rights available (RO and RW)
+     */
     public function rightTypes()
     {
-        return array("1" => "RO", "2" => "RW");
+        return ["1" => "RO", "2" => "RW"];
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data of the right to check
-      * @param integer $idright The right to search
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data of the right to check
+     * @param integer $idright The right to search
+     * @return array The errors found in the data
+     */
     public function rightVerify($data, $idright = false)
     {
         return $this->dbRight->verify($data, $idright);
diff --git a/src/Authzgroupsoo.php b/src/Authzgroupsoo.php
index cc58c75..39314b4 100644
--- a/src/Authzgroupsoo.php
+++ b/src/Authzgroupsoo.php
@@ -1,57 +1,77 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** All the needed functions to authorize or deny access to an authenticated
-  * user by its groups membership
-  * Based on Dblayeroo
-  */
+/**
+ * All the needed functions to authorize or deny access to an authenticated
+ * user by its groups membership
+ * Based on Dblayeroo
+ */
 class Authzgroupsoo
 {
-    /** The table prefix to use */
+    /**
+     * The table prefix to use
+     */
     public $tableprefix = "";
-    /** The dblayeroo object use to manage the Object table */
+    /**
+     * The dblayeroo object use to manage the Object table
+     */
     private $dbObject = null;
-    /** The dblayeroo object use to manage the Group table */
+    /**
+     * The dblayeroo object use to manage the Group table
+     */
     private $dbGroup = null;
-    /** The dblayeroo object use to manage the GroupMember table */
+    /**
+     * The dblayeroo object use to manage the GroupMember table
+     */
     private $dbGroupMember = null;
-    /** The dblayeroo object use to manage the Right table */
+    /**
+     * The dblayeroo object use to manage the Right table
+     */
     private $dbRight = null;
-    /** Set the debug level */
+    /**
+     * Set the debug level
+     */
     public $debug = 0;
-    /** A local cache of the rights if multiple tests are needed */
+    /**
+     * A local cache of the rights if multiple tests are needed
+     */
     private $rightCache = null;
 
-    /** Get the dbObject
-      */
+    /**
+     * Get the dbObject
+     */
     public function dbObject()
     {
         return $this->dbObject;
     }
 
-    /** Get the dbGroup
-      */
+    /**
+     * Get the dbGroup
+     */
     public function dbGroup()
     {
         return $this->dbGroup;
     }
 
-    /** Get the dbGroupMember
-      */
+    /**
+     * Get the dbGroupMember
+     */
     public function dbGroupMember()
     {
         return $this->dbGroupMember;
     }
 
-    /** Get the dbRight
-      */
+    /**
+     * Get the dbRight
+     */
     public function dbRight()
     {
         return $this->dbRight;
@@ -60,12 +80,13 @@ class Authzgroupsoo
     /////////////////////
     //   USER RIGHTS   //
     /////////////////////
-    /** Return an array with all the rights of the user in the module.
-      * Cache this information to be quicker with next requests
-      * Remove the entries where path is not at least readable
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      */
+    /**
+     * Return an array with all the rights of the user in the module.
+     * Cache this information to be quicker with next requests
+     * Remove the entries where path is not at least readable
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     */
     public function userrightsget($module, $user)
     {
         //    if (isset ($_SESSION["domframework"]["authzgroups"][$module][$user]))
@@ -94,25 +115,25 @@ class Authzgroupsoo
             $this->dbGroupMember->whereAdd("user", "=", $user);
             $this->dbGroup->joinInner(
                 $this->dbGroupMember,
-                array("idgroup" => "idgroup")
+                ["idgroup" => "idgroup"]
             )
                     ->whereAdd("module", "=", $module);
             $this->dbRight->displayAdd("MAX(right)", "right")
                     ->joinInner(
                         $this->dbGroup,
-                        array("idgroup" => "idgroup")
+                        ["idgroup" => "idgroup"]
                     );
             $resTmp = $this->dbObject->select()
                             ->displayAdd("object", "object")
                             ->orderAdd("object", "ASC")
                             ->joinInner(
                                 $this->dbRight,
-                                array("idobject" => "idobject")
+                                ["idobject" => "idobject"]
                             )
                             ->execute();
         }
 
-        $res = array();
+        $res = [];
         foreach ($resTmp as $row) {
             $res[$row["object"]] = $row["right"];
         }
@@ -142,47 +163,32 @@ class Authzgroupsoo
         return $res;
     }
 
-    /** Return the right defined for this user in the module for one object
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to return the rights for the user
-      */
+    /**
+     * Return the right defined for this user in the module for one object
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to return the rights for the user
+     */
     public function allow($module, $user, $object)
     {
         $ressource = $this->userrightsget($module, $user);
         // The complete tree should not be readable for the user : it can have
         // access to a card, but not to all the cards (group -> reject,
         // group/XXX->allow)
-        /*// Limit to allowed trees : if a member of the path is not recorded (is
-        // unreadable), return NO.
-        // Can be the last entry (the complete object) too
-        $path = explode ("/", $object);
-        $completePath = "/";
-        foreach ($path as $k => $p)
-        {
-          if ($k>1)
-            $completePath .= "/";
-          $completePath .= "$p";
-          if (! isset ($ressource[$completePath]))
-          {
-            if ($this->debug)
-              echo "DEBUG allow : REJECT because $completePath is not found\n";
-            return "NO";
-          }
-        }*/
         if (! isset($ressource[$object])) {
             return "NO";
         }
         return $ressource[$object];
     }
 
-    /** Return TRUE if the user right allow to see the object (RO or RW)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to see the object (RO or RW)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessRight($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -227,13 +233,14 @@ class Authzgroupsoo
         throw new \Exception(dgettext("domframework", "Access forbidden"), 403);
     }
 
-    /** Return TRUE if the user right allow to edit the object (RW only)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to edit the object (RW only)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessWrite($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -281,14 +288,15 @@ class Authzgroupsoo
         );
     }
 
-    /** Return TRUE if the user right allow to see but without modification
-      * the object  (RO only)
-      * Return a 403 Exception if the user don't have the right
-      * Return a 401 Exception if the user is not connected
-      * @param string $module The module to use
-      * @param string $user The user to get the rights
-      * @param string $object The object to check the rights for the user
-      */
+    /**
+     * Return TRUE if the user right allow to see but without modification
+     * the object  (RO only)
+     * Return a 403 Exception if the user don't have the right
+     * Return a 401 Exception if the user is not connected
+     * @param string $module The module to use
+     * @param string $user The user to get the rights
+     * @param string $object The object to check the rights for the user
+     */
     public function accessReadOnly($module, $user, $object)
     {
         if ($this->dbObject === null) {
@@ -336,14 +344,15 @@ class Authzgroupsoo
     /////////////////////////
     //  DATABASE STORAGE   //
     /////////////////////////
-    /** Connect to the database before using it
-      * @param string $dsn The DSN to use to connect to the database
-      * @param string|null $username The username to use to connect to the
-      * database
-      * @param string|null $password The password to use to connect to the
-      * database
-      * @param array|null $driver_options The options to pass to PDO driver
-      */
+    /**
+     * Connect to the database before using it
+     * @param string $dsn The DSN to use to connect to the database
+     * @param string|null $username The username to use to connect to the
+     * database
+     * @param string|null $password The password to use to connect to the
+     * database
+     * @param array|null $driver_options The options to pass to PDO driver
+     */
     public function connect(
         $dsn,
         $username = null,
@@ -359,18 +368,18 @@ class Authzgroupsoo
         $this->dbObject->debug($this->debug);
         $this->dbObject->table("authzobject");
         $this->dbObject->tableprefix($this->tableprefix);
-        $this->dbObject->fields(array(
-        "idobject" => array("integer", "not null", "autoincrement"),
-        "module"   => array("varchar(255)", "not null"),
-        "object"   => array("varchar(255)", "not null"),
-        "comment"  => array("varchar(255)")));
+        $this->dbObject->fields([
+        "idobject" => ["integer", "not null", "autoincrement"],
+        "module"   => ["varchar(255)", "not null"],
+        "object"   => ["varchar(255)", "not null"],
+        "comment"  => ["varchar(255)"]]);
         $this->dbObject->primary("idobject");
-        $this->dbObject->unique(array("idobject", array("object", "module")));
-        $this->dbObject->titles(array(
+        $this->dbObject->unique(["idobject", ["object", "module"]]);
+        $this->dbObject->titles([
         "idobject" => dgettext("domframework", "idobject"),
         "module"   => dgettext("domframework", "Module"),
         "object"   => dgettext("domframework", "Object"),
-        "comment"  => dgettext("domframework", "Comment")));
+        "comment"  => dgettext("domframework", "Comment")]);
 
         $this->dbGroup = new Dblayeroo(
             $dsn,
@@ -381,18 +390,18 @@ class Authzgroupsoo
         $this->dbGroup->debug($this->debug);
         $this->dbGroup->table("authzgroup");
         $this->dbGroup->tableprefix($this->tableprefix);
-        $this->dbGroup->fields(array(
-        "idgroup" => array("integer", "not null", "autoincrement"),
-        "module"  => array("varchar(255)", "not null"),
-        "group"   => array("varchar(255)", "not null"),
-        "comment" => array("varchar(255)")));
+        $this->dbGroup->fields([
+        "idgroup" => ["integer", "not null", "autoincrement"],
+        "module"  => ["varchar(255)", "not null"],
+        "group"   => ["varchar(255)", "not null"],
+        "comment" => ["varchar(255)"]]);
         $this->dbGroup->primary("idgroup");
-        $this->dbGroup->unique(array("idgroup", array("module", "group")));
-        $this->dbGroup->titles(array(
+        $this->dbGroup->unique(["idgroup", ["module", "group"]]);
+        $this->dbGroup->titles([
         "idgroup" => dgettext("domframework", "idgroup"),
         "module"  => dgettext("domframework", "Module"),
         "group"   => dgettext("domframework", "Group"),
-        "comment" => dgettext("domframework", "Comment")));
+        "comment" => dgettext("domframework", "Comment")]);
 
         $this->dbGroupMember = new Dblayeroo(
             $dsn,
@@ -403,23 +412,23 @@ class Authzgroupsoo
         $this->dbGroupMember->debug($this->debug);
         $this->dbGroupMember->table("authzgroupmember");
         $this->dbGroupMember->tableprefix($this->tableprefix);
-        $this->dbGroupMember->fields(array(
-        "idgroupmember" => array("integer", "not null", "autoincrement"),
-        "user"          => array("varchar(255)", "not null"),
-        "idgroup"       => array("integer", "not null"),
-        "comment"       => array("varchar(255)")));
+        $this->dbGroupMember->fields([
+        "idgroupmember" => ["integer", "not null", "autoincrement"],
+        "user"          => ["varchar(255)", "not null"],
+        "idgroup"       => ["integer", "not null"],
+        "comment"       => ["varchar(255)"]]);
         $this->dbGroupMember->primary("idgroupmember");
-        $this->dbGroupMember->unique(array("idgroupmember",
-                                          array("user", "idgroup")));
-        $this->dbGroupMember->foreign(array(
-        "idgroup" => array($this->tableprefix . "authzgroup", "idgroup",
-                          "ON UPDATE CASCADE ON DELETE CASCADE")));
+        $this->dbGroupMember->unique(["idgroupmember",
+                                          ["user", "idgroup"]]);
+        $this->dbGroupMember->foreign([
+        "idgroup" => [$this->tableprefix . "authzgroup", "idgroup",
+                          "ON UPDATE CASCADE ON DELETE CASCADE"]]);
         $this->dbGroupMember->setForeignObj($this->dbGroup);
-        $this->dbGroupMember->titles(array(
+        $this->dbGroupMember->titles([
         "idgroupmember" => dgettext("domframework", "idgroupmember"),
         "user"          => dgettext("domframework", "User"),
         "idgroup"       => dgettext("domframework", "idgroup"),
-        "comment"       => dgettext("domframework", "Comment")));
+        "comment"       => dgettext("domframework", "Comment")]);
 
         $this->dbRight = new Dblayeroo(
             $dsn,
@@ -430,40 +439,42 @@ class Authzgroupsoo
         $this->dbRight->debug($this->debug);
         $this->dbRight->table("authzright");
         $this->dbRight->tableprefix($this->tableprefix);
-        $this->dbRight->fields(array(
-        "idright"  => array("integer", "not null", "autoincrement"),
-        "idgroup"  => array("integer", "not null"),
-        "idobject" => array("integer", "not null"),
-        "right"    => array("varchar(2)", "not null"), // NO, RO, RW
-        "comment"  => array("varchar(255)")));
+        $this->dbRight->fields([
+        "idright"  => ["integer", "not null", "autoincrement"],
+        "idgroup"  => ["integer", "not null"],
+        "idobject" => ["integer", "not null"],
+        "right"    => ["varchar(2)", "not null"], // NO, RO, RW
+        "comment"  => ["varchar(255)"]]);
         $this->dbRight->primary("idright");
-        $this->dbRight->unique(array("idright", array("idgroup", "idobject")));
-        $this->dbRight->foreign(array(
-        "idgroup"  => array($this->tableprefix . "authzgroup", "idgroup",
-                           "ON UPDATE CASCADE ON DELETE CASCADE"),
-        "idobject" => array($this->tableprefix . "authzobject", "idobject",
-                           "ON UPDATE CASCADE ON DELETE CASCADE"),
-        ));
+        $this->dbRight->unique(["idright", ["idgroup", "idobject"]]);
+        $this->dbRight->foreign([
+        "idgroup"  => [$this->tableprefix . "authzgroup", "idgroup",
+                           "ON UPDATE CASCADE ON DELETE CASCADE"],
+        "idobject" => [$this->tableprefix . "authzobject", "idobject",
+                           "ON UPDATE CASCADE ON DELETE CASCADE"],
+        ]);
         $this->dbRight->setForeignObj($this->dbGroup);
         $this->dbRight->setForeignObj($this->dbObject);
-        $this->dbRight->titles(array(
+        $this->dbRight->titles([
         "idright"  => dgettext("domframework", "idright"),
         "idgroup"  => dgettext("domframework", "idgroup"),
         "idobject" => dgettext("domframework", "idobject"),
         "right"    => dgettext("domframework", "Right"),
-        "comment"  => dgettext("domframework", "Comment")));
+        "comment"  => dgettext("domframework", "Comment")]);
         return true;
     }
 
-    /** Disconnect from the database. Should be only used in the unit tests
-      */
+    /**
+     * Disconnect from the database. Should be only used in the unit tests
+     */
     public function disconnect()
     {
         $this->dbObject->disconnect();
     }
 
-    /** Create the tables in the database to store the data
-      */
+    /**
+     * Create the tables in the database to store the data
+     */
     public function createTables()
     {
         if ($this->dbObject == null) {
@@ -493,7 +504,7 @@ class Authzgroupsoo
                 "DB for Right is not connected"
             ), 500);
         }
-        $tables = array("Object", "Group", "GroupMember", "Right");
+        $tables = ["Object", "Group", "GroupMember", "Right"];
         foreach ($tables as $table) {
             try {
                 $class = "db$table";
@@ -505,8 +516,9 @@ class Authzgroupsoo
         return true;
     }
 
-    /** Return true if all the tables are created, false otherwise
-      */
+    /**
+     * Return true if all the tables are created, false otherwise
+     */
     public function stateTables()
     {
         if ($this->dbObject == null) {
@@ -516,18 +528,19 @@ class Authzgroupsoo
             ), 500);
         }
         $tables = $this->dbObject->listTables();
-        $needed = array("authzobject", "authzgroup", "authzgroupmember",
-                     "authzright");
+        $needed = ["authzobject", "authzgroup", "authzgroupmember",
+                     "authzright"];
         foreach ($needed as $table) {
-            if (! in_array($this->tableprefix . $table, $tables)) {
+            if (! in_array($this->tableprefix . $table, $tables, true)) {
                 return false;
             }
         }
         return true;
     }
 
-    /** Return true if all the tables are deleted, false otherwise
-      */
+    /**
+     * Return true if all the tables are deleted, false otherwise
+     */
     public function deleteTables()
     {
         if ($this->dbObject == null) {
@@ -537,7 +550,7 @@ class Authzgroupsoo
             ), 500);
         }
         $tables = $this->dbObject->listTables();
-        $needed = array("Object", "Group", "GroupMember", "Right");
+        $needed = ["Object", "Group", "GroupMember", "Right"];
         $needed = array_reverse($needed);
         foreach ($needed as $table) {
             $class = "db$table";
@@ -549,12 +562,13 @@ class Authzgroupsoo
     /////////////////
     //   OBJECTS   //
     /////////////////
-    /** Add a new object to object list
-      * Return the idobject created
-      * @param string $module The module to use
-      * @param string $object The object to create
-      * @param string|null $comment The comment to save
-      */
+    /**
+     * Add a new object to object list
+     * Return the idobject created
+     * @param string $module The module to use
+     * @param string $object The object to create
+     * @param string|null $comment The comment to save
+     */
     public function objectAdd($module, $object, $comment = "")
     {
         if ($this->dbObject == null) {
@@ -567,16 +581,17 @@ class Authzgroupsoo
         $this->rightCache = null;
         $this->dbObject->clearRequest();
         return $this->dbObject->insert()
-                          ->setValues(array("module" => $module,
+                          ->setValues(["module" => $module,
                                               "object" => $object,
-                                              "comment" => $comment))
+                                              "comment" => $comment])
                           ->execute();
     }
 
-    /** Remove an object from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $object The object to delete
-      */
+    /**
+     * Remove an object from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $object The object to delete
+     */
     public function objectDel($module, $object)
     {
         if ($this->dbObject == null) {
@@ -603,10 +618,11 @@ class Authzgroupsoo
                           ->execute();
     }
 
-    /** Remove an object from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idobject The object to delete
-      */
+    /**
+     * Remove an object from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idobject The object to delete
+     */
     public function objectDelByID($module, $idobject)
     {
         if ($this->dbObject == null) {
@@ -633,12 +649,13 @@ class Authzgroupsoo
                           ->execute();
     }
 
-    /** Update an object in the database
-      * @param string $module The module to use
-      * @param string $object The object to update
-      * @param string $newobject The new name of the object
-      * @param string|null $newcomment The new comment of the object
-      */
+    /**
+     * Update an object in the database
+     * @param string $module The module to use
+     * @param string $object The object to update
+     * @param string $newobject The new name of the object
+     * @param string|null $newcomment The new comment of the object
+     */
     public function objectUpdate($module, $object, $newobject, $newcomment = "")
     {
         if ($this->dbObject == null) {
@@ -662,17 +679,18 @@ class Authzgroupsoo
                               "=",
                               $idobjects[0]["idobject"]
                           )
-                          ->setValues(array("object" => $newobject,
-                                              "comment" => $newcomment))
+                          ->setValues(["object" => $newobject,
+                                              "comment" => $newcomment])
                           ->execute();
     }
 
-    /** Update an object in the database
-      * @param string $module The module to use
-      * @param integer $idobject The object to update
-      * @param string $newobject The new name of the object
-      * @param string|null $newcomment The new comment of the object
-      */
+    /**
+     * Update an object in the database
+     * @param string $module The module to use
+     * @param integer $idobject The object to update
+     * @param string $newobject The new name of the object
+     * @param string|null $newcomment The new comment of the object
+     */
     public function objectUpdateByID(
         $module,
         $idobject,
@@ -700,16 +718,17 @@ class Authzgroupsoo
                               "=",
                               $idobjects[0]["idobject"]
                           )
-                          ->setValues(array("object" => $newobject,
-                                              "comment" => $newcomment))
+                          ->setValues(["object" => $newobject,
+                                              "comment" => $newcomment])
                           ->execute();
     }
 
-    /** Return an array with all the available objects in the module, or only
-      * one object if $object is provided
-      * @param string $module The module to use
-      * @param string $object The name of the object to get
-      */
+    /**
+     * Return an array with all the available objects in the module, or only
+     * one object if $object is provided
+     * @param string $module The module to use
+     * @param string $object The name of the object to get
+     */
     public function objectRead($module, $object = null)
     {
         if ($this->dbObject == null) {
@@ -728,11 +747,12 @@ class Authzgroupsoo
                           ->execute();
     }
 
-    /** Return an array with all the available objects in the module, or only
-      * one object if $object is provided
-      * @param string $module The module to use
-      * @param integer $idobject The name of the object to get
-      */
+    /**
+     * Return an array with all the available objects in the module, or only
+     * one object if $object is provided
+     * @param string $module The module to use
+     * @param integer $idobject The name of the object to get
+     */
     public function objectReadByID($module, $idobject = null)
     {
         if ($this->dbObject == null) {
@@ -750,19 +770,21 @@ class Authzgroupsoo
                           ->execute();
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function objectTitles()
     {
         return $this->dbObject->titles();
     }
 
-    /** Check if the provided data are compliant with the object specification
-      * @param array $data The name of the object to get
-      * @param integer|null $idobject The object to check
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compliant with the object specification
+     * @param array $data The name of the object to get
+     * @param integer|null $idobject The object to check
+     * @return array The errors found in the data
+     */
     public function objectVerify($data, $idobject = false)
     {
         return $this->dbObject->verify($data, $idobject);
@@ -771,12 +793,13 @@ class Authzgroupsoo
     ////////////////
     //   GROUPS   //
     ////////////////
-    /** Add a new group to group list
-      * Return the idgroup created
-      * @param string $module The module to use
-      * @param string $group The group to create
-      * @param string|null $comment The comment to add with the group
-      */
+    /**
+     * Add a new group to group list
+     * Return the idgroup created
+     * @param string $module The module to use
+     * @param string $group The group to create
+     * @param string|null $comment The comment to add with the group
+     */
     public function groupAdd($module, $group, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -788,16 +811,17 @@ class Authzgroupsoo
         $this->dbGroup->clearRequest();
         // TODO : Check parameters before saving them
         return $this->dbGroup->insert()
-                         ->setValues(array("module" => $module,
+                         ->setValues(["module" => $module,
                                              "group" => $group,
-                                             "comment" => $comment))
+                                             "comment" => $comment])
                          ->execute();
     }
 
-    /** Remove an group from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to delete
-      */
+    /**
+     * Remove an group from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to delete
+     */
     public function groupDel($module, $group)
     {
         if ($this->dbGroup == null) {
@@ -819,10 +843,11 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Remove an group from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idgroup The group to delete
-      */
+    /**
+     * Remove an group from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idgroup The group to delete
+     */
     public function groupDelByID($module, $idgroup)
     {
         if ($this->dbGroup == null) {
@@ -844,12 +869,13 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Update an group in the database
-      * @param string $module The module to use
-      * @param string $group The group to update
-      * @param string $newgroup The new group name
-      * @param string|null $comment The comment for the group
-      */
+    /**
+     * Update an group in the database
+     * @param string $module The module to use
+     * @param string $group The group to update
+     * @param string $newgroup The new group name
+     * @param string|null $comment The comment for the group
+     */
     public function groupUpdate($module, $group, $newgroup, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -868,17 +894,18 @@ class Authzgroupsoo
         $this->dbGroup->clearRequest();
         return $this->dbGroup->update()
                          ->whereAdd("idgroup", "=", $idgroups[0]["idgroup"])
-                         ->setValues(array("group" => $newgroup,
-                                             "comment" => $comment))
+                         ->setValues(["group" => $newgroup,
+                                             "comment" => $comment])
                          ->execute();
     }
 
-    /** Update an group in the database
-      * @param string $module The module to use
-      * @param integer $idgroup The group to update
-      * @param string $newgroup The new group name
-      * @param string|null $comment The comment for the group
-      */
+    /**
+     * Update an group in the database
+     * @param string $module The module to use
+     * @param integer $idgroup The group to update
+     * @param string $newgroup The new group name
+     * @param string|null $comment The comment for the group
+     */
     public function groupUpdateByID($module, $idgroup, $newgroup, $comment = "")
     {
         if ($this->dbGroup == null) {
@@ -897,15 +924,16 @@ class Authzgroupsoo
         $this->dbGroup->clearRequest();
         return $this->dbGroup->update()
                          ->whereAdd("idgroup", "=", $idgroups[0]["idgroup"])
-                         ->setValues(array("group" => $newgroup,
-                                             "comment" => $comment))
+                         ->setValues(["group" => $newgroup,
+                                             "comment" => $comment])
                          ->execute();
     }
 
-    /** Return an array with all the available groups in the module
-      * @param string $module The module to use
-      * @param string|null $group The group to check if exists
-      */
+    /**
+     * Return an array with all the available groups in the module
+     * @param string $module The module to use
+     * @param string|null $group The group to check if exists
+     */
     public function groupRead($module, $group = null)
     {
         if ($this->dbGroup == null) {
@@ -925,10 +953,11 @@ class Authzgroupsoo
     }
 
 
-    /** Return an array with all the available groups in the module
-      * @param string $module The module to use
-      * @param integer $idgroup The group to check if exists
-      */
+    /**
+     * Return an array with all the available groups in the module
+     * @param string $module The module to use
+     * @param integer $idgroup The group to check if exists
+     */
     public function groupReadByID($module, $idgroup)
     {
         if ($this->dbGroup == null) {
@@ -944,19 +973,21 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function groupTitles()
     {
         return $this->dbGroup->titles();
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data to check
-      * @param integer|null $idgroup The idgroup to check
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data to check
+     * @param integer|null $idgroup The idgroup to check
+     * @return array The errors found in the data
+     */
     public function groupVerify($data, $idgroup = false)
     {
         return $this->dbGroup->verify($data, $idgroup);
@@ -965,13 +996,14 @@ class Authzgroupsoo
     //////////////////////
     //   GROUP MEMBER   //
     //////////////////////
-    /** Add a new groupmember to groupmember list
-      * Return the idgroupmember created
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to add in group
-      * @param string|null $comment The comment to save
-      */
+    /**
+     * Add a new groupmember to groupmember list
+     * Return the idgroupmember created
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to add in group
+     * @param string|null $comment The comment to save
+     */
     public function groupmemberAdd($module, $group, $user, $comment = "")
     {
         if ($this->dbGroupMember == null) {
@@ -993,18 +1025,19 @@ class Authzgroupsoo
         $this->rightCache = null;
         $this->dbGroupMember->clearRequest();
         return $this->dbGroupMember->insert()
-                               ->setValues(array(
+                               ->setValues([
                                            "user" => $user,
                                            "idgroup" => $groups[0]["idgroup"],
-                                           "comment" => $comment))
+                                           "comment" => $comment])
                                ->execute();
     }
 
-    /** Remove an groupmember from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to remove
-      */
+    /**
+     * Remove an groupmember from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to remove
+     */
     public function groupmemberDel($module, $group, $user)
     {
         if ($this->dbGroupMember == null) {
@@ -1049,11 +1082,12 @@ class Authzgroupsoo
                                ->execute();
     }
 
-    /** Remove an groupmember from database and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $idgroupmember The user to remove
-      */
+    /**
+     * Remove an groupmember from database and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $idgroupmember The user to remove
+     */
     public function groupmemberDelByID($module, $idgroup, $idgroupmember)
     {
         if ($this->dbGroupMember == null) {
@@ -1098,25 +1132,27 @@ class Authzgroupsoo
                                ->execute();
     }
 
-    /** Update an groupmember in the database
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $user The user to update
-      * @param string|null $comment The comment to update
-      */
+    /**
+     * Update an groupmember in the database
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $user The user to update
+     * @param string|null $comment The comment to update
+     */
     public function groupmemberUpdate($module, $group, $user, $comment = "")
     {
         $this->rightCache = null;
         die("This function is not available : contact us if you need it\n");
     }
 
-    /** Update an groupmember in the database
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $iduser The user to update
-      * @param string $user The new user name
-      * @param string|null $comment The comment to update
-      */
+    /**
+     * Update an groupmember in the database
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $iduser The user to update
+     * @param string $user The new user name
+     * @param string|null $comment The comment to update
+     */
     public function groupmemberUpdateByID(
         $module,
         $idgroup,
@@ -1139,16 +1175,17 @@ class Authzgroupsoo
                                    "=",
                                    $data[0]["idgroupmember"]
                                )
-                               ->setValues(array("user" => $user,
-                                                   "comment" => $comment))
+                               ->setValues(["user" => $user,
+                                                   "comment" => $comment])
                                ->execute();
     }
 
 
-    /** Return an array with all the groups where the user is in and in the module
-      * @param string $module The module to use
-      * @param string $user The user to search
-      */
+    /**
+     * Return an array with all the groups where the user is in and in the module
+     * @param string $module The module to use
+     * @param string $user The user to search
+     */
     public function groupmemberReadUser($module, $user)
     {
         if ($this->dbGroupMember == null) {
@@ -1162,7 +1199,7 @@ class Authzgroupsoo
         }
         $idgrouptmps = $this->groupRead($module);
         // Create an array with idgroup=>group
-        $idgroups = array();
+        $idgroups = [];
         foreach ($idgrouptmps as $val) {
             $idgroups[$val["idgroup"]] = $val["group"];
         }
@@ -1170,17 +1207,18 @@ class Authzgroupsoo
         $idgroupmembers = $this->dbGroupMember->select()
                                           ->whereAdd("user", "=", $user)
                                           ->execute();
-        $res = array();
+        $res = [];
         foreach ($idgroupmembers as $idmembers) {
             $res[$idmembers["idgroup"]] = $idgroups[$idmembers["idgroup"]];
         }
         return $res;
     }
 
-    /** Return an array with all the groups where the user is in and in the module
-      * @param string $module The module to use
-      * @param integer $idgroupmember The user to search
-      */
+    /**
+     * Return an array with all the groups where the user is in and in the module
+     * @param string $module The module to use
+     * @param integer $idgroupmember The user to search
+     */
     public function groupmemberReadUserByID($module, $idgroupmember)
     {
         if ($this->dbGroupMember == null) {
@@ -1194,25 +1232,26 @@ class Authzgroupsoo
         }
         $idgrouptmps = $this->groupRead($module);
         // Create an array with idgroup=>group
-        $idgroups = array();
+        $idgroups = [];
         foreach ($idgrouptmps as $val) {
             $idgroups[$val["idgroup"]] = $val["group"];
         }
         $this->dbGroupMember->clearRequest();
         $this->dbGroupMember->whereAdd("idgroupmember", "=", $idgroupmember);
         $idgroupmembers = $this->dbGroupMember->select()->execute();
-        $res = array();
+        $res = [];
         foreach ($idgroupmembers as $idmembers) {
             $res[$idmembers["idgroup"]] = $idgroups[$idmembers["idgroup"]];
         }
         return $res;
     }
 
-    /** Return an array with all the available users in the group and in the
-      * module
-      * @param string $module The module to use
-      * @param string $group The group to search
-      */
+    /**
+     * Return an array with all the available users in the group and in the
+     * module
+     * @param string $module The module to use
+     * @param string $group The group to search
+     */
     public function groupmemberReadGroup($module, $group)
     {
         if ($this->dbGroupMember == null) {
@@ -1242,11 +1281,12 @@ class Authzgroupsoo
                                ->execute();
     }
 
-    /** Return an array with all the available users in the group and in the
-      * module
-      * @param string $module The module to use
-      * @param integer $idgroup The group to search
-      */
+    /**
+     * Return an array with all the available users in the group and in the
+     * module
+     * @param string $module The module to use
+     * @param integer $idgroup The group to search
+     */
     public function groupmemberReadGroupByID($module, $idgroup)
     {
         if ($this->dbGroupMember == null) {
@@ -1275,11 +1315,12 @@ class Authzgroupsoo
                                ->execute();
     }
 
-    /** Return an array containing the information of a user in a specific group
-      * @param string $module The module to use
-      * @param integer $idgroup The group to search
-      * @param integer $iduser The user to search
-      */
+    /**
+     * Return an array containing the information of a user in a specific group
+     * @param string $module The module to use
+     * @param integer $idgroup The group to search
+     * @param integer $iduser The user to search
+     */
     public function groupmemberReadUserDataByID($module, $idgroup, $iduser)
     {
         if ($this->dbGroupMember == null) {
@@ -1309,19 +1350,21 @@ class Authzgroupsoo
                                ->execute();
     }
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function groupmembersTitles()
     {
         return $this->dbGroupMember->titles();
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data to check
-      * @param integer|null $idgroupmember The group member associated to verify
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data to check
+     * @param integer|null $idgroupmember The group member associated to verify
+     * @return array The errors found in the data
+     */
     public function groupmembersVerify($data, $idgroupmember = false)
     {
         return $this->dbGroupMember->verify($data, $idgroupmember);
@@ -1330,14 +1373,15 @@ class Authzgroupsoo
     ////////////////
     //   RIGHTS   //
     ////////////////
-    /** Add a new right to right list
-      * Return the idright created
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $object The object to use
-      * @param string $right The right to add
-      * @param string|null $comment The comment to add
-      */
+    /**
+     * Add a new right to right list
+     * Return the idright created
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $object The object to use
+     * @param string $right The right to add
+     * @param string|null $comment The comment to add
+     */
     public function rightAdd($module, $group, $object, $right, $comment = "")
     {
         if ($this->dbRight == null) {
@@ -1384,22 +1428,23 @@ class Authzgroupsoo
         $this->rightCache = null;
         $this->dbRight->clearRequest();
         return $this->dbRight->insert()
-                         ->setValues(array(
+                         ->setValues([
                              "idgroup" => $groups[0]["idgroup"],
                              "idobject" => $objects[0]["idobject"],
                              "right" => $right,
-                             "comment" => $comment))
+                             "comment" => $comment])
                          ->execute();
     }
 
-    /** Add a new right to right list by ID
-      * Return the idright created
-      * @param string $module The module to use
-      * @param integer $idgroup The group to use
-      * @param integer $idobject The object to use
-      * @param integer $idright The right to add
-      * @param string|null $comment The comment to add
-      */
+    /**
+     * Add a new right to right list by ID
+     * Return the idright created
+     * @param string $module The module to use
+     * @param integer $idgroup The group to use
+     * @param integer $idobject The object to use
+     * @param integer $idright The right to add
+     * @param string|null $comment The comment to add
+     */
     public function rightAddByID(
         $module,
         $idgroup,
@@ -1449,19 +1494,20 @@ class Authzgroupsoo
         $this->rightCache = null;
         $this->dbRight->clearRequest();
         return $this->dbRight->insert()
-                         ->setValues(array(
+                         ->setValues([
                              "idgroup" => $groups[0]["idgroup"],
                              "idobject" => $objects[0]["idobject"],
                              "right" => $right,
-                             "comment" => $comment))
+                             "comment" => $comment])
                          ->execute();
     }
 
-    /** Remove an right from database and all the rights using it
-      * @param string $module The module to use
-      * @param string $group The group to use
-      * @param string $object The object to remove the rights
-      */
+    /**
+     * Remove an right from database and all the rights using it
+     * @param string $module The module to use
+     * @param string $group The group to use
+     * @param string $object The object to remove the rights
+     */
     public function rightDel($module, $group, $object)
     {
         if ($this->dbRight == null) {
@@ -1484,10 +1530,11 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Remove an right from database by ID and all the rights using it
-      * @param string $module The module to use
-      * @param integer $idright The idright to be deleted
-      */
+    /**
+     * Remove an right from database by ID and all the rights using it
+     * @param string $module The module to use
+     * @param integer $idright The idright to be deleted
+     */
     public function rightDelByID($module, $idright)
     {
         if ($this->dbRight == null) {
@@ -1510,13 +1557,14 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Update a right in the database
-      * @param string $module The module to use
-      * @param string $group The group to update the right
-      * @param string $object The object ot update the right
-      * @param string $newright The new right to save
-      * @param string|null $newcomment The new comment to save
-      */
+    /**
+     * Update a right in the database
+     * @param string $module The module to use
+     * @param string $group The group to update the right
+     * @param string $object The object ot update the right
+     * @param string $newright The new right to save
+     * @param string|null $newcomment The new comment to save
+     */
     public function rightUpdate(
         $module,
         $group,
@@ -1560,18 +1608,19 @@ class Authzgroupsoo
         $this->dbRight->clearRequest();
         return $this->dbRight->update()
                          ->whereAdd("idright", "=", $idrights[0]["idright"])
-                         ->setValues(array("right" => $newright,
-                                             "comment" => $newcomment))
+                         ->setValues(["right" => $newright,
+                                             "comment" => $newcomment])
                          ->execute();
     }
 
-    /** Update a right by ID in the database
-      * @param string $module The module to use
-      * @param integer $idright The idright to update the right
-      * @param integer $newidobject The object ot update the right
-      * @param integer $newright The new right to save
-      * @param string|null $newcomment The new comment to save
-      */
+    /**
+     * Update a right by ID in the database
+     * @param string $module The module to use
+     * @param integer $idright The idright to update the right
+     * @param integer $newidobject The object ot update the right
+     * @param integer $newright The new right to save
+     * @param string|null $newcomment The new comment to save
+     */
     public function rightUpdateByID(
         $module,
         $idright,
@@ -1615,19 +1664,20 @@ class Authzgroupsoo
         $this->dbRight->clearRequest();
         return $this->dbRight->update()
                          ->whereAdd("idright", "=", $idrights[0]["idright"])
-                         ->setValues(array("idobject" => $newidobject,
+                         ->setValues(["idobject" => $newidobject,
                                              "right" => $newright,
-                                             "comment" => $newcomment))
+                                             "comment" => $newcomment])
                          ->execute();
     }
 
 
-    /** Return an array with all the available rights in the module, for a group,
-      * and concerning an object
-      * @param string $module The module to use
-      * @param string $group The group to get the rights
-      * @param string $object The object to get the rights
-      */
+    /**
+     * Return an array with all the available rights in the module, for a group,
+     * and concerning an object
+     * @param string $module The module to use
+     * @param string $group The group to get the rights
+     * @param string $object The object to get the rights
+     */
     public function rightRead($module, $group, $object)
     {
         if ($this->dbRight == null) {
@@ -1657,10 +1707,11 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Return an array with all the available rights for a module and a group
-      * @param string $module The module to use
-      * @param string $group The group to get the rights
-      */
+    /**
+     * Return an array with all the available rights for a module and a group
+     * @param string $module The module to use
+     * @param string $group The group to get the rights
+     */
     public function rightReadByGroup($module, $group)
     {
         if ($this->dbRight == null) {
@@ -1679,10 +1730,11 @@ class Authzgroupsoo
         return $this->rightReadByGroupByID($module, $groups[0]["idgroup"]);
     }
 
-    /** Return an array with all the available rights for a module and a group
-      * @param string $module The module to use
-      * @param integer $idgroup The group to get the rights
-      */
+    /**
+     * Return an array with all the available rights for a module and a group
+     * @param string $module The module to use
+     * @param integer $idgroup The group to get the rights
+     */
     public function rightReadByGroupByID($module, $idgroup)
     {
         if ($this->dbRight == null) {
@@ -1697,11 +1749,12 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Return an array with all the information concerning a right selected by
-      * @param string $module The module to use
-      * @param integer $idright The right to search
-      * ID
-      */
+    /**
+     * Return an array with all the information concerning a right selected by
+     * @param string $module The module to use
+     * @param integer $idright The right to search
+     * ID
+     */
     public function rightReadByID($module, $idright)
     {
         if ($this->dbRight == null) {
@@ -1716,10 +1769,11 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Return an array with all the available rights for a module and an object
-      * @param string $module The module to use
-      * @param string $object The object to search
-      */
+    /**
+     * Return an array with all the available rights for a module and an object
+     * @param string $module The module to use
+     * @param string $object The object to search
+     */
     public function rightReadByObject($module, $object)
     {
         if ($this->dbRight == null) {
@@ -1741,10 +1795,11 @@ class Authzgroupsoo
                          ->execute();
     }
 
-    /** Return an array with all the available rights for a module and an idobject
-      * @param string $module The module to use
-      * @param integer $idobject The object to search
-      */
+    /**
+     * Return an array with all the available rights for a module and an idobject
+     * @param string $module The module to use
+     * @param integer $idobject The object to search
+     */
     public function rightReadByObjectByID($module, $idobject)
     {
         if ($this->dbRight == null) {
@@ -1760,26 +1815,29 @@ class Authzgroupsoo
     }
 
 
-    /** Return an array containing the titles of the table translating in the user
-      * language
-      */
+    /**
+     * Return an array containing the titles of the table translating in the user
+     * language
+     */
     public function rightTitles()
     {
         return $this->dbRight->titles();
     }
 
-    /** Return all the types of rights available (RO and RW)
-      */
+    /**
+     * Return all the types of rights available (RO and RW)
+     */
     public function rightTypes()
     {
-        return array("0" => "NO", "1" => "RO", "2" => "RW");
+        return ["0" => "NO", "1" => "RO", "2" => "RW"];
     }
 
-    /** Check if the provided data are compilant with the group specification
-      * @param array $data The data of the right to check
-      * @param integer $idright The right to search
-      * @return array The errors found in the data
-      */
+    /**
+     * Check if the provided data are compilant with the group specification
+     * @param array $data The data of the right to check
+     * @param integer $idright The right to search
+     * @return array The errors found in the data
+     */
     public function rightVerify($data, $idright = false)
     {
         return $this->dbRight->verify($data, $idright);
diff --git a/src/Backtrace.php b/src/Backtrace.php
index ead4f42..d4d6c5c 100644
--- a/src/Backtrace.php
+++ b/src/Backtrace.php
@@ -1,21 +1,24 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display the backtrace in HTML with clicks to display the content
-  */
+/**
+ * Display the backtrace in HTML with clicks to display the content
+ */
 class Backtrace
 {
-    /** Display the backtrace in the browser
-      * use: \backtrace::show (debug_backtrace ());
-      * @param array $backtrace The backtrace to display
-      */
+    /**
+     * Display the backtrace in the browser
+     * use: \backtrace::show (debug_backtrace ());
+     * @param array $backtrace The backtrace to display
+     */
     public static function show($backtrace)
     {
         if (! is_array($backtrace)) {
diff --git a/src/Cachefile.php b/src/Cachefile.php
index e67d9c2..0b54751 100644
--- a/src/Cachefile.php
+++ b/src/Cachefile.php
@@ -1,29 +1,34 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** A cache manager in file
-  */
+/**
+ * A cache manager in file
+ */
 class Cachefile
 {
-    /** Where to store the cached information
-      */
+    /**
+     * Where to store the cached information
+     */
     public $directory = "./cache";
 
-    /** If TRUE : no information is cached
-      */
+    /**
+     * If TRUE : no information is cached
+     */
     public $nocache = false;
 
-    /** Getter/setter for $directory cache
-      * @param string|null $val The directory to use
-      * @return $this or $this->directory value
-      */
+    /**
+     * Getter/setter for $directory cache
+     * @param string|null $val The directory to use
+     * @return $this or $this->directory value
+     */
     public function directory($val = null)
     {
         if ($val === null) {
@@ -36,8 +41,9 @@ class Cachefile
         return $this;
     }
 
-    /** Check if there is some garbage to clean
-      */
+    /**
+     * Check if there is some garbage to clean
+     */
     public function garbage()
     {
         try {
@@ -57,9 +63,9 @@ class Cachefile
         }
 
         if ($res === false) {
-            $data = array("ttl"        => 24 * 60 * 60,
+            $data = ["ttl"        => 24 * 60 * 60,
                      "createTime" => time(),
-                     "data"       => "CACHE-Garbage");
+                     "data"       => "CACHE-Garbage"];
             file_put_contents($fileCache, serialize($data));
             chmod($fileCache, 0666);
             $files = glob($this->directory . "/*", GLOB_NOSORT);
@@ -86,12 +92,13 @@ class Cachefile
         }
     }
 
-    /** This function check if the cachedir exists and create it if it is not the
-      * case.
-      * Check if the cache dir is writable and readable
-      * @return true if OK
-      * @throw Exception if an error occured
-      */
+    /**
+     * This function check if the cachedir exists and create it if it is not the
+     * case.
+     * Check if the cache dir is writable and readable
+     * @return true if OK
+     * @throw Exception if an error occured
+     */
     public function cachedir()
     {
         if (! isset($this->directory) || $this->directory === "") {
@@ -147,14 +154,15 @@ class Cachefile
         return true;
     }
 
-    /** This function write data in cache
-      * @param string $id Cache identifier (add the authentication, the METHOD...)
-      * @param mixed $data The data to save
-      * @param integer|null $ttl The cache Time to Leave in seconds (3600s by
-      * default)
-      * @return true
-      * @throw if an error occured
-      */
+    /**
+     * This function write data in cache
+     * @param string $id Cache identifier (add the authentication, the METHOD...)
+     * @param mixed $data The data to save
+     * @param integer|null $ttl The cache Time to Leave in seconds (3600s by
+     * default)
+     * @return true
+     * @throw if an error occured
+     */
     public function write($id, $data, $ttl = 3600)
     {
         if ($this->nocache !== false) {
@@ -182,21 +190,22 @@ class Cachefile
         $this->garbage();
         $fileCache = $this->directory . "/" . sha1($id);
         touch($fileCache . ".lock");
-        $data = array("ttl"         => $ttl,
+        $data = ["ttl"         => $ttl,
                     "createTime" => time(),
-                    "data"       => $data);
+                    "data"       => $data];
         file_put_contents($fileCache, serialize($data));
         unlink($fileCache . ".lock");
         chmod($fileCache, 0666);
         return true;
     }
 
-    /** This function read data from cache. Return FALSE in case of empty or too
-      * older cache
-      * @param string $id Cache identifier (add the authentication, the METHOD)
-      * @return false if the cache is empty or too old
-      * @return mixed The data stored in cache
-      */
+    /**
+     * This function read data from cache. Return FALSE in case of empty or too
+     * older cache
+     * @param string $id Cache identifier (add the authentication, the METHOD)
+     * @return false if the cache is empty or too old
+     * @return mixed The data stored in cache
+     */
     public function read($id)
     {
         if ($this->nocache !== false) {
@@ -275,10 +284,11 @@ class Cachefile
         return false;
     }
 
-    /** This function delete an id in cache
-      * @param string $id Cache identifier (add the authentication, the METHOD...)
-      * @return boolean The cache is well deleted
-      */
+    /**
+     * This function delete an id in cache
+     * @param string $id Cache identifier (add the authentication, the METHOD...)
+     * @return boolean The cache is well deleted
+     */
     public function delete($id)
     {
         $fileCache = $this->directory . "/" . sha1($id);
diff --git a/src/Cacheoutput.php b/src/Cacheoutput.php
index 43e9c50..5781db6 100644
--- a/src/Cacheoutput.php
+++ b/src/Cacheoutput.php
@@ -1,38 +1,51 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class permit to cache the ouptut of a code. If the cache is already
-  * available, use it.
-  * It resend the headers as the ouptut send them
-  * Use it by :
-  *    $c = new Cacheoutput ("URL");
-  * Don't forget to define a variable or the cache saved is always empty
-  */
+/**
+ * This class permit to cache the ouptut of a code. If the cache is already
+ * available, use it.
+ * It resend the headers as the ouptut send them
+ * Use it by :
+ *    $c = new Cacheoutput ("URL");
+ * Don't forget to define a variable or the cache saved is always empty
+ */
 class Cacheoutput
 {
-    /** Record if the saving of pages is on going */
+    /**
+     * Record if the saving of pages is on going
+     */
     private $saving = false;
-    /** The called id */
+    /**
+     * The called id
+     */
     private $id = null;
-    /** The called ttl */
+    /**
+     * The called ttl
+     */
     private $ttl = null;
-    /** The cache object */
+    /**
+     * The cache object
+     */
     private $cache = null;
-    /** Current path at start due to lack of information in __destruct*/
+    /**
+     * Current path at start due to lack of information in __destruct
+     */
     private $cacheCWD = null;
 
     /**
-        @param string $id The cache identifier
-        @param integer|null $ttl The cache Time to Leave in seconds (60s by
-                                 default)
-        @param string|null $method The cache method to use */
+     * @param string $id The cache identifier
+     * @param integer|null $ttl The cache Time to Leave in seconds (60s by
+     * default)
+     * @param string|null $method The cache method to use
+     */
     public function __construct($id, $ttl = 60, $method = "file")
     {
         $res = @include("domframework/cache$method.php");
@@ -68,15 +81,17 @@ class Cacheoutput
         // The data are sent automatically
     }
 
-    /** End of saving the data in cache */
+    /**
+     * End of saving the data in cache
+     */
     public function __destruct()
     {
         // Force the path because it return to / in the destructor
         chdir($this->cacheCWD);
         if ($this->saving === true) {
             // Do the saving of the data
-            $data = array("content" => ob_get_contents(),
-                      "headers" => headers_list());
+            $data = ["content" => ob_get_contents(),
+                      "headers" => headers_list()];
             $this->cache->write($this->id, $data, $this->ttl);
         }
     }
diff --git a/src/Certificationauthority.php b/src/Certificationauthority.php
index 83d1bd3..c0284e5 100644
--- a/src/Certificationauthority.php
+++ b/src/Certificationauthority.php
@@ -1,39 +1,47 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** An certificate authority
-  */
+/**
+ * An certificate authority
+ */
 class Certificationauthority
 {
     // PROPERTIES
-    /** The opensslCnfPath file
-      */
+    /**
+     * The opensslCnfPath file
+     */
     private $opensslCnfPath;
 
-    /** The CA public cert
-      */
+    /**
+     * The CA public cert
+     */
     private $caCert = "";
-    /** The CA private key
-      */
+    /**
+     * The CA private key
+     */
     private $caKey = "";
 
-    /** The user private key resource
-      */
+    /**
+     * The user private key resource
+     */
     private $privateKey;
 
-    /** The configuration arguments
-      */
-    private $configargs = array();
+    /**
+     * The configuration arguments
+     */
+    private $configargs = [];
 
-    /** The basic openssl.cnf configuration
-      */
+    /**
+     * The basic openssl.cnf configuration
+     */
     private $opensslConf = 'HOME        = .
 RANDFILE    = $ENV::HOME/.rnd
 
@@ -54,8 +62,9 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 extendedKeyUsage = serverAuth, clientAuth
 ';
 
-    /** Check if openssl support is available in PHP
-      */
+    /**
+     * Check if openssl support is available in PHP
+     */
     public function __construct()
     {
         if (! function_exists("openssl_csr_new")) {
@@ -66,15 +75,16 @@ extendedKeyUsage = serverAuth, clientAuth
         }
         $this->opensslCnfPath = tempnam("/tmp", "openssl-");
         file_put_contents($this->opensslCnfPath, $this->opensslConf);
-        $this->configargs = array(
+        $this->configargs = [
         "config" => $this->opensslCnfPath,
         "digest_alg" => "sha256WithRSAEncryption",
         "private_key_bits" => 4096,
-        );
+        ];
     }
 
-    /** Remove the temporary files when destroying the object
-      */
+    /**
+     * Remove the temporary files when destroying the object
+     */
     public function __destruct()
     {
         if (file_exists($this->opensslCnfPath)) {
@@ -82,30 +92,31 @@ extendedKeyUsage = serverAuth, clientAuth
         }
     }
 
-    /** Create the pair key/cert for authority
-      * @param string $countryName Country name (like FR)
-      * @param string $organizationName Name of organization
-      * @param string $commonName Common name of authority
-      * @param integer|null $days The number of days of validity of the CA (3650
-      *   by default)
-      * @return $this
-      */
+    /**
+     * Create the pair key/cert for authority
+     * @param string $countryName Country name (like FR)
+     * @param string $organizationName Name of organization
+     * @param string $commonName Common name of authority
+     * @param integer|null $days The number of days of validity of the CA (3650
+     *   by default)
+     * @return $this
+     */
     public function createCA(
         $countryName,
         $organizationName,
         $commonName,
         $days = 3650
     ) {
-        $req_key = openssl_pkey_new(array(
+        $req_key = openssl_pkey_new([
         "config" => $this->opensslCnfPath,
         "private_key_bits" => 4096,
         "private_key_type" => OPENSSL_KEYTYPE_RSA,
-        ));
-        $dn = array(
+        ]);
+        $dn = [
         "countryName" => $countryName,
         "organizationName" => $organizationName,
         "commonName" => $commonName,
-        );
+        ];
         $this->configargs["x509_extensions"] = "v3_ca";
         // x509_extensions must be defined in /etc/ssl/openssl.cnf
         $req_csr = openssl_csr_new($dn, $req_key, $this->configargs);
@@ -125,10 +136,11 @@ extendedKeyUsage = serverAuth, clientAuth
         return $this;
     }
 
-    /** Get/Set the ca cert
-      * @param string|null $caCert The CA cert to get/set
-      * @return ($caCert is null ? string : $this) the CA if get in PEM, $this if set
-      */
+    /**
+     * Get/Set the ca cert
+     * @param string|null $caCert The CA cert to get/set
+     * @return ($caCert is null ? string : $this) the CA if get in PEM, $this if set
+     */
     public function caCert($caCert = null)
     {
         if ($caCert === null) {
@@ -141,10 +153,11 @@ extendedKeyUsage = serverAuth, clientAuth
         return $this;
     }
 
-    /** Get/Set the ca key
-      * @param string|null $caKey The CA key to get/set
-      * @return ($caKey is null ? string : $this) the CA if get, $this if set
-      */
+    /**
+     * Get/Set the ca key
+     * @param string|null $caKey The CA key to get/set
+     * @return ($caKey is null ? string : $this) the CA if get, $this if set
+     */
     public function caKey($caKey = null)
     {
         if ($caKey === null) {
@@ -157,23 +170,25 @@ extendedKeyUsage = serverAuth, clientAuth
         return $this;
     }
 
-    /** Create a private key
-      * @return $this;
-      */
+    /**
+     * Create a private key
+     * @return $this;
+     */
     public function createPrivateKey()
     {
-        $this->privateKey = openssl_pkey_new(array(
+        $this->privateKey = openssl_pkey_new([
         "config" => $this->opensslCnfPath,
         "private_key_bits" => 4096,
         "private_key_type" => OPENSSL_KEYTYPE_RSA,
-        ));
+        ]);
         return $this;
     }
 
-    /** Get in PEM/Set the private key
-      * @param string|null $privateKey The private key to use
-      * @return ($privateKey is null ? string : $this) the privatekey if get in PEM, $this if set
-      */
+    /**
+     * Get in PEM/Set the private key
+     * @param string|null $privateKey The private key to use
+     * @return ($privateKey is null ? string : $this) the privatekey if get in PEM, $this if set
+     */
     public function privateKey($privateKey = null)
     {
         if ($privateKey === null) {
@@ -190,23 +205,24 @@ extendedKeyUsage = serverAuth, clientAuth
         return $this;
     }
 
-    /** Create a CSR.
-      * Will create a private key if none is already exists
-      * @param string $countryName Country name (like FR)
-      * @param string $organizationName Name of organization
-      * @param string $commonName Common name of authority
-      * @return string the CSR created in PEM
-      */
+    /**
+     * Create a CSR.
+     * Will create a private key if none is already exists
+     * @param string $countryName Country name (like FR)
+     * @param string $organizationName Name of organization
+     * @param string $commonName Common name of authority
+     * @return string the CSR created in PEM
+     */
     public function createCSR($countryName, $organizationName, $commonName)
     {
         if ($this->privateKey === null) {
             $this->createPrivateKey();
         }
-        $dn = array(
+        $dn = [
         "countryName" => $countryName,
         "organizationName" => $organizationName,
         "commonName" => $commonName,
-        );
+        ];
         $this->configargs["x509_extensions"] = "v3_req";
         $req_csr = openssl_csr_new($dn, $this->privateKey, $this->configargs);
         if ($req_csr === false) {
@@ -217,22 +233,23 @@ extendedKeyUsage = serverAuth, clientAuth
         return $out;
     }
 
-    /** Sign a CSR with an CA cert/key pair and return the signed certificate in
-      * PEM mode
-      * The caCert and caKey must be defined
-      * @param string $csr The CSR to sign
-      * @param string $caCert The CA Certificate
-      * @param string $caKey The CA private key
-      * @param integer|null $days The number of days of validity (365 by default)
-      * @param array|null $altNames The alternative names allowed in cert
-      * @return string the signed certificate in PEM
-      */
+    /**
+     * Sign a CSR with an CA cert/key pair and return the signed certificate in
+     * PEM mode
+     * The caCert and caKey must be defined
+     * @param string $csr The CSR to sign
+     * @param string $caCert The CA Certificate
+     * @param string $caKey The CA private key
+     * @param integer|null $days The number of days of validity (365 by default)
+     * @param array|null $altNames The alternative names allowed in cert
+     * @return string the signed certificate in PEM
+     */
     public function signCSR(
         $csr,
         $caCert,
         $caKey,
         $days = 365,
-        $altNames = array()
+        $altNames = []
     ) {
         if ($days === null) {
             $days = 365;
diff --git a/src/Cli.php b/src/Cli.php
index 16de14e..f5fb583 100644
--- a/src/Cli.php
+++ b/src/Cli.php
@@ -1,75 +1,90 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to interract with controllers and models from the CLI */
+/**
+ * Allow to interract with controllers and models from the CLI
+ */
 class Cli
 {
-    /** Run in CLI mode with parameters
-      * Example of cli code :
-      * #!/usr/bin/php
-      * <?php
-      * $cli = new Cli;
-      * $cli->run();
-      */
-    /** The expert mode allow to see/execute the models */
+    /**
+     * Run in CLI mode with parameters
+     * Example of cli code :
+     * #!/usr/bin/php
+     * <?php
+     * $cli = new Cli;
+     * $cli->run();
+     */
+    /**
+     * The expert mode allow to see/execute the models
+     */
     private $EXPERT = false;
 
-    /** Quiet mode don't display empty results */
+    /**
+     * Quiet mode don't display empty results
+     */
     private $QUIET;
 
-    /** Store the controllers pathes to test
-      */
-    private $controllersPath = array("controllers/*.php");
+    /**
+     * Store the controllers pathes to test
+     */
+    private $controllersPath = ["controllers/*.php"];
 
-    /** Store the models pathes to test
-      */
-    private $modelsPath = array("models/*.php");
+    /**
+     * Store the models pathes to test
+     */
+    private $modelsPath = ["models/*.php"];
 
-    /** The construtor define the catching of the errors */
+    /**
+     * The construtor define the catching of the errors
+     */
     public function __construct()
     {
         global $argv;
         $launcher = $argv[0];
         chdir(dirname($argv[0]) . "/..");
         // Catch the trigger_errors and display them politely
-        set_error_handler(array(&$this, "cliErrorHandler"));
+        set_error_handler([&$this, "cliErrorHandler"]);
     }
 
-    /** Define the controllers path
-      * @param string|array $path The controllers pathes to use
-      */
+    /**
+     * Define the controllers path
+     * @param string|array $path The controllers pathes to use
+     */
     public function controllersDir($path)
     {
         if (! is_array($path)) {
-            $path = array($path);
+            $path = [$path];
         }
         $this->controllersPath = $path;
     }
 
-    /** Define the models path
-      * @param string|array $path The models pathes to use
-      */
+    /**
+     * Define the models path
+     * @param string|array $path The models pathes to use
+     */
     public function modelsDir($path)
     {
         if (! is_array($path)) {
-            $path = array($path);
+            $path = [$path];
         }
         $this->modelsPath = $path;
     }
 
-    /** The error handler for CLI : display error in STDERR
-      * @param integer $errno The error type
-      * @param string $errstr The string to send in error
-      * @param string $errfile The error file which generate the error
-      * @param integer $errline The line with an error
-      */
+    /**
+     * The error handler for CLI : display error in STDERR
+     * @param integer $errno The error type
+     * @param string $errstr The string to send in error
+     * @param string $errfile The error file which generate the error
+     * @param integer $errline The line with an error
+     */
     public function cliErrorHandler($errno, $errstr, $errfile, $errline)
     {
         if (!(error_reporting() & $errno)) {
@@ -135,8 +150,9 @@ class Cli
         }
     }
 
-    /** The real application launcher and helpers
-      */
+    /**
+     * The real application launcher and helpers
+     */
     public function run()
     {
         global $argv;
@@ -180,7 +196,7 @@ class Cli
         }
 
         // List the controllers and the models if the expert mode is activated
-        $files = array();
+        $files = [];
         foreach ($this->controllersPath as $path) {
             $files = array_merge($files, glob($path));
         }
@@ -210,7 +226,7 @@ class Cli
         }
         // Check if there is some classes which can be shorted (classes only in
         // controllers or only in models
-        $shortClasses = array();
+        $shortClasses = [];
         foreach ($classes as $class => $file) {
             $short = substr(strstr($class, "\\"), 1);
             if ($short === false) {
@@ -379,7 +395,7 @@ class Cli
         }
         $min = 0;
         $max = 0;
-        $paramsConst = array();
+        $paramsConst = [];
         try {
             $r1 = new \ReflectionMethod($class, "__construct");
             $paramsConst = $r1->getParameters();
@@ -397,7 +413,7 @@ class Cli
             $max++;
         }
 
-        if (in_array("-?", $argv)) {
+        if (in_array("-?", $argv, true)) {
             // Question mark  display the PHPDoc of the method
             $comment = trim(substr($r1->getDocComment(), 3, -2));
             if ($comment !== "") {
@@ -422,8 +438,8 @@ class Cli
         if (count($argv) < $min) {
             die("Not enough parameters provided to method\n");
         }
-        if (in_array("-", $argv)) {
-            $tab = array_keys($argv, "-");
+        if (in_array("-", $argv, true)) {
+            $tab = array_keys($argv, "-", true);
             $keyStdIn = reset($tab);
             $dataStdIn = file_get_contents("php://stdin");
             $argv[$keyStdIn] = $dataStdIn;
@@ -444,7 +460,7 @@ class Cli
                     $argv[$key] = $name;
                 } else {
                     if (! is_array($argv[$key])) {
-                        $argv[$key] = array();
+                        $argv[$key] = [];
                     }
                     $argv[$key][$name] = $value;
                 }
@@ -452,7 +468,7 @@ class Cli
         }
 
         // Manage a parameter in the constructor of the class
-        $paramConst = array();
+        $paramConst = [];
         if (count($paramsConst) > 0) {
             $paramConst = array_slice($argv, 0, count($paramsConst));
             $argv = array_slice($argv, count($paramsConst));
@@ -461,8 +477,8 @@ class Cli
         try {
             $classReflection = new \ReflectionClass($class);
             $r = $classReflection->newInstanceArgs($paramConst);
-            $s = call_user_func_array(array($r, $method), $argv);
-            if ($this->QUIET === false || $s !== "" && $s !== array() && $s !== null) {
+            $s = call_user_func_array([$r, $method], $argv);
+            if ($this->QUIET === false || $s !== "" && $s !== [] && $s !== null) {
                 if (is_string($s)) {
                     echo $s;
                 } elseif (is_array($s)) {
diff --git a/src/Color.php b/src/Color.php
index 37996b8..971a6a0 100644
--- a/src/Color.php
+++ b/src/Color.php
@@ -19,195 +19,195 @@ class Color
      * From http://www.rapidtables.com/web/color/index.htm
      * @var array<string, array<int>>
      */
-    public $colorList = array(
+    public $colorList = [
     // Black
-    "black"                => array(0, 0, 0),
-    "dimgrey"              => array(105, 105, 105),
-    "grey"                 => array(128, 128, 128),
-    "darkgrey"             => array(169, 169, 169),
-    "silver"               => array(192, 192, 192),
+    "black"                => [0, 0, 0],
+    "dimgrey"              => [105, 105, 105],
+    "grey"                 => [128, 128, 128],
+    "darkgrey"             => [169, 169, 169],
+    "silver"               => [192, 192, 192],
 
     // Blue
-    "aliceblue"            => array(240, 248, 255),
-    "lavender"             => array(230, 230, 250),
-    "powderblue"           => array(176, 224, 230),
-    "lightblue"            => array(173, 216, 230),
-    "lightskyblue"         => array(135, 206, 250),
-    "skyblue"              => array(135, 206, 235),
-    "deepskyblue"          => array(0, 191, 255),
-    "lightsteelblue"       => array(176, 196, 222),
-    "dodgerblue"           => array(30, 144, 255),
-    "cornflowerblue"       => array(100, 149, 237),
-    "steelblue"            => array(70, 130, 180),
-    "cadetblue"            => array(95, 158, 160),
-    "mediumslateblue"      => array(123, 104, 238),
-    "slateblue"            => array(106, 90, 205),
-    "darkslateblue"        => array(72, 61, 139),
-    "royalblue"            => array(65, 105, 225),
-    "blue"                 => array(0, 0, 255),
-    "mediumblue"           => array(0, 0, 205),
-    "darkblue"             => array(0, 0, 139),
-    "navy"                 => array(0, 0, 128),
-    "midnightblue"         => array(25, 25, 112),
-    "blueviolet"           => array(138, 43, 226),
-    "indigo"               => array(75, 0, 130),
+    "aliceblue"            => [240, 248, 255],
+    "lavender"             => [230, 230, 250],
+    "powderblue"           => [176, 224, 230],
+    "lightblue"            => [173, 216, 230],
+    "lightskyblue"         => [135, 206, 250],
+    "skyblue"              => [135, 206, 235],
+    "deepskyblue"          => [0, 191, 255],
+    "lightsteelblue"       => [176, 196, 222],
+    "dodgerblue"           => [30, 144, 255],
+    "cornflowerblue"       => [100, 149, 237],
+    "steelblue"            => [70, 130, 180],
+    "cadetblue"            => [95, 158, 160],
+    "mediumslateblue"      => [123, 104, 238],
+    "slateblue"            => [106, 90, 205],
+    "darkslateblue"        => [72, 61, 139],
+    "royalblue"            => [65, 105, 225],
+    "blue"                 => [0, 0, 255],
+    "mediumblue"           => [0, 0, 205],
+    "darkblue"             => [0, 0, 139],
+    "navy"                 => [0, 0, 128],
+    "midnightblue"         => [25, 25, 112],
+    "blueviolet"           => [138, 43, 226],
+    "indigo"               => [75, 0, 130],
 
     // Brown
-    "cornsilk"             => array(255, 248, 220),
-    "blanchedalmond"       => array(255, 235, 205),
-    "bisque"               => array(255, 228, 196),
-    "wheat"                => array(245, 222, 179),
-    "burlywood"            => array(222, 184, 135),
-    "tan"                  => array(210, 180, 140),
-    "rosybrown"            => array(188, 143, 143),
-    "sandybrown"           => array(244, 164, 96),
-    "goldenrod"            => array(218, 165, 32),
-    "peru"                 => array(205, 133, 63),
-    "chocolate"            => array(210, 105, 30),
-    "saddlebrown"          => array(139, 69, 19),
-    "sienna"               => array(160, 82, 45),
-    "brown"                => array(165, 42, 42),
+    "cornsilk"             => [255, 248, 220],
+    "blanchedalmond"       => [255, 235, 205],
+    "bisque"               => [255, 228, 196],
+    "wheat"                => [245, 222, 179],
+    "burlywood"            => [222, 184, 135],
+    "tan"                  => [210, 180, 140],
+    "rosybrown"            => [188, 143, 143],
+    "sandybrown"           => [244, 164, 96],
+    "goldenrod"            => [218, 165, 32],
+    "peru"                 => [205, 133, 63],
+    "chocolate"            => [210, 105, 30],
+    "saddlebrown"          => [139, 69, 19],
+    "sienna"               => [160, 82, 45],
+    "brown"                => [165, 42, 42],
 
     // Cyan
-    "lightcyan"            => array(224, 255, 255),
-    "cyan"                 => array(0, 255, 255),
-    "aqua"                 => array(0, 255, 255),
-    "aquamarine"           => array(127, 255, 212),
-    "mediumaquamarine"     => array(102, 205, 170),
-    "paleturquoise"        => array(175, 238, 238),
-    "turquoise"            => array(64, 224, 208),
-    "mediumturquoise"      => array(72, 209, 204),
-    "darkturquoise"        => array(0, 206, 209),
-    "lightseagreen"        => array(32, 178, 170),
-    "darkcyan"             => array(0, 139, 139),
-    "teal"                 => array(0, 128, 128),
+    "lightcyan"            => [224, 255, 255],
+    "cyan"                 => [0, 255, 255],
+    "aqua"                 => [0, 255, 255],
+    "aquamarine"           => [127, 255, 212],
+    "mediumaquamarine"     => [102, 205, 170],
+    "paleturquoise"        => [175, 238, 238],
+    "turquoise"            => [64, 224, 208],
+    "mediumturquoise"      => [72, 209, 204],
+    "darkturquoise"        => [0, 206, 209],
+    "lightseagreen"        => [32, 178, 170],
+    "darkcyan"             => [0, 139, 139],
+    "teal"                 => [0, 128, 128],
 
     // Gold
-    "palegoldenrod"        => array(238, 232, 170),
-    "khaki"                => array(240, 230, 140),
-    "gold"                 => array(255, 215, 0),
-    "orange"               => array(255, 165, 0),
-    "darkorange"           => array(255, 140, 0),
-    "goldenyellow"         => array(255, 223, 0),
-    "metallicgold"         => array(212, 175, 55),
-    "oldgold"              => array(207, 181, 59),
-    "vegasgold"            => array(197, 179, 88),
-    "palegold"             => array(230, 190, 138),
-    "goldenbrown"          => array(153, 101, 21),
+    "palegoldenrod"        => [238, 232, 170],
+    "khaki"                => [240, 230, 140],
+    "gold"                 => [255, 215, 0],
+    "orange"               => [255, 165, 0],
+    "darkorange"           => [255, 140, 0],
+    "goldenyellow"         => [255, 223, 0],
+    "metallicgold"         => [212, 175, 55],
+    "oldgold"              => [207, 181, 59],
+    "vegasgold"            => [197, 179, 88],
+    "palegold"             => [230, 190, 138],
+    "goldenbrown"          => [153, 101, 21],
 
     // Green
-    "lawngreen"            => array(124, 252, 0),
-    "chartreuse"           => array(127, 255, 0),
-    "limegreen"            => array(50, 205, 50),
-    "lime"                 => array(0, 255, 0),
-    "forestgreen"          => array(34, 139, 34),
-    "green"                => array(0, 128, 0),
-    "darkgreen"            => array(0, 100, 0),
-    "greenyellow"          => array(173, 255, 47),
-    "yellowgreen"          => array(154, 205, 50),
-    "springgreen"          => array(0, 255, 127),
-    "mediumspringgreen"    => array(0, 250, 154),
-    "lightgreen"           => array(144, 238, 144),
-    "palegreen"            => array(152, 251, 152),
-    "darkseagreen"         => array(143, 188, 143),
-    "mediumseagreen"       => array(60, 179, 113),
-    "seagreen"             => array(46, 139, 87),
-    "olive"                => array(128, 128, 0),
-    "darkolivegreen"       => array(85, 107, 47),
-    "olivedrab"            => array(107, 142, 35),
+    "lawngreen"            => [124, 252, 0],
+    "chartreuse"           => [127, 255, 0],
+    "limegreen"            => [50, 205, 50],
+    "lime"                 => [0, 255, 0],
+    "forestgreen"          => [34, 139, 34],
+    "green"                => [0, 128, 0],
+    "darkgreen"            => [0, 100, 0],
+    "greenyellow"          => [173, 255, 47],
+    "yellowgreen"          => [154, 205, 50],
+    "springgreen"          => [0, 255, 127],
+    "mediumspringgreen"    => [0, 250, 154],
+    "lightgreen"           => [144, 238, 144],
+    "palegreen"            => [152, 251, 152],
+    "darkseagreen"         => [143, 188, 143],
+    "mediumseagreen"       => [60, 179, 113],
+    "seagreen"             => [46, 139, 87],
+    "olive"                => [128, 128, 0],
+    "darkolivegreen"       => [85, 107, 47],
+    "olivedrab"            => [107, 142, 35],
 
     // Grey
-    "gainsboro"            => array(220, 220, 220),
-    "lightgray"            => array(211, 211, 211),
-    "lightgrey"            => array(211, 211, 211),
-    "darkgray"             => array(169, 169, 169),
-    "gray"                 => array(128, 128, 128),
-    "dimgray"              => array(105, 105, 105),
-    "lightslategray"       => array(119, 136, 153),
-    "lightslategrey"       => array(119, 136, 153),
-    "slategray"            => array(112, 128, 144),
-    "slategrey"            => array(112, 128, 144),
-    "darkslategray"        => array(47, 79, 79),
-    "darkslategrey"        => array(47, 79, 79),
+    "gainsboro"            => [220, 220, 220],
+    "lightgray"            => [211, 211, 211],
+    "lightgrey"            => [211, 211, 211],
+    "darkgray"             => [169, 169, 169],
+    "gray"                 => [128, 128, 128],
+    "dimgray"              => [105, 105, 105],
+    "lightslategray"       => [119, 136, 153],
+    "lightslategrey"       => [119, 136, 153],
+    "slategray"            => [112, 128, 144],
+    "slategrey"            => [112, 128, 144],
+    "darkslategray"        => [47, 79, 79],
+    "darkslategrey"        => [47, 79, 79],
 
     // Maroon
-    "maroon"               => array(128, 0, 0),
+    "maroon"               => [128, 0, 0],
 
     // Orange
-    "coral"                => array(255, 127, 80),
-    "tomato"               => array(255, 99, 71),
-    "orangered"            => array(255, 69, 0),
+    "coral"                => [255, 127, 80],
+    "tomato"               => [255, 99, 71],
+    "orangered"            => [255, 69, 0],
 
     // Pink
-    "pink"                 => array(255, 192, 203),
-    "lightpink"            => array(255, 182, 193),
-    "hotpink"              => array(255, 105, 180),
-    "deeppink"             => array(255, 20, 147),
-    "palevioletred"        => array(219, 112, 147),
-    "mediumvioletred"      => array(199, 21, 133),
+    "pink"                 => [255, 192, 203],
+    "lightpink"            => [255, 182, 193],
+    "hotpink"              => [255, 105, 180],
+    "deeppink"             => [255, 20, 147],
+    "palevioletred"        => [219, 112, 147],
+    "mediumvioletred"      => [199, 21, 133],
 
     // Purple
-    "thistle"              => array(216, 191, 216),
-    "plum"                 => array(221, 160, 221),
-    "violet"               => array(238, 130, 238),
-    "orchid"               => array(218, 112, 214),
-    "fuchsia"              => array(255, 0, 255),
-    "magenta"              => array(255, 0, 255),
-    "mediumorchid"         => array(186, 85, 211),
-    "mediumpurple"         => array(147, 112, 219),
-    "darkviolet"           => array(148, 0, 211),
-    "darkorchid"           => array(153, 50, 204),
-    "darkmagenta"          => array(139, 0, 139),
-    "purple"               => array(128, 0, 128),
+    "thistle"              => [216, 191, 216],
+    "plum"                 => [221, 160, 221],
+    "violet"               => [238, 130, 238],
+    "orchid"               => [218, 112, 214],
+    "fuchsia"              => [255, 0, 255],
+    "magenta"              => [255, 0, 255],
+    "mediumorchid"         => [186, 85, 211],
+    "mediumpurple"         => [147, 112, 219],
+    "darkviolet"           => [148, 0, 211],
+    "darkorchid"           => [153, 50, 204],
+    "darkmagenta"          => [139, 0, 139],
+    "purple"               => [128, 0, 128],
 
     // Red
-    "lightsalmon"          => array(255, 160, 122),
-    "salmon"               => array(250, 128, 114),
-    "darksalmon"           => array(233, 150, 122),
-    "lightcoral"           => array(240, 128, 128),
-    "indianred"            => array(205, 92, 92),
-    "crimson"              => array(220, 20, 60),
-    "firebrick"            => array(178, 34, 34),
-    "red"                  => array(255, 0, 0),
-    "darkred"              => array(139, 0, 0),
+    "lightsalmon"          => [255, 160, 122],
+    "salmon"               => [250, 128, 114],
+    "darksalmon"           => [233, 150, 122],
+    "lightcoral"           => [240, 128, 128],
+    "indianred"            => [205, 92, 92],
+    "crimson"              => [220, 20, 60],
+    "firebrick"            => [178, 34, 34],
+    "red"                  => [255, 0, 0],
+    "darkred"              => [139, 0, 0],
 
     // White
-    "white"                => array(255, 255, 255),
-    "snow"                 => array(255, 250, 250),
-    "honeydew"             => array(240, 255, 240),
-    "mintcream"            => array(245, 255, 250),
-    "azure"                => array(240, 255, 255),
-    "ghostwhite"           => array(248, 248, 255),
-    "whitesmoke"           => array(245, 245, 245),
-    "seashell"             => array(255, 245, 238),
-    "beige"                => array(245, 245, 220),
-    "oldlace"              => array(253, 245, 230),
-    "floralwhite"          => array(255, 250, 240),
-    "ivory"                => array(255, 255, 240),
-    "antiquewhite"         => array(250, 235, 215),
-    "linen"                => array(250, 240, 230),
-    "lavenderblush"        => array(255, 240, 245),
-    "mistyrose"            => array(255, 228, 225),
-    "navajowhite"          => array(255, 222, 173),
+    "white"                => [255, 255, 255],
+    "snow"                 => [255, 250, 250],
+    "honeydew"             => [240, 255, 240],
+    "mintcream"            => [245, 255, 250],
+    "azure"                => [240, 255, 255],
+    "ghostwhite"           => [248, 248, 255],
+    "whitesmoke"           => [245, 245, 245],
+    "seashell"             => [255, 245, 238],
+    "beige"                => [245, 245, 220],
+    "oldlace"              => [253, 245, 230],
+    "floralwhite"          => [255, 250, 240],
+    "ivory"                => [255, 255, 240],
+    "antiquewhite"         => [250, 235, 215],
+    "linen"                => [250, 240, 230],
+    "lavenderblush"        => [255, 240, 245],
+    "mistyrose"            => [255, 228, 225],
+    "navajowhite"          => [255, 222, 173],
 
     // Yellow
-    "lightyellow"          => array(255, 255, 224),
-    "lemonchiffon"         => array(255, 250, 205),
-    "lightgoldenrodyellow" => array(250, 250, 210),
-    "papayawhip"           => array(255, 239, 213),
-    "moccasin"             => array(255, 228, 181),
-    "peachpuff"            => array(255, 218, 185),
-    "darkkhaki"            => array(189, 183, 107),
-    "lightyellow1"         => array(255, 255, 204),
-    "lightyellow2"         => array(255, 255, 153),
-    "lightyellow3"         => array(255, 255, 102),
-    "lightyellow4"         => array(255, 255, 51),
-    "yellow"               => array(255, 255, 0),
-    "darkyellow1"          => array(204, 204, 0),
-    "darkyellow2"          => array(153, 153, 0),
-    "darkyellow3"          => array(102, 102, 0),
-    "darkyellow4"          => array(51, 51, 0),
-    );
+    "lightyellow"          => [255, 255, 224],
+    "lemonchiffon"         => [255, 250, 205],
+    "lightgoldenrodyellow" => [250, 250, 210],
+    "papayawhip"           => [255, 239, 213],
+    "moccasin"             => [255, 228, 181],
+    "peachpuff"            => [255, 218, 185],
+    "darkkhaki"            => [189, 183, 107],
+    "lightyellow1"         => [255, 255, 204],
+    "lightyellow2"         => [255, 255, 153],
+    "lightyellow3"         => [255, 255, 102],
+    "lightyellow4"         => [255, 255, 51],
+    "yellow"               => [255, 255, 0],
+    "darkyellow1"          => [204, 204, 0],
+    "darkyellow2"          => [153, 153, 0],
+    "darkyellow3"          => [102, 102, 0],
+    "darkyellow4"          => [51, 51, 0],
+    ];
 
     /**
      * Return the list of the known colors list
diff --git a/src/Config.php b/src/Config.php
index d77b125..1a9b55c 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,40 +1,47 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the configurations of the module done by administrator in a config
-  * file
-  * It is based on the module configuration defaults
-  * The DocType allow to define the configuration HTML page. It must contains
-  * @param : the name of the parameter
-  * @description : the textual description of the parameter
-  * @type : the type of the parameter (string, integer, array)
-  * @values : an array containing the allowed values to the parameter. Can be
-  *           a function like timezone_identifiers_list
-  * @default : the default value (can be an array or a string or a number)
-  * @group : Group all the parameters in a group
-  * POC :
-  *    $config = new Config();
-  *    $config->default = array ("param"=>"default",
-  *                              "param2"=>array (1,2,3),
-  *                              "param3"=>null);
-  *    $var = $config->get ("param");
-  */
+/**
+ * Manage the configurations of the module done by administrator in a config
+ * file
+ * It is based on the module configuration defaults
+ * The DocType allow to define the configuration HTML page. It must contains
+ * @param : the name of the parameter
+ * @description : the textual description of the parameter
+ * @type : the type of the parameter (string, integer, array)
+ * @values : an array containing the allowed values to the parameter. Can be
+ *           a function like timezone_identifiers_list
+ * @default : the default value (can be an array or a string or a number)
+ * @group : Group all the parameters in a group
+ * POC :
+ *    $config = new Config();
+ *    $config->default = array ("param"=>"default",
+ *                              "param2"=>array (1,2,3),
+ *                              "param3"=>null);
+ *    $var = $config->get ("param");
+ */
 class Config
 {
-    /** All the parameters allowed with their default value */
-    public $default = array();
-    /** Use the .php to protect the information */
+    /**
+     * All the parameters allowed with their default value
+     */
+    public $default = [];
+    /**
+     * Use the .php to protect the information
+     */
     public $confFile = null;
 
-    /** Select the configuration file
-      */
+    /**
+     * Select the configuration file
+     */
     public function selectConfFile()
     {
         if ($this->confFile !== null) {
@@ -50,20 +57,22 @@ class Config
         }
     }
 
-    /** List all the parameters configurable in the software
-      */
+    /**
+     * List all the parameters configurable in the software
+     */
     public function params()
     {
         $this->selectConfFile();
         return $this->default;
     }
 
-    /** Return the defined values in array format
-      */
+    /**
+     * Return the defined values in array format
+     */
     public function getAll()
     {
         $this->selectConfFile();
-        $conf = array();
+        $conf = [];
         $rc = include($this->confFile);
         if ($rc !== 1) {
             throw new \Exception("Error in configuration file", 500);
@@ -71,12 +80,13 @@ class Config
         return $conf;
     }
 
-    /** Return the defined values in Slash format
-      */
+    /**
+     * Return the defined values in Slash format
+     */
     public function getAllInSlash()
     {
         $conf = $this->getAll();
-        $vals = array();
+        $vals = [];
         foreach ($this->docComment() as $key) {
             if (! key_exists("param", $key)) {
                 continue;
@@ -105,10 +115,11 @@ class Config
         return $vals;
     }
 
-    /** Get the value of the provided parameter recorded in .php file
-      * If it is not set in .php file, use the default value
-      * @param string $param The option name to be returned
-      */
+    /**
+     * Get the value of the provided parameter recorded in .php file
+     * If it is not set in .php file, use the default value
+     * @param string $param The option name to be returned
+     */
     public function get($param)
     {
         $this->selectConfFile();
@@ -140,7 +151,7 @@ class Config
                 $this->confFile
             ));
         }
-        $conf = array();
+        $conf = [];
         $rc = include($this->confFile);
         if ($rc !== 1) {
             throw new \Exception("Error in configuration file", 500);
@@ -188,12 +199,13 @@ class Config
         return $conf[$param];
     }
 
-    /** Define a value for the parameter in the config file. Add all the default
-      * values if they are not defined
-      * @param string $param The option name
-      * @param mixed $value The option value
-      * @return TRUE if the parameter is saved or an exception
-      */
+    /**
+     * Define a value for the parameter in the config file. Add all the default
+     * values if they are not defined
+     * @param string $param The option name
+     * @param mixed $value The option value
+     * @return TRUE if the parameter is saved or an exception
+     */
     public function set($param, $value)
     {
         $this->selectConfFile();
@@ -231,7 +243,7 @@ class Config
                 $this->confFile
             ), 500);
         }
-        $conf = array();
+        $conf = [];
         $rc = include($this->confFile);
         if ($rc !== 1) {
             throw new \Exception(dgettext(
@@ -239,7 +251,7 @@ class Config
                 "Error in configuration file"
             ), 500);
         }
-        $newconf = array_merge($this->default, $conf, array($param => $value));
+        $newconf = array_merge($this->default, $conf, [$param => $value]);
         $txt = "<?php\r\n";
         $txt .= "\$conf = array(\r\n";
         $txt = $this->writePHP($newconf, $txt, 4);
@@ -257,11 +269,12 @@ class Config
         return true;
     }
 
-    /** Display the $values in PHP format to be "require" easily
-      * @param mixed $values Values to be recorded
-      * @param string $phpcode Actual value of the php code
-      * @param integer $indent Number of spaces in the indentation of config
-      */
+    /**
+     * Display the $values in PHP format to be "require" easily
+     * @param mixed $values Values to be recorded
+     * @param string $phpcode Actual value of the php code
+     * @param integer $indent Number of spaces in the indentation of config
+     */
     private function writePHP($values, $phpcode, $indent)
     {
         foreach ($values as $key => $val) {
@@ -296,16 +309,17 @@ class Config
         return $phpcode;
     }
 
-    /** Convert a string to the right PHP type, without using the eval function
-      * @param string $values The string to convert
-      */
+    /**
+     * Convert a string to the right PHP type, without using the eval function
+     * @param string $values The string to convert
+     */
     private function strToType($values)
     {
         $values = str_replace("array (", "array(", $values);
         if (stripos($values, "array(") !== false) {
             $values = substr($values, 6, -1);
             $values = explode(",", $values);
-            $new = array();
+            $new = [];
             foreach ($values as $key => $val) {
                 $val = trim($val);
                 if (strpos($val, "=>") !== false) {
@@ -352,12 +366,13 @@ class Config
         return $new;
     }
 
-    /** Update the configuration file with the provided parameters
-      * @param array $paramsSlash The parameters to analyze for updating the file
-      * The params are in an array like array ("/authentication/html" => "value")
-      * All the parameters are not needed
-      * To remove a parameter, set it to default value
-      */
+    /**
+     * Update the configuration file with the provided parameters
+     * @param array $paramsSlash The parameters to analyze for updating the file
+     * The params are in an array like array ("/authentication/html" => "value")
+     * All the parameters are not needed
+     * To remove a parameter, set it to default value
+     */
     public function updateParamsSlash($paramsSlash)
     {
         $debug = 0;
@@ -383,7 +398,7 @@ class Config
         if ($debug) {
             var_dump($stored);
         }
-        $new = array();
+        $new = [];
         // Update the stored values with the provided ones
         foreach ($definitions as $key => $unused) {
             if ($debug) {
@@ -478,9 +493,10 @@ class Config
         return true;
     }
 
-    /** Cast the provided string into the associated value
-      * @param string $val The val to cast
-      */
+    /**
+     * Cast the provided string into the associated value
+     * @param string $val The val to cast
+     */
     private function cast($val)
     {
         if (isset($val[0]) && ($val[0] === "\"" || $val[0] === "'")) {
@@ -505,10 +521,11 @@ class Config
         return $new;
     }
 
-    /** Return an array containing the definitions read from the default config
-      * file
-      * The definition of param are in Slash format
-      */
+    /**
+     * Return an array containing the definitions read from the default config
+     * file
+     * The definition of param are in Slash format
+     */
     public function docComment()
     {
         $debug = 0;
@@ -533,7 +550,7 @@ class Config
         $tokens = token_get_all($filecontent);
         $foundDefault = "";
         $parenthesis = 0;
-        $params = array();
+        $params = [];
         $path = "";
         $group = dgettext("domframework", "Default parameters");
         foreach ($tokens as $token) {
@@ -552,7 +569,8 @@ class Config
                     }
                     // Append the not completed lines
                     $text = trim(substr($text, 3, -2));
-                    $text = preg_replace("/\n\s+\*?\s*/", " ", $text);
+                    $text = preg_replace("/\n\s+\*?\s
+ */", " ", $text);
                     $text = preg_replace(
                         "/(@(param|description|type|values|default|group|prefix))/",
                         "\n\${1}",
@@ -560,7 +578,7 @@ class Config
                     );
                     $text = ltrim($text);
                     // Look at each parameter and save them in a data array
-                    $data = array();
+                    $data = [];
                     foreach (explode("\n", $text) as $line) {
                         $tmp = explode(" ", $line);
                         $key = reset($tmp);
diff --git a/src/Console.php b/src/Console.php
index db8aa6f..4968c0a 100644
--- a/src/Console.php
+++ b/src/Console.php
@@ -1,88 +1,103 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to manage a linux Console to have a minimal but working text interface
-  * When using this class, you must use the $console::echo method and not
-  * display directely on screen
-  * Like readline, but all in PHP
-  * Manage the historical of the provided commands
-  * Allow the user to use arrow keys and the shortcuts Ctrl+arrow, Ctrl+L,
-  * Ctrl+U, Ctrl+W
-  * To not allow the stop of the program by Ctrl+C, you can add
-  *     exec ("stty intr ^J");
-  * To update the window size when the terminal is resized, use after console
-  * instanciation :
-  *     declare(ticks = 1);
-  *     pcntl_signal (SIGWINCH, function () use ($console) {
-  *       $console->updateTerminalSize ();
-  *     });
-  */
+/**
+ * Allow to manage a linux Console to have a minimal but working text interface
+ * When using this class, you must use the $console::echo method and not
+ * display directely on screen
+ * Like readline, but all in PHP
+ * Manage the historical of the provided commands
+ * Allow the user to use arrow keys and the shortcuts Ctrl+arrow, Ctrl+L,
+ * Ctrl+U, Ctrl+W
+ * To not allow the stop of the program by Ctrl+C, you can add
+ *     exec ("stty intr ^J");
+ * To update the window size when the terminal is resized, use after console
+ * instanciation :
+ *     declare(ticks = 1);
+ *     pcntl_signal (SIGWINCH, function () use ($console) {
+ *       $console->updateTerminalSize ();
+ *     });
+ */
 class Console
 {
     // PROPERTIES
-    /** Set the debug on if a filename is provided, or do not debug if false is
-      * provided
-      */
+    /**
+     * Set the debug on if a filename is provided, or do not debug if false is
+     * provided
+     */
     //private $debug = "/tmp/debug";
     private $debug = false;
 
-    /** Save the initial stty value
-      */
+    /**
+     * Save the initial stty value
+     */
     private $initSttyState;
 
-    /** Line Content
-      */
+    /**
+     * Line Content
+     */
     private $lineContent = "";
 
-    /** If true, display each char the user has pressed (echo mode)
-      */
+    /**
+     * If true, display each char the user has pressed (echo mode)
+     */
     private $echoMode = true;
 
-    /** List of non printable chars in decimal. The non printable chars are not
-      * displayed but are correctely captured
-      */
-    private $nonWriteableChar = array(1, 2, 3, 4, 6, 8, 9, 16, 18,
+    /**
+     * List of non printable chars in decimal. The non printable chars are not
+     * displayed but are correctely captured
+     */
+    private $nonWriteableChar = [1, 2, 3, 4, 6, 8, 9, 16, 18,
                                      20, 21, 22, 23, 24, 25, 27,
-                                     127);
+                                     127];
 
-    /** The history list in an array
-      */
-    private $history = array();
+    /**
+     * The history list in an array
+     */
+    private $history = [];
 
-    /** The history max size in entries
-      */
+    /**
+     * The history max size in entries
+     */
     private $historyMaxSize = 1000;
 
-    /** Set the completion keys. Not set by default
-      */
+    /**
+     * Set the completion keys. Not set by default
+     */
     private $completionKeys = false;
 
-    /** Set the function called when the completion char is called
-      */
-    private $completionFunction = array();
+    /**
+     * Set the function called when the completion char is called
+     */
+    private $completionFunction = [];
 
-    /** Set the width of the terminal in chars
-      */
+    /**
+     * Set the width of the terminal in chars
+     */
     private $termWidth;
 
-    /** Set the height of the terminal in chars
-      */
+    /**
+     * Set the height of the terminal in chars
+     */
     private $termHeight;
 
-    /** Store the last cursor position in the last readline
-      */
+    /**
+     * Store the last cursor position in the last readline
+     */
     private $cursorPos = 1;
 
-    /** The constructor init the console.
-      * Check if we have the rights to execute, if wa have in cli...
-      */
+    /**
+     * The constructor init the console.
+     * Check if we have the rights to execute, if wa have in cli...
+     */
     public function __construct()
     {
         if (! function_exists("exec")) {
@@ -98,8 +113,9 @@ class Console
         $this->updateTerminalSize();
     }
 
-    /** Update the terminal size
-      */
+    /**
+     * Update the terminal size
+     */
     public function updateTerminalSize()
     {
         $this->termWidth = 80;
@@ -120,8 +136,9 @@ class Console
         }
     }
 
-    /** The destructor return the terminal to initial state
-      */
+    /**
+     * The destructor return the terminal to initial state
+     */
     public function __destruct()
     {
         if ($this->initSttyState !== "") {
@@ -132,51 +149,56 @@ class Console
         $this->textBold(false);
     }
 
-    /** Each time a key is pressed by the user, display the value on screen (echo)
-      */
+    /**
+     * Each time a key is pressed by the user, display the value on screen (echo)
+     */
     public function setEcho()
     {
         $this->echoMode = true;
     }
 
-    /** Each time a key is pressed by the user, DO NOT display the value on screen
-      * (echo disabled)
-      */
+    /**
+     * Each time a key is pressed by the user, DO NOT display the value on screen
+     * (echo disabled)
+     */
     public function unsetEcho()
     {
         $this->echoMode = false;
     }
 
-    /** Display a text on screen. Must be used before "readline" method because
-      * the provided message will not be deleted by readline process.
-      * @param string $message The message to display
-      */
+    /**
+     * Display a text on screen. Must be used before "readline" method because
+     * the provided message will not be deleted by readline process.
+     * @param string $message The message to display
+     */
     public function echo($message)
     {
         echo $message;
         $this->lineContent .= $message;
     }
 
-    /** Wait one valid character from the user.
-      * The non printable chars are not displayed, nor returned
-      * The ESC Sequences are skipped
-      * @return the pressed char
-      */
+    /**
+     * Wait one valid character from the user.
+     * The non printable chars are not displayed, nor returned
+     * The ESC Sequences are skipped
+     * @return the pressed char
+     */
     public function getc()
     {
         $char = $this->getKey();
-        while (in_array(ord($char), $this->nonWriteableChar)) {
+        while (in_array(ord($char), $this->nonWriteableChar, true)) {
             $char = $this->getKey();
         }
         return $char;
     }
 
-    /** Wait one key pressed by the user. If the key pressed is an ESC sequence,
-      * return this sequence
-      * The non printable chars are not displayed, but are correctely returned
-      * The UTF8 chars are return as multiple length chars
-      * @return the pressed char
-      */
+    /**
+     * Wait one key pressed by the user. If the key pressed is an ESC sequence,
+     * return this sequence
+     * The non printable chars are not displayed, but are correctely returned
+     * The UTF8 chars are return as multiple length chars
+     * @return the pressed char
+     */
     public function getKey()
     {
         $char = fgetc(STDIN);
@@ -230,20 +252,21 @@ class Console
             // Four chars
             $char .= fgetc(STDIN) . fgetc(STDIN) . fgetc(STDIN);
         }
-        if ($this->echoMode && ! in_array(ord($char), $this->nonWriteableChar)) {
+        if ($this->echoMode && ! in_array(ord($char), $this->nonWriteableChar, true)) {
             echo $char;
         }
         return $char;
     }
 
-    /** Get the line of characters pressed by the user and return the result.
-      * Stop when the user valid by \n.
-      * Manage correctely the backspace, the Ctrl+W to remove word...
-      * @param string $propo Preset the text for the user
-      * @param boolean|string $stopperChar The chars to stop the analysis and
-      * return the result
-      * @return string The typed string
-      */
+    /**
+     * Get the line of characters pressed by the user and return the result.
+     * Stop when the user valid by \n.
+     * Manage correctely the backspace, the Ctrl+W to remove word...
+     * @param string $propo Preset the text for the user
+     * @param boolean|string $stopperChar The chars to stop the analysis and
+     * return the result
+     * @return string The typed string
+     */
     public function readline($propo = "", $stopperChar = false)
     {
         // Gets can not delete chars before the call. Keep the prompt (if exists)
@@ -269,7 +292,7 @@ class Console
             }
             if (
                 $stopperChar !== false &&
-                in_array($char, $this->mb_str_split($stopperChar))
+                in_array($char, $this->mb_str_split($stopperChar), true)
             ) {
                 // End of process with stopperChars
                 $this->lineContent = "";
@@ -277,7 +300,7 @@ class Console
             }
             if (
                 $this->completionKeys !== false &&
-                in_array($char, $this->mb_str_split($this->completionKeys))
+                in_array($char, $this->mb_str_split($this->completionKeys), true)
             ) {
                 // Manage autocompletion
                 $this->debug("Autocompletion starting");
@@ -535,7 +558,7 @@ class Console
                     $this->rewriteLine($prompt . $string);
                     $this->moveCursor($cursorPos);
                 }
-            } elseif (in_array(ord($char), $this->nonWriteableChar)) {
+            } elseif (in_array(ord($char), $this->nonWriteableChar, true)) {
                 // Non writeable char : skip it
                 $this->debug("Non writeable char : " . ord($char));
             } else {
@@ -544,7 +567,7 @@ class Console
                 $strArr = $this->mb_str_split($string);
                 $firstArr = array_slice($strArr, 0, $cursorPos - $minLength);
                 $lastArr = array_slice($strArr, $cursorPos - $minLength);
-                $insertArr = array($char);
+                $insertArr = [$char];
                 $strArr = array_merge($firstArr, $insertArr, $lastArr);
                 $string = implode($strArr);
                 $cursorPos++;
@@ -556,10 +579,11 @@ class Console
         return $string;
     }
 
-    /** Rewrite the line with the provided $text.
-      * Delete all the old data
-      * @param string $text The new text to use on line
-      */
+    /**
+     * Rewrite the line with the provided $text.
+     * Delete all the old data
+     * @param string $text The new text to use on line
+     */
     private function rewriteLine($text)
     {
         $this->debug("Call rewriteLine ($text)");
@@ -571,9 +595,10 @@ class Console
         }
     }
 
-    /** Move the cursor on position $position. The first column is $cursorPos=1
-      * @param integer $cursorPos The new position on line
-      */
+    /**
+     * Move the cursor on position $position. The first column is $cursorPos=1
+     * @param integer $cursorPos The new position on line
+     */
     private function moveCursor($cursorPos)
     {
         $this->debug("Call moveCursor ($cursorPos)");
@@ -602,8 +627,9 @@ class Console
         }
     }
 
-    /** Clear the existing line.
-      */
+    /**
+     * Clear the existing line.
+     */
     public function clearLine()
     {
         $this->debug("Call clearLine");
@@ -631,37 +657,41 @@ class Console
         $this->cursorPos = 1;
     }
 
-    /** Clear all the screen and remove the scroll of the screen
-      */
+    /**
+     * Clear all the screen and remove the scroll of the screen
+     */
     public function clearScreen()
     {
         echo "\033[2J\033[;H\033c";
     }
 
-    /** Get the terminal Height
-      */
+    /**
+     * Get the terminal Height
+     */
     public function getTermHeight()
     {
         return $this->termHeight;
     }
 
-    /** Get the terminal Width
-      */
+    /**
+     * Get the terminal Width
+     */
     public function getTermWidth()
     {
         return $this->termWidth;
     }
 
-    /** Call a specific function when a completion key is pressed
-      * The function must get the partial text as first parameter, and must return
-      * an array with the possibilities
-      * If only one possibility is returned, the console will be immediately
-      * updated.
-      * @param string|bool $completionKeys The list of the completion keys. False
-      * unset the method
-      * @param callable $completionFunction The function called when one of the
-      * completion keys is pressed.
-      */
+    /**
+     * Call a specific function when a completion key is pressed
+     * The function must get the partial text as first parameter, and must return
+     * an array with the possibilities
+     * If only one possibility is returned, the console will be immediately
+     * updated.
+     * @param string|bool $completionKeys The list of the completion keys. False
+     * unset the method
+     * @param callable $completionFunction The function called when one of the
+     * completion keys is pressed.
+     */
     public function completeFunction($completionKeys, $completionFunction)
     {
         if (! is_string($completionKeys) && ! is_boolean($completionKeys)) {
@@ -678,25 +708,28 @@ class Console
         $this->completionFunction = $completionFunction;
     }
 
-    /** Get the actual history in memory
-      */
+    /**
+     * Get the actual history in memory
+     */
     public function getHistory()
     {
         return $this->history;
     }
 
-    /** Clear the history
-      * This method do NOT write the empty history on disk
-      */
+    /**
+     * Clear the history
+     * This method do NOT write the empty history on disk
+     */
     public function clearHistory()
     {
-        $this->history = array();
+        $this->history = [];
         return $this;
     }
 
-    /** Write the history to disk.
-      * @param string $historyFile The history file where the history is stored
-      */
+    /**
+     * Write the history to disk.
+     * @param string $historyFile The history file where the history is stored
+     */
     public function writeHistory($historyFile)
     {
         if (file_exists($historyFile)) {
@@ -729,16 +762,17 @@ class Console
         return $this;
     }
 
-    /** Read the history from the disk
-      * If the file doesn't exists, return an empty array
-      * @param string $historyFile The history file where the history is stored
-      * @return the read history with timestamp as key and command as value
-      */
+    /**
+     * Read the history from the disk
+     * If the file doesn't exists, return an empty array
+     * @param string $historyFile The history file where the history is stored
+     * @return the read history with timestamp as key and command as value
+     */
     public function readHistory($historyFile)
     {
         if (! file_exists($historyFile)) {
-            $this->history = array();
-            return array();
+            $this->history = [];
+            return [];
         }
         if (! is_readable($historyFile)) {
             $this->consoleException("History file '$historyFile' can not be read");
@@ -765,11 +799,12 @@ class Console
         return $this->history;
     }
 
-    /** Add a new entry in history.
-      * The new line can not be empty : it is not stored, but without error
-      * This method do NOT write the history on disk : you must use writeHistory
-      * @param string The new entry to add in history
-      */
+    /**
+     * Add a new entry in history.
+     * The new line can not be empty : it is not stored, but without error
+     * This method do NOT write the history on disk : you must use writeHistory
+     * @param string The new entry to add in history
+     */
     public function addHistory($line)
     {
         if (! is_string($line)) {
@@ -789,10 +824,11 @@ class Console
         return $this;
     }
 
-    /** Get/Set the maximum number of entries in the history
-      * If null, get the defined maximum number
-      * @param integer|null $historyMaxSize The maximum number of entries
-      */
+    /**
+     * Get/Set the maximum number of entries in the history
+     * If null, get the defined maximum number
+     * @param integer|null $historyMaxSize The maximum number of entries
+     */
     public function historyMaxSize($historyMaxSize = null)
     {
         if ($historyMaxSize === null) {
@@ -805,17 +841,19 @@ class Console
         $this->historyMaxSize = intval($historyMaxSize);
     }
 
-    /** Error management
-      * @param string $message The message to throw in the exception
-      */
+    /**
+     * Error management
+     * @param string $message The message to throw in the exception
+     */
     public function consoleException($message)
     {
         throw new \Exception($message, 500);
     }
 
-    /** Set the text color
-      * @param integer $colorNum The color number to use
-      */
+    /**
+     * Set the text color
+     * @param integer $colorNum The color number to use
+     */
     public function colorText($colorNum)
     {
         if (! is_int($colorNum)) {
@@ -825,9 +863,10 @@ class Console
         echo "\033[38;5;{$colorNum}m";
     }
 
-    /** Set the background text color
-      * @param integer $colorNum The color number to use
-      */
+    /**
+     * Set the background text color
+     * @param integer $colorNum The color number to use
+     */
     public function colorBackgroundText($colorNum)
     {
         if (! is_int($colorNum)) {
@@ -837,16 +876,18 @@ class Console
         echo "\033[48;5;{$colorNum}m";
     }
 
-    /** Reset the colors
-      */
+    /**
+     * Reset the colors
+     */
     public function colorReset()
     {
         echo "\033[0m";
     }
 
-    /** Underline the text
-      * @param boolean $underline True to underline, false to remove the underline
-      */
+    /**
+     * Underline the text
+     * @param boolean $underline True to underline, false to remove the underline
+     */
     public function textUnderline($underline)
     {
         if ($underline === false) {
@@ -857,9 +898,10 @@ class Console
         echo "\033[{$underline}4m";
     }
 
-    /** Bold the text
-      * @param boolean $bold True to bold, false to remove the bold
-      */
+    /**
+     * Bold the text
+     * @param boolean $bold True to bold, false to remove the bold
+     */
     public function textBold($bold)
     {
         if ($bold === false) {
@@ -870,22 +912,24 @@ class Console
         echo "\033[{$bold}m";
     }
 
-    /** Return true if the TTY is enabled, or false if the program is called from pipe
-      */
+    /**
+     * Return true if the TTY is enabled, or false if the program is called from pipe
+     */
     public function isTTY()
     {
         return !! $this->initSttyState;
     }
 
-    /** Tokenize the provided line and aggragate if there is single or double
-      * quotes.
-      * Trim the spaces
-      * @param string $line The line to tokenize
-      * @return array The tokens
-      */
+    /**
+     * Tokenize the provided line and aggragate if there is single or double
+     * quotes.
+     * Trim the spaces
+     * @param string $line The line to tokenize
+     * @return array The tokens
+     */
     public static function tokenize($line)
     {
-        $tokens = array();
+        $tokens = [];
         $token = strtok(trim($line), ' ');
         while ($token) {
             // find double quoted tokens
@@ -902,23 +946,25 @@ class Console
         return $tokens;
     }
 
-    /** This function return an array with each char, but supports UTF-8
-      * @param string $string The string to explode
-      * @param integer $split_length The number of chars in each split
-      * @return array
-      */
+    /**
+     * This function return an array with each char, but supports UTF-8
+     * @param string $string The string to explode
+     * @param integer $split_length The number of chars in each split
+     * @return array
+     */
     private function mb_str_split($string, $split_length = 1)
     {
-        $res = array();
+        $res = [];
         for ($i = 0; $i < mb_strlen($string); $i += $split_length) {
             $res[] = mb_substr($string, $i, $split_length);
         }
         return $res;
     }
 
-    /** This function debug the data
-      * @param mixed $data The data to store
-      */
+    /**
+     * This function debug the data
+     * @param mixed $data The data to store
+     */
     private function debug($data)
     {
         if ($this->debug === false) {
@@ -930,10 +976,11 @@ class Console
         file_put_contents($this->debug, date("H:i:s") . " $data\n", FILE_APPEND);
     }
 
-    /** Look in the array which first chars of each possibilites are identical.
-      * @param array $completeArr The values to examine
-      * @return string the identical chars
-      */
+    /**
+     * Look in the array which first chars of each possibilites are identical.
+     * @param array $completeArr The values to examine
+     * @return string the identical chars
+     */
     private function shortestIdenticalValues($completeArr)
     {
         if (! is_array($completeArr)) {
diff --git a/src/Convert.php b/src/Convert.php
index 68b9371..c9fb9e5 100644
--- a/src/Convert.php
+++ b/src/Convert.php
@@ -1,33 +1,36 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Convert a format to another one
-  */
+/**
+ * Convert a format to another one
+ */
 class Convert
 {
-    /** Convert Date received in one format to another.
-      * If the provided string is not corresponding to the format, generate an
-      * exception or return the original string
-      * Format used http://php.net/manual/en/datetime.createfromformat.php
-      * Do not accept the locale ! The language of the dates is always in english
-      * @param string $inputDate The date to modify
-      * @param string $inputFormat The input format of the date
-      * @param string $outputFormat The output format of the date
-      * @param boolean|null $exception If set, generate an exception if the
-      * provided date is invalid
-      * @param string|null $inputTimezone The timezone used to read the input
-      * By default, Europe/Paris
-      * @param string|null $outputTimezone The timezone used to write the output
-      * By default, Europe/Paris
-      * @return string
-      */
+    /**
+     * Convert Date received in one format to another.
+     * If the provided string is not corresponding to the format, generate an
+     * exception or return the original string
+     * Format used http://php.net/manual/en/datetime.createfromformat.php
+     * Do not accept the locale ! The language of the dates is always in english
+     * @param string $inputDate The date to modify
+     * @param string $inputFormat The input format of the date
+     * @param string $outputFormat The output format of the date
+     * @param boolean|null $exception If set, generate an exception if the
+     * provided date is invalid
+     * @param string|null $inputTimezone The timezone used to read the input
+     * By default, Europe/Paris
+     * @param string|null $outputTimezone The timezone used to write the output
+     * By default, Europe/Paris
+     * @return string
+     */
     public static function convertDate(
         $inputDate,
         $inputFormat,
@@ -79,10 +82,11 @@ class Convert
         return $date->format($outputFormat);
     }
 
-    /** Convert the first char to capital and the rest of the sentence in
-      * lowercase (like ucfirst, but UTF8 compliant)
-      * @param string $str The string to convert
-      */
+    /**
+     * Convert the first char to capital and the rest of the sentence in
+     * lowercase (like ucfirst, but UTF8 compliant)
+     * @param string $str The string to convert
+     */
     public static function ucfirst($str)
     {
         if (! function_exists("mb_strtoupper")) {
@@ -95,15 +99,16 @@ class Convert
         return $a . mb_substr($str, 1, null, 'UTF-8');
     }
 
-    /** Convert the first char of each word of a sentence to capital. The word
-      * delimiter can be provided.
-      * The sentence is in UTF-8.
-      * The sentence is converted to lowercase before doing the action (in
-      * contrary of the original PHP function)
-      * @param string $str The string to convert
-      * @param string $delimiters The delimiters (by default " \t\r\n\f\v")
-      * @return string
-      */
+    /**
+     * Convert the first char of each word of a sentence to capital. The word
+     * delimiter can be provided.
+     * The sentence is in UTF-8.
+     * The sentence is converted to lowercase before doing the action (in
+     * contrary of the original PHP function)
+     * @param string $str The string to convert
+     * @param string $delimiters The delimiters (by default " \t\r\n\f\v")
+     * @return string
+     */
     public static function ucwords($str, $delimiters = " \t\r\n\f\v")
     {
         if (! function_exists("mb_strtolower")) {
@@ -127,14 +132,15 @@ class Convert
         return $res;
     }
 
-    /** Convert the provided float to human readable format
-      * Example : 1440000 => 1.44MB
-      * @param float|integer $value The number to convert
-      * @param integer|null $decimals The number of decimal (2 by default)
-      * @param integer|null $power (1000 by default or 1024)
-      * @param string|null $unit The Unit displayed after the multiplier (B for
-      * Bytes by default)
-      */
+    /**
+     * Convert the provided float to human readable format
+     * Example : 1440000 => 1.44MB
+     * @param float|integer $value The number to convert
+     * @param integer|null $decimals The number of decimal (2 by default)
+     * @param integer|null $power (1000 by default or 1024)
+     * @param string|null $unit The Unit displayed after the multiplier (B for
+     * Bytes by default)
+     */
     public static function humanSize(
         $value,
         $decimals = 2,
@@ -156,7 +162,7 @@ class Convert
             throw new \Exception("convert::humanSize power value !== 1000 and 1024" .
             " : " . var_export($power, true), 500);
         }
-        $size = array(
+        $size = [
         -8 => 'y', // yocto
         -7 => 'z', // zepto
         -6 => 'a', // atto
@@ -173,7 +179,7 @@ class Convert
         5 => 'P', // peta
         6 => 'E', // exa
         7 => 'Z', // zetta
-        8 => 'Y');// yotta
+        8 => 'Y'];// yotta
         for ($factor = 8; $factor > -8; $factor--) {
             if (abs($value) >= pow($power, $factor)) {
                 break;
diff --git a/src/Csrf.php b/src/Csrf.php
index f6d0f7b..c400a11 100644
--- a/src/Csrf.php
+++ b/src/Csrf.php
@@ -1,35 +1,43 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** CSRF protection
-  * By default, the CSRF protection is active if a SESSION is active too.
-  * It can be disabled if needed. An Exception is raised if the form is send
-  * back without the token
-  */
+/**
+ * CSRF protection
+ * By default, the CSRF protection is active if a SESSION is active too.
+ * It can be disabled if needed. An Exception is raised if the form is send
+ * back without the token
+ */
 class Csrf
 {
-    /** Allow to disable the csrf protection
-      */
+    /**
+     * Allow to disable the csrf protection
+     */
     public $csrf = true;
-    /** This hidden field name in HTML
-      */
+    /**
+     * This hidden field name in HTML
+     */
     public $field = "CSRF_TOKEN";
-    /** The created token
-      */
+    /**
+     * The created token
+     */
     private $csrfToken = "";
-    /** Timeout of the CSRF token : 3600s by default (maximum time allowed to
-      * enter information in form and submit) */
+    /**
+     * Timeout of the CSRF token : 3600s by default (maximum time allowed to
+     * enter information in form and submit)
+     */
     private $csrfTimeout = 3600;
 
-    /** Manage the singleton
-      */
+    /**
+     * Manage the singleton
+     */
     public function __construct()
     {
         if (isset($GLOBALS["domframework"]["csrf"])) {
@@ -41,9 +49,10 @@ class Csrf
         }
     }
 
-    /** Get / Set the status of the CSRF protection
-      * @param boolean|null $val The value to set/get if null
-      */
+    /**
+     * Get / Set the status of the CSRF protection
+     * @param boolean|null $val The value to set/get if null
+     */
     public function csrfState($val = null)
     {
         if ($val === null) {
@@ -54,9 +63,10 @@ class Csrf
         return $this;
     }
 
-    /** Get / Set the name of the field in HTML
-      * @param string|null $val The value to set/get if null
-      */
+    /**
+     * Get / Set the name of the field in HTML
+     * @param string|null $val The value to set/get if null
+     */
     public function field($val = null)
     {
         if ($val === null) {
@@ -67,8 +77,9 @@ class Csrf
         return $this;
     }
 
-    /** This function return the token
-      */
+    /**
+     * This function return the token
+     */
     public function createToken()
     {
         $l = 30; // Number of chars in token
@@ -84,10 +95,11 @@ class Csrf
         return $this->csrfToken;
     }
 
-    /** Check if the provided token is the right token, defined last displayed
-      * page
-      * @param string $tokenFromUser The value csrf the user's token
-      */
+    /**
+     * Check if the provided token is the right token, defined last displayed
+     * page
+     * @param string $tokenFromUser The value csrf the user's token
+     */
     public function checkToken($tokenFromUser)
     {
         if ($this->csrf === false) {
@@ -99,10 +111,10 @@ class Csrf
             isset($_SESSION["domframework"]["csrf"]["csrf"]) &&
             isset($_SESSION["domframework"]["csrf"]["csrfStart"])
         ) {
-            $_SESSION["domframework"]["csrf"] = array(
+            $_SESSION["domframework"]["csrf"] = [
             $_SESSION["domframework"]["csrf"]["csrf"] =>
             $_SESSION["domframework"]["csrf"]["csrfStart"]
-            );
+            ];
             unset($_SESSION["domframework"]["csrf"]["csrfStart"]);
         }
         if (! isset($_SESSION["domframework"]["csrf"])) {
@@ -136,8 +148,9 @@ class Csrf
         return true;
     }
 
-    /** Return the CSRF token in a hidden field
-      */
+    /**
+     * Return the CSRF token in a hidden field
+     */
     public function displayFormCSRF()
     {
         if ($this->csrfToken == "") {
@@ -148,8 +161,9 @@ class Csrf
         return $res;
     }
 
-    /** Return the token if exists or create a new one if needed
-      */
+    /**
+     * Return the token if exists or create a new one if needed
+     */
     public function getToken()
     {
         if ($this->csrfToken === "") {
@@ -158,9 +172,10 @@ class Csrf
         return $this->csrfToken;
     }
 
-    /** Add more time to existing CSRF token
-      * @param string $tokenFromUser The existing token
-      */
+    /**
+     * Add more time to existing CSRF token
+     * @param string $tokenFromUser The existing token
+     */
     public function extendToken($tokenFromUser)
     {
         $this->checkToken($tokenFromUser);
@@ -168,9 +183,10 @@ class Csrf
         return true;
     }
 
-    /** Check an existing token, then delete it
-      * @param string $tokenFromUser The existing token
-      */
+    /**
+     * Check an existing token, then delete it
+     * @param string $tokenFromUser The existing token
+     */
     public function checkThenDeleteToken($tokenFromUser)
     {
         $this->checkToken($tokenFromUser);
diff --git a/src/Daemon.php b/src/Daemon.php
index 90afa38..9b8ef55 100644
--- a/src/Daemon.php
+++ b/src/Daemon.php
@@ -1,24 +1,28 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage a daemon.
-  * Allow to start, stop, get status of a callable method
-  */
+/**
+ * Manage a daemon.
+ * Allow to start, stop, get status of a callable method
+ */
 class Daemon
 {
-    /** Set the directory to store the PID of the daemon
-      */
+    /**
+     * Set the directory to store the PID of the daemon
+     */
     private $runDir = "/var/run";
 
-    /** The constructor check if /proc is mounted
-      */
+    /**
+     * The constructor check if /proc is mounted
+     */
     public function __construct()
     {
         if (! file_exists("/proc")) {
@@ -26,9 +30,10 @@ class Daemon
         }
     }
 
-    /** Get/set the directory to store the PID of the daemon
-      * @param string|null $val The directory
-      */
+    /**
+     * Get/set the directory to store the PID of the daemon
+     * @param string|null $val The directory
+     */
     public function runDir($val = null)
     {
         if ($val === null) {
@@ -40,16 +45,17 @@ class Daemon
         $this->runDir = "$val";
     }
 
-    /** Start the callable method. The terminal is closed. All the displayed
-      * messages from the child are silently dropped.
-      * If some parameters are provided, the called child method will receive them
-      * This function fork and return the child PID
-      * @param string $name The name of daemon to start.
-      * @param callable $callable The callback method to use in child
-      * @param mixed|null $params The params to provide to child method
-      * @return The child PID
-      */
-    public function start($name, $callable, $params = array())
+    /**
+     * Start the callable method. The terminal is closed. All the displayed
+     * messages from the child are silently dropped.
+     * If some parameters are provided, the called child method will receive them
+     * This function fork and return the child PID
+     * @param string $name The name of daemon to start.
+     * @param callable $callable The callback method to use in child
+     * @param mixed|null $params The params to provide to child method
+     * @return The child PID
+     */
+    public function start($name, $callable, $params = [])
     {
         $file = new File();
         if (! $file->is_writeable($this->runDir)) {
@@ -79,14 +85,15 @@ class Daemon
         return $pid;
     }
 
-    /** Stop a $name daemon
-      * @param string $name The name of daemon to stop. The name must be the same
-      * as the name used in the start method
-      * @param integer $maxWaitStop The waiting maximum time after SIGTERM before
-      * sending SIGKILL
-      * @param integer $maxWaitKill The waiting maximum time after SIGKILL before
-      * raising an error
-      */
+    /**
+     * Stop a $name daemon
+     * @param string $name The name of daemon to stop. The name must be the same
+     * as the name used in the start method
+     * @param integer $maxWaitStop The waiting maximum time after SIGTERM before
+     * sending SIGKILL
+     * @param integer $maxWaitKill The waiting maximum time after SIGKILL before
+     * raising an error
+     */
     public function stop($name, $maxWaitStop = 3, $maxWaitKill = 3)
     {
         $file = new File();
@@ -143,10 +150,11 @@ class Daemon
         throw new \Exception("Can't stop and can't kill the process $pid", 500);
     }
 
-    /** Status of a daemon
-      * @param string $name The name of daemon to have status. The name must be
-      * the same as the name used in the start method
-      */
+    /**
+     * Status of a daemon
+     * @param string $name The name of daemon to have status. The name must be
+     * the same as the name used in the start method
+     */
     public function status($name)
     {
         $file = new File();
@@ -173,10 +181,11 @@ class Daemon
         return "The daemon is running on PID $pid\n";
     }
 
-    /** Send a HUP Signal to the daemon
-      * @param string $name The name of daemon to HUP. The name must be
-      * the same as the name used in the start method
-      */
+    /**
+     * Send a HUP Signal to the daemon
+     * @param string $name The name of daemon to HUP. The name must be
+     * the same as the name used in the start method
+     */
     public function reload($name)
     {
         $file = new File();
diff --git a/src/Dbjson.php b/src/Dbjson.php
index 03a1f69..12eb7ca 100644
--- a/src/Dbjson.php
+++ b/src/Dbjson.php
@@ -1,43 +1,56 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** DBJSON  : a NoSQL DB in JSON
-  * Documentation
-  * - A filter is an array containing the fields and the values to found
-  *   array ("key"=>"val")              <== Look for the key equal val
-  *   array ("key=>array ("val", "<=")) <== Look for the key lighter or equal
-  *                                         than val
-  *   array ()                          <== Look for all the documents (no
-  *                                         filter)
-  *   array ("key"=>"val", "key2"=>"val2")  <== Look for two parameters
-  * - A document is an array containing the fields and the values to store
-  *   array ("key"=>"val)
-  *
-  * - The field named _id is the document key
-  */
+/**
+ * DBJSON  : a NoSQL DB in JSON
+ * Documentation
+ * - A filter is an array containing the fields and the values to found
+ *   array ("key"=>"val")              <== Look for the key equal val
+ *   array ("key=>array ("val", "<=")) <== Look for the key lighter or equal
+ *                                         than val
+ *   array ()                          <== Look for all the documents (no
+ *                                         filter)
+ *   array ("key"=>"val", "key2"=>"val2")  <== Look for two parameters
+ * - A document is an array containing the fields and the values to store
+ *   array ("key"=>"val)
+ *
+ * - The field named _id is the document key
+ */
 class Dbjson
 {
-    /** The DSN of the connection */
+    /**
+     * The DSN of the connection
+     */
     private $dsn = "";
-    /** The database file */
+    /**
+     * The database file
+     */
     private $dbfile = "";
-    /** The lock file */
+    /**
+     * The lock file
+     */
     private $dbfileLock = "";
-    /** The last Insert Id */
+    /**
+     * The last Insert Id
+     */
     private $lastInsertId = 0;
-    /** The database content */
+    /**
+     * The database content
+     */
     private $db;
 
-    /** The constructor
-      * @param string $dsn The DSN of the connection
-      */
+    /**
+     * The constructor
+     * @param string $dsn The DSN of the connection
+     */
     public function __construct($dsn)
     {
         if (! function_exists("openssl_random_pseudo_bytes")) {
@@ -99,18 +112,19 @@ class Dbjson
         $this->dbfile = $this->dbfile;
     }
 
-    /** Store one document in database
-      * @param string $collection The collection name
-      * @param array $document The document to insert
-      * @return integer return The number of document inserted in the database
-      */
+    /**
+     * Store one document in database
+     * @param string $collection The collection name
+     * @param array $document The document to insert
+     * @return integer return The number of document inserted in the database
+     */
     public function insertOne($collection, $document)
     {
         $uniqueKey = $this->uniqueKey();
         $this->lockEX();
         $this->db = $this->readDB();
         $this->db[$collection]["content"][$uniqueKey] = array_merge(
-            array("_id" => $uniqueKey),
+            ["_id" => $uniqueKey],
             $document
         );
         $this->writeDB();
@@ -118,11 +132,12 @@ class Dbjson
         return 1;
     }
 
-    /** Store multiple documents in database
-      * @param string $collection The collection name
-      * @param array $documents array(array ())
-      * @return integer The number of documents inserted in the database
-      */
+    /**
+     * Store multiple documents in database
+     * @param string $collection The collection name
+     * @param array $documents array(array ())
+     * @return integer The number of documents inserted in the database
+     */
     public function insertMany($collection, $documents)
     {
         foreach ($documents as $document) {
@@ -135,7 +150,7 @@ class Dbjson
         foreach ($documents as $document) {
             $uniqueKey = $this->uniqueKey();
             $this->db[$collection]["content"][$uniqueKey] = array_merge(
-                array("_id" => $uniqueKey),
+                ["_id" => $uniqueKey],
                 $document
             );
         }
@@ -145,20 +160,21 @@ class Dbjson
         return count($documents);
     }
 
-    /** Look at the documents matching $filter (all by default).
-      * Then return only the $fields (all by default).
-      *   The field _id is always returned
-      * Return $limit maximum documents (no limit by default)
-      * @param string $collection The collection name
-      * @param array $filter The filter to apply to found the documents
-      * @param array|string $fields The fields to display (* for all, empty array
-      *        for none)
-      * @param integer $limit The number of documents to display
-      * @return array The documents matching the parameters
-      */
+    /**
+     * Look at the documents matching $filter (all by default).
+     * Then return only the $fields (all by default).
+     *   The field _id is always returned
+     * Return $limit maximum documents (no limit by default)
+     * @param string $collection The collection name
+     * @param array $filter The filter to apply to found the documents
+     * @param array|string $fields The fields to display (* for all, empty array
+     *        for none)
+     * @param integer $limit The number of documents to display
+     * @return array The documents matching the parameters
+     */
     public function find(
         $collection,
-        $filter = array(),
+        $filter = [],
         $fields = "*",
         $limit = null
     ) {
@@ -166,14 +182,14 @@ class Dbjson
         $this->db = $this->readDB();
         // Get the keys of the documents based on the filter
         $keys = $this->filter($collection, $filter);
-        $res = array();
+        $res = [];
         foreach ($keys as $key) {
             // Limit the fields
-            $tmp = array();
+            $tmp = [];
             if ($fields === "*") {
                 $tmp = $this->db[$collection]["content"][$key];
             } elseif (is_array($fields)) {
-                if (! in_array("_id", $fields)) {
+                if (! in_array("_id", $fields, true)) {
                     array_unshift($fields, "_id");
                 }
                 foreach ($fields as $field) {
@@ -200,20 +216,21 @@ class Dbjson
         return $res;
     }
 
-    /** Update some existing documents. Do not change the _id keys
-      * @param string $collection The collection name
-      * @param array $filter The filter to apply to found the documents
-      * @param array $document The data to update
-      * @return integer The number of modified documents
-      * To unset a field, add in the document array a "_unset"=>array("field)"
-      */
+    /**
+     * Update some existing documents. Do not change the _id keys
+     * @param string $collection The collection name
+     * @param array $filter The filter to apply to found the documents
+     * @param array $document The data to update
+     * @return integer The number of modified documents
+     * To unset a field, add in the document array a "_unset"=>array("field)"
+     */
     public function update($collection, $filter, $document)
     {
         $this->lockEX();
         $this->db = $this->readDB();
         // Get the keys of the documents based on the filter
         $keys = $this->filter($collection, $filter);
-        $unset = array();
+        $unset = [];
         if (array_key_exists("_unset", $document)) {
             $unset = $document["_unset"];
             unset($document["_unset"]);
@@ -253,12 +270,13 @@ class Dbjson
         return count($keys);
     }
 
-    /** Replace some existing documents. Do not change the _id keys
-      * @param string $collection The collection name
-      * @param array $filter The filter to apply to found the documents
-      * @param array $document The data to update
-      * @return integer The number of modified documents
-      */
+    /**
+     * Replace some existing documents. Do not change the _id keys
+     * @param string $collection The collection name
+     * @param array $filter The filter to apply to found the documents
+     * @param array $document The data to update
+     * @return integer The number of modified documents
+     */
     public function replace($collection, $filter, $document)
     {
         $this->lockEX();
@@ -267,7 +285,7 @@ class Dbjson
         $keys = $this->filter($collection, $filter);
         foreach ($keys as $key) {
             $tmp = $this->db[$collection]["content"][$key];
-            $replace = array();
+            $replace = [];
             $replace["_id"] = $tmp["_id"];
             $replace = array_merge($replace, $document);
             $this->db[$collection]["content"][$key] = $replace;
@@ -278,11 +296,12 @@ class Dbjson
         return count($keys);
     }
 
-    /** Delete the first document matching the filter
-      * @param string $collection The collection name
-      * @param array $filter The filter to found the documents
-      * @return integer The number of deleted documents
-      */
+    /**
+     * Delete the first document matching the filter
+     * @param string $collection The collection name
+     * @param array $filter The filter to found the documents
+     * @return integer The number of deleted documents
+     */
     public function deleteOne($collection, $filter)
     {
         $this->lockEX();
@@ -301,11 +320,12 @@ class Dbjson
         return 1;
     }
 
-    /** Delete all the documents matching the filter
-      * @param string $collection The collection name
-      * @param array $filter The filter to apply to found the documents
-      * @return integer The number of deleted documents
-      */
+    /**
+     * Delete all the documents matching the filter
+     * @param string $collection The collection name
+     * @param array $filter The filter to apply to found the documents
+     * @return integer The number of deleted documents
+     */
     public function deleteMany($collection, $filter)
     {
         $this->lockEX();
@@ -321,33 +341,34 @@ class Dbjson
         return count($keys);
     }
 
-    /** Look for the keys corresponding to the filter in the collection
-      * Don't manage the locks !
-      * @param string $collection The collection name
-      * @param array $filter The filter to apply to found the documents
-      * - A filter is an array containing the fields and the values to found
-      *   array ()                             <== Look for all the documents (no
-      *                                            filter)
-      *   array ("key"=>"val")                 <== Look for the key equal val
-      *   array ("key=>array ("val", "<="))    <== Look for the key lighter or
-      *                                            equal than val
-      *   array ("key"=>"val", "key2"=>"val2") <== Look for two parameters
-      *   array ("key"=>array ("val", "=="),
-      *          "key2"=>array ("val2", "==")) <== Look for two complex parameters
-      * Here is the comparison types available : ==,
-      * @return array the keys matching the filter
-      */
+    /**
+     * Look for the keys corresponding to the filter in the collection
+     * Don't manage the locks !
+     * @param string $collection The collection name
+     * @param array $filter The filter to apply to found the documents
+     * - A filter is an array containing the fields and the values to found
+     *   array ()                             <== Look for all the documents (no
+     *                                            filter)
+     *   array ("key"=>"val")                 <== Look for the key equal val
+     *   array ("key=>array ("val", "<="))    <== Look for the key lighter or
+     *                                            equal than val
+     *   array ("key"=>"val", "key2"=>"val2") <== Look for two parameters
+     *   array ("key"=>array ("val", "=="),
+     *          "key2"=>array ("val2", "==")) <== Look for two complex parameters
+     * Here is the comparison types available : ==,
+     * @return array the keys matching the filter
+     */
     public function filter($collection, $filter)
     {
         if ($this->db === null) {
             $this->db = $this->readDB();
         }
-        $keys = array();
+        $keys = [];
         if (! array_key_exists($collection, $this->db)) {
-            $this->db[$collection]["content"] = array();
+            $this->db[$collection]["content"] = [];
         }
         foreach ($this->db[$collection]["content"] as $key => $document) {
-            if ($filter === array()) {
+            if ($filter === []) {
                 $keys[] = $key;
                 continue;
             }
@@ -390,7 +411,7 @@ class Dbjson
                             $matchFilter = true;
                         } elseif (
                             strtolower($fvals[1]) === "in_array" &&
-                            in_array($fvals[0], $document[$fkey])
+                            in_array($fvals[0], $document[$fkey], true)
                         ) {
                             $matchFilter = true;
                         } else {
@@ -418,9 +439,10 @@ class Dbjson
         return $keys;
     }
 
-    /** Generate a unique key
-      * @return string the Unique key generated
-      */
+    /**
+     * Generate a unique key
+     * @return string the Unique key generated
+     */
     private function uniqueKey()
     {
         $data = openssl_random_pseudo_bytes(16);
@@ -429,7 +451,9 @@ class Dbjson
         return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
     }
 
-    /** Exclusive lock the database file */
+    /**
+     * Exclusive lock the database file
+     */
     private function lockEX()
     {
         $this->dbfileLock = fopen($this->dbfile, "rt");
@@ -438,7 +462,9 @@ class Dbjson
         }
     }
 
-    /** Shared lock the database file */
+    /**
+     * Shared lock the database file
+     */
     private function lockSH()
     {
         $this->dbfileLock = fopen($this->dbfile, "rt");
@@ -447,7 +473,9 @@ class Dbjson
         }
     }
 
-    /** Unlock the database file */
+    /**
+     * Unlock the database file
+     */
     private function lockUN()
     {
         if ($this->dbfileLock !== null) {
@@ -457,22 +485,24 @@ class Dbjson
         }
     }
 
-    /** Read the dbfile and return an array containing the data. This function
-      * don't do locks !
-      * @return array The database content from the dbfile
-      */
+    /**
+     * Read the dbfile and return an array containing the data. This function
+     * don't do locks !
+     * @return array The database content from the dbfile
+     */
     private function readDB()
     {
         $res = json_decode(file_get_contents($this->dbfile), true);
         if ($res === null) {
-            $res = array();
+            $res = [];
         }
         return $res;
     }
 
-    /** Write the dbfile with the provided data. This function don't do locks !
-      * @return bool True if the recording is OK, false if there is a problem
-      */
+    /**
+     * Write the dbfile with the provided data. This function don't do locks !
+     * @return bool True if the recording is OK, false if there is a problem
+     */
     private function writeDB()
     {
         return !! file_put_contents($this->dbfile, json_encode($this->db));
diff --git a/src/Dblayer.php b/src/Dblayer.php
index 03dd8f7..76e9438 100644
--- a/src/Dblayer.php
+++ b/src/Dblayer.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
@@ -36,86 +37,140 @@ To use it, extends in your code this class, and define the attributes :
 
 Optionnaly, you can add the
 - public $debug = TRUE : enable the debug on screen (NOT FOR PROD !!)
-*/
+ */
 
-/** Permit abstraction on the differents SQL databases available */
+/**
+ * Permit abstraction on the differents SQL databases available
+ */
 class Dblayer
 {
-    /** The table name to use */
+    /**
+     * The table name to use
+     */
     public $table = null;
-    /** The tableprefix text to prepend to table name (Should finish by _)
-        Just allow chars ! */
+    /**
+     * The tableprefix text to prepend to table name (Should finish by _)
+     * Just allow chars !
+     */
     public $tableprefix = "";
-    /** The fields with the definition of type, and special parameters */
-    public $fields = array();
-    /** The primary field */
+    /**
+     * The fields with the definition of type, and special parameters
+     */
+    public $fields = [];
+    /**
+     * The primary field
+     */
     public $primary = null;
-    /** An array to define the unique fields (or array of unique fields) */
+    /**
+     * An array to define the unique fields (or array of unique fields)
+     */
     public $unique = null;
-    /** An array to define the foreign keys of the field */
-    public $foreign = array();
-    /** Debug of the SQL */
+    /**
+     * An array to define the foreign keys of the field
+     */
+    public $foreign = [];
+    /**
+     * Debug of the SQL
+     */
     public $debug = false;
-    /** The connecting DSN */
+    /**
+     * The connecting DSN
+     */
     private $dsn = null;
-    /** The field group delimiter */
+    /**
+     * The field group delimiter
+     */
     private $sep = "";
-    /** Titles */
-    public $titles = array();
+    /**
+     * Titles
+     */
+    public $titles = [];
 
-    /** Define the name of the method to use to verify each entry */
+    /**
+     * Define the name of the method to use to verify each entry
+     */
     public $verifyOneFunc;
-    /** Define the name of the method to use to verify all entries */
+    /**
+     * Define the name of the method to use to verify all entries
+     */
     public $verifyAllFunc;
-    /** Define the name of the method of hook before read */
+    /**
+     * Define the name of the method of hook before read
+     */
     public $hookprereadFunc;
-    /** Define the name of the method of hook after read */
+    /**
+     * Define the name of the method of hook after read
+     */
     public $hookpostreadFunc;
-    /** Define the name of the method of hook before insert */
+    /**
+     * Define the name of the method of hook before insert
+     */
     public $hookpreinsertFunc;
-    /** Define the name of the method of hook after insert */
+    /**
+     * Define the name of the method of hook after insert
+     */
     public $hookpostinsertFunc;
-    /** Define the name of the method of hook before update */
+    /**
+     * Define the name of the method of hook before update
+     */
     public $hookpreupdateFunc;
-    /** Define the name of the method of hook after update */
+    /**
+     * Define the name of the method of hook after update
+     */
     public $hookpostupdateFunc;
-    /** Define the name of the method of hook before delete */
+    /**
+     * Define the name of the method of hook before delete
+     */
     public $hookpredeleteFunc;
-    /** Define the name of the method of hook after delete */
+    /**
+     * Define the name of the method of hook after delete
+     */
     public $hookpostdeleteFunc;
 
 
-    /** The verify unitary stack
-        @param string $field The name of the field to test
-        @param string $val The value of the field to test */
+    /**
+     * The verify unitary stack
+     * @param string $field The name of the field to test
+     * @param string $val The value of the field to test
+     */
     public function verifyOne($field, $val)
     {
     }
-    /** The verify global stack
-        @param array $data The associative array of contents */
+    /**
+     * The verify global stack
+     * @param array $data The associative array of contents
+     */
     public function verifyAll($data)
     {
     }
 
     // TODO !!
-    /** Create Table creation from $this->fields with engine abstraction
-        Example in sqlite3 id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-                in MySQL   id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, */
+    /**
+     * Create Table creation from $this->fields with engine abstraction
+     * Example in sqlite3 id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+     * in MySQL   id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+     */
 
     // TODO !!
-    /** Create automatic creation of $fields from .schema of sqlite3/
-        show create table `NomTable`; for MySQL
-        SQLite3 : PRAGMA TABLE_INFO('yourtable');
-        MYSQL : SHOW COLUMNS FROM yourtable;*/
+    /**
+     * Create automatic creation of $fields from .schema of sqlite3/
+     * show create table `NomTable`; for MySQL
+     * SQLite3 : PRAGMA TABLE_INFO('yourtable');
+     * MYSQL : SHOW COLUMNS FROM yourtable;
+     */
 
     // TODO !!
-    /** Allow to modify tables if the definition is changed
-        Attention : SQLite don't supports adding Foreign keys without deleting all
-        the table, and re-import the data (http://www.sqlite.org/omitted.html) */
+    /**
+     * Allow to modify tables if the definition is changed
+     * Attention : SQLite don't supports adding Foreign keys without deleting all
+     * the table, and re-import the data (http://www.sqlite.org/omitted.html)
+     */
 
-    /** Limit to one instance of the connection to the same database */
+    /**
+     * Limit to one instance of the connection to the same database
+     */
     // Based on an idea of http://tonylandis.com/php/php5-pdo-singleton-class/
-    private static $instance = array();
+    private static $instance = [];
 
     /**
      * Connection to the database engine
@@ -131,16 +186,16 @@ class Dblayer
         $password = null,
         $driver_options = null
     ) {
-        $this->verifyOneFunc = array($this, "verifyOne");
-        $this->verifyAllFunc = array($this, "verifyAll");
-        $this->hookprereadFunc    = array($this, "hookpreread");
-        $this->hookpostreadFunc   = array($this, "hookpostread");
-        $this->hookpreinsertFunc  = array($this, "hookpreinsert");
-        $this->hookpostinsertFunc = array($this, "hookpostinsert");
-        $this->hookpreupdateFunc  = array($this, "hookpreupdate");
-        $this->hookpostupdateFunc = array($this, "hookpostupdate");
-        $this->hookpredeleteFunc  = array($this, "hookpredelete");
-        $this->hookpostdeleteFunc = array($this, "hookpostdelete");
+        $this->verifyOneFunc = [$this, "verifyOne"];
+        $this->verifyAllFunc = [$this, "verifyAll"];
+        $this->hookprereadFunc    = [$this, "hookpreread"];
+        $this->hookpostreadFunc   = [$this, "hookpostread"];
+        $this->hookpreinsertFunc  = [$this, "hookpreinsert"];
+        $this->hookpostinsertFunc = [$this, "hookpostinsert"];
+        $this->hookpreupdateFunc  = [$this, "hookpreupdate"];
+        $this->hookpostupdateFunc = [$this, "hookpostupdate"];
+        $this->hookpredeleteFunc  = [$this, "hookpredelete"];
+        $this->hookpostdeleteFunc = [$this, "hookpostdelete"];
 
         $driver = @explode(":", $dsn);
         if (! isset($driver[0])) {
@@ -149,7 +204,7 @@ class Dblayer
                 500
             );
         }
-        if (! in_array($driver[0], pdo_drivers())) {
+        if (! in_array($driver[0], pdo_drivers(), true)) {
             throw new \Exception(sprintf(
                 dgettext(
                     "domframework",
@@ -287,7 +342,7 @@ class Dblayer
             );
         }
         $vals = explode(";", substr(strstr($this->dsn, ":"), 1));
-        $dsnExplode = array();
+        $dsnExplode = [];
         foreach ($vals as $val) {
             @list($k, $v) = explode("=", $val);
             $dsnExplode[$k] = $v;
@@ -314,7 +369,7 @@ class Dblayer
                 $req = "SELECT name FROM sqlite_master WHERE type='table'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     $res[] = $d["name"];
                 }
@@ -325,7 +380,7 @@ class Dblayer
               WHERE TABLE_SCHEMA='" . $this->databasename() . "'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     $res[] = $d["TABLE_NAME"];
                 }
@@ -336,7 +391,7 @@ class Dblayer
               WHERE schemaname = 'public'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     $res[] = $d["tablename"];
                 }
@@ -361,7 +416,7 @@ class Dblayer
         if ($this->debug) {
             echo "== Entering verify\n";
         }
-        $errors = array();
+        $errors = [];
         foreach ($this->fields as $key => $params) {
             if ($this->debug) {
                 echo "      verify ($key)\n";
@@ -369,27 +424,27 @@ class Dblayer
             if ($updatekey === false) {
                 // Don't check if there is an update : the database is already filled
                 // For autoincrement, in INSERT mode, force the value to null
-                if (in_array("autoincrement", $params)) {
+                if (in_array("autoincrement", $params, true)) {
                     $data[$key] = null;
                 }
-                if (in_array("not null", $params) && !array_key_exists($key, $data)) {
-                    $errors[$key] = array("error", sprintf(
+                if (in_array("not null", $params, true) && !array_key_exists($key, $data)) {
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Mandatory field '%s' not provided"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
-                if (in_array("not null", $params) && $data[$key] === "") {
-                    $errors[$key] = array("error", sprintf(
+                if (in_array("not null", $params, true) && $data[$key] === "") {
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Mandatory field '%s' is empty"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
             }
@@ -402,7 +457,7 @@ class Dblayer
             // Verify the fields, if $verify is defined, before doing insertion
             $verify = call_user_func($this->verifyOneFunc, $key, $data[$key]);
             if (is_array($verify) && count($verify)) {
-                $errors[$key] = array($verify[0], $verify[1]);
+                $errors[$key] = [$verify[0], $verify[1]];
                 //." ". dgettext ("domframework","in")." ".$key);
                 continue;
             }
@@ -412,78 +467,78 @@ class Dblayer
                 // Skipped the removed autoincrement keys
                 continue;
             } elseif (! is_string($data[$key]) && ! is_integer($data[$key])) {
-                $errors[$key] = array("error", sprintf(
+                $errors[$key] = ["error", sprintf(
                     dgettext(
                         "domframework",
                         "Errors in consistency : '%s' is not an integer or a string [is %s]"
                     ),
                     $key,
                     gettype($data[$key])
-                ));
+                )];
                 continue;
             } elseif ($data[$key] !== "" && $params[0] === "integer") {
                 if (strspn($data[$key], "0123456789") !== strlen($data[$key])) {
-                    $errors[$key] = array("error", sprintf(
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Errors in consistency : '%s' is not an integer"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
             } elseif ($data[$key] !== "" && $params[0] === "varchar") {
                 if (! isset($params[1])) {
-                    $errors[$key] = array("error", sprintf(
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "The length of varchar field '%s' is not provided"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
                 if (mb_strlen($data[$key]) > $params[1]) {
-                    $errors[$key] = array("error", sprintf(
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Errors in consistency : '%s' data is too long"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
             } elseif ($data[$key] !== "" && $params[0] === "datetime") {
                 // The date format must be in ANSI SQL : YYYY-MM-DD HH:MM:SS
                 $d = \DateTime::createFromFormat("Y-m-d H:i:s", $data[$key]);
                 if (!$d || $d->format("Y-m-d H:i:s") !== $data[$key]) {
-                    $errors[$key] = array("error", sprintf(
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Incorrect datetime provided for field '%s'"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
             } elseif ($data[$key] !== "" && $params[0] === "date") {
                 // The date format must be in ANSI SQL : YYYY-MM-DD
                 $d = \DateTime::createFromFormat("Y-m-d", $data[$key]);
                 if (!$d || $d->format("Y-m-d") !== $data[$key]) {
-                    $errors[$key] = array("error", sprintf(
+                    $errors[$key] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "Incorrect date provided for field '%s'"
                         ),
                         $key
-                    ));
+                    )];
                     continue;
                 }
             } elseif ($data[$key] !== "") {
-                $errors[$key] = array("error", sprintf(dgettext(
+                $errors[$key] = ["error", sprintf(dgettext(
                     "domframework",
                     "Unknown field type for '%s'"
-                ), $key));
+                ), $key)];
                 continue;
             } else {
                 // Nothing to do if the value is empty : just save it
@@ -496,14 +551,14 @@ class Dblayer
         // Check for inconsistency
         $verify = call_user_func($this->verifyAllFunc, $data);
         if (is_null($verify)) {
-            $verify = array();
+            $verify = [];
         }
         $allErrors = array_merge($errors, $verify);
         if (count($allErrors)) {
             return $allErrors;
         }
 
-        $dataOK = array();
+        $dataOK = [];
         foreach ($this->fields as $field => $desc) {
             if (array_key_exists($field, $data)) {
                 $dataOK[$field] = $data[$field];
@@ -516,12 +571,12 @@ class Dblayer
             }
             // Check if the unique constrain is valid before doing the insertion
             // 1. Read the actual state
-            $before = $this->read(array(array($this->primary, $updatekey)));
+            $before = $this->read([[$this->primary, $updatekey]]);
             if (count($before) === 0) {
-                return array("error", dgettext(
+                return ["error", dgettext(
                     "domframework",
                     "Entry to modify unavailable"
-                ));
+                )];
             }
             $before = reset($before);
             // 2. Map the proposal entries into the before state
@@ -537,17 +592,17 @@ class Dblayer
         }
         // Check if the unique constrain is valid before doing the insertion
         if ($this->unique === null && $this->primary !== null) {
-            $this->unique = array($this->primary);
+            $this->unique = [$this->primary];
         }
         // TODO : If Unique is not defined nor primary
         // FIXME : If unique is defined, could I test if the primary key is defined
         // in a parameter of the unique and if it is not add it automatically
         foreach ($this->unique as $k => $columns) {
             if ($this->primary === null) {
-                return array(dgettext(
+                return [dgettext(
                     "domframework",
                     "No field primary defined for tests in primary"
-                ));
+                )];
             }
 
             if (is_array($columns)) {
@@ -555,25 +610,25 @@ class Dblayer
                 if ($this->debug) {
                     echo "   verify unique multiple $k\n";
                 }
-                $select = array();
+                $select = [];
                 if ($updatekey !== false) {
-                    $select[] = array($this->primary, $updatekey, "!=");
+                    $select[] = [$this->primary, $updatekey, "!="];
                 }
                 foreach ($columns as $col) {
                     if (!array_key_exists($col, $after)) {
                         continue;
                     }
-                    $select[] = array($col, $after[$col]);
+                    $select[] = [$col, $after[$col]];
                 }
                 // If there is only the primary key, there is no chance to have a
                 // conflict
                 // Before updating, check if the new values are not creating an error
-                $rc = $this->read($select, array($this->primary));
+                $rc = $this->read($select, [$this->primary]);
                 if (count($rc) > 0) {
-                    $errors[] = array("error", dgettext(
+                    $errors[] = ["error", dgettext(
                         "domframework",
                         "An entry with these values already exists"
-                    ));
+                    )];
                     continue;
                 }
             } else {
@@ -584,22 +639,22 @@ class Dblayer
                 if (!array_key_exists($columns, $after)) {
                     continue;
                 }
-                $select = array();
+                $select = [];
                 if ($updatekey !== false) {
                     // This line have a problem to update a tuple with the same values
                     //  if ($columns === $this->primary)
-                    $select[] = array($this->primary, $updatekey, "!=");
+                    $select[] = [$this->primary, $updatekey, "!="];
                 }
-                $select[] = array($columns, $after[$columns]);
+                $select[] = [$columns, $after[$columns]];
                 $rc = $this->read(
                     $select,
-                    array($this->primary)
+                    [$this->primary]
                 );
                 if (count($rc) > 0) {
-                    $errors[] = array("error", dgettext(
+                    $errors[] = ["error", dgettext(
                         "domframework",
                         "An entry with this value already exists"
-                    ));
+                    )];
                     continue;
                 }
             }
@@ -614,13 +669,13 @@ class Dblayer
                     echo "   verify foreign $foreign\n";
                 }
                 if (! isset($data[$foreign])) {
-                    $errors[] = array("error", sprintf(
+                    $errors[] = ["error", sprintf(
                         dgettext(
                             "domframework",
                             "The foreign column '%s' is not provided"
                         ),
                         $foreign
-                    ));
+                    )];
                     return $errors;
                 }
                 /*                if (! isset($data[$foreign][0])) {
@@ -633,7 +688,8 @@ class Dblayer
                                     ));
                                     return $errors;
                                     continue;
-                                }*/
+                                }
+ */
             } else {
                 if (! array_key_exists($foreign, $d)) {
                     continue;
@@ -674,27 +730,28 @@ class Dblayer
                 );
             }
             $st->execute();
-            $res = array();
+            $res = [];
             while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                 $res[] = $d;
             }
             if (count($res) === 0) {
-                $errors[] = array("error", sprintf(
+                $errors[] = ["error", sprintf(
                     dgettext(
                         "domframework",
                         "The foreign key '%s' doesn't exists"
                     ),
                     $column
-                ));
+                )];
                 continue;
             }
         }
         return $errors;
     }
 
-    /** Insert a new line of data in the table. Datas must be an indexed array
-      * @param array $data Datas to be recorded (column=>value)
-      */
+    /**
+     * Insert a new line of data in the table. Datas must be an indexed array
+     * @param array $data Datas to be recorded (column=>value)
+     */
     public function insert($data)
     {
         if ($this->debug) {
@@ -737,19 +794,19 @@ class Dblayer
             );
         }
         foreach ($this->fields as $key => $params) {
-            if (in_array("autoincrement", $params)) {
+            if (in_array("autoincrement", $params, true)) {
                 $data[$key] = null;
             }
         }
-        if (!in_array($this->primary, $this->unique)) {
+        if (!in_array($this->primary, $this->unique, true)) {
             $this->unique[] = $this->primary;
         }
-        $dataOK = array();
+        $dataOK = [];
         $errors = $this->verify($data);
         if (count($errors) !== 0) {
             $errors = reset($errors);
             if (! is_array($errors)) {
-                $errors = array(0 => "error", 1 => $errors);
+                $errors = [0 => "error", 1 => $errors];
             }
             throw new \Exception($errors[1], 405);
         }
@@ -804,13 +861,13 @@ class Dblayer
         }
         if (
             key_exists($this->primary, $data) &&
-            ! in_array("autoincrement", $this->fields[$this->primary]) &&
+            ! in_array("autoincrement", $this->fields[$this->primary], true) &&
             $data[$this->primary] !== null
         ) {
             $lastID = $data[$this->primary];
         } elseif (
             key_exists($this->primary, $data) &&
-            in_array("autoincrement", $this->fields[$this->primary]) &&
+            in_array("autoincrement", $this->fields[$this->primary], true) &&
             $data[$this->primary] !== null
         ) {
             $lastID = $data[$this->primary];
@@ -888,7 +945,7 @@ class Dblayer
         }
         if ($display !== null) {
             foreach ($display as $f) {
-                if (!in_array($f, array_keys($this->fields))) {
+                if (!in_array($f, array_keys($this->fields), true)) {
                     throw new \Exception(sprintf(dgettext(
                         "domframework",
                         "Field '%s' not allowed"
@@ -899,7 +956,7 @@ class Dblayer
             $display = array_keys($this->fields);
         }
 
-        $foreignSelectCols = array();
+        $foreignSelectCols = [];
         if ($foreignSelect !== null) {
             foreach ($foreignSelect as $s) {
                 $foreignSelectCols[] = $s[0];
@@ -907,8 +964,8 @@ class Dblayer
         }
         call_user_func_array(
             $this->hookprereadFunc,
-            array(&$select, &$display, &$order,
-                                 &$whereOr, &$foreignSelect)
+            [&$select, &$display, &$order,
+                                 &$whereOr, &$foreignSelect]
         );
         $req = "SELECT $this->sep";
         $req .= implode("$this->sep,$this->sep", $display);
@@ -924,7 +981,7 @@ class Dblayer
                     throw new \Exception("Select not an array for element $n", 500);
                 }
                 // The foreign keys can not be in the select too (conflict)
-                if (in_array($s[0], $foreignSelectCols)) {
+                if (in_array($s[0], $foreignSelectCols, true)) {
                     continue;
                 }
                 if (! array_key_exists(0, $s)) {
@@ -1041,7 +1098,7 @@ class Dblayer
                 echo "DEBUG : EXECUTE ERROR ! Return FALSE\n";
             }
         }
-        $res = array();
+        $res = [];
         while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
             $res[] = $d;
         }
@@ -1092,7 +1149,7 @@ class Dblayer
                 "No data to update provided"
             ), 500);
         }
-        $dataOK = array();
+        $dataOK = [];
         $errors = $this->verify($data, $updatekey);
         if (count($errors) !== 0) {
             if (is_array($errors)) {
@@ -1181,10 +1238,11 @@ class Dblayer
         return $nbLinesUpdated;
     }
 
-    /** Delete a tuple identified by its primary key
-      * Return the number of deleted rows (can be 0 !)
-      * @param string|integer $deletekey The key of primary key to be deleted
-      */
+    /**
+     * Delete a tuple identified by its primary key
+     * Return the number of deleted rows (can be 0 !)
+     * @param string|integer $deletekey The key of primary key to be deleted
+     */
     public function delete($deletekey)
     {
         if ($this->debug) {
@@ -1231,8 +1289,9 @@ class Dblayer
         return $nbLinesDeleted;
     }
 
-    /** Translation of fieldsi
-      */
+    /**
+     * Translation of fieldsi
+     */
     public function titles()
     {
         if ($this->debug) {
@@ -1241,7 +1300,7 @@ class Dblayer
         if (count($this->fields) === 0) {
             throw new \Exception(dgettext("domframework", "No Field defined"), 500);
         }
-        $arr = array();
+        $arr = [];
         if (count($this->titles) !== 0) {
             foreach ($this->titles as $field => $v) {
                 $arr[$field] = $field;
@@ -1254,8 +1313,9 @@ class Dblayer
         return $arr;
     }
 
-    /** Drop the table
-      */
+    /**
+     * Drop the table
+     */
     public function dropTable()
     {
         if ($this->debug) {
@@ -1280,22 +1340,23 @@ class Dblayer
         return self::$instance[$this->dsn]->exec($sql);
     }
 
-    /** Create the table defined by the differents fields.
-      * Define the SQL syntax based on SQL engines
-      * $table = "dns zones";
-      * $fields = array (
-      *   "id"=>array ("integer", "not null", "autoincrement"),
-      *   "zo ne"=>array ("varchar", "255", "not null"),
-      *   "vie wname"=>array ("varchar", "255"),
-      *   "view clients"=>array ("varchar", "255"),
-      *   "comme nt"=>array ("varchar", "1024"),
-      *   "opendate"=>array ("datetime", "not null"),
-      *   "closedate"=>array ("datetime"),
-      * );
-      * $primary = "id";
-      * $unique = array ("id", array ("zo ne", "vie wname"));
-      * $foreign = array ("zone"=>"table.field",...);
-      */
+    /**
+     * Create the table defined by the differents fields.
+     * Define the SQL syntax based on SQL engines
+     * $table = "dns zones";
+     * $fields = array (
+     *   "id"=>array ("integer", "not null", "autoincrement"),
+     *   "zo ne"=>array ("varchar", "255", "not null"),
+     *   "vie wname"=>array ("varchar", "255"),
+     *   "view clients"=>array ("varchar", "255"),
+     *   "comme nt"=>array ("varchar", "1024"),
+     *   "opendate"=>array ("datetime", "not null"),
+     *   "closedate"=>array ("datetime"),
+     * );
+     * $primary = "id";
+     * $unique = array ("id", array ("zo ne", "vie wname"));
+     * $foreign = array ("zone"=>"table.field",...);
+     */
     public function createTable()
     {
         if ($this->debug) {
@@ -1553,7 +1614,7 @@ class Dblayer
                     }
                     // Name of field
                     $sql .= "\"$field\" ";
-                    if (in_array("autoincrement", $params)) {
+                    if (in_array("autoincrement", $params, true)) {
                         $sql .= "SERIAL";
                     } else {
                         // Type of field : in $params[0]
@@ -1667,10 +1728,11 @@ class Dblayer
         return self::$instance[$this->dsn]->exec($sql);
     }
 
-    /** This function permit to send a SQL request to the database to do a SELECT
-      * Return the an array with the data
-      * @param string $sql A valid SQL request to be execute
-      */
+    /**
+     * This function permit to send a SQL request to the database to do a SELECT
+     * Return the an array with the data
+     * @param string $sql A valid SQL request to be execute
+     */
     public function directRead($sql)
     {
         if ($this->debug) {
@@ -1681,66 +1743,72 @@ class Dblayer
         }
         $st = self::$instance[$this->dsn]->prepare($sql);
         $st->execute();
-        $res = array();
+        $res = [];
         while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
             $res[] = $d;
         }
         return $res;
     }
 
-    /** This function disconnect the database. It is normally only used in phpunit
-      * unit tests
-      */
+    /**
+     * This function disconnect the database. It is normally only used in phpunit
+     * unit tests
+     */
     public function disconnect()
     {
         unset(self::$instance[$this->dsn]);
     }
 
-    /** The prepare method
-      * @param string $statement The valid template to be replaced
-      * @param array|null $driver_options The replacement to be done
-      */
-    public function prepare($statement, $driver_options = array())
+    /**
+     * The prepare method
+     * @param string $statement The valid template to be replaced
+     * @param array|null $driver_options The replacement to be done
+     */
+    public function prepare($statement, $driver_options = [])
     {
         return self::$instance[$this->dsn]->prepare($statement, $driver_options);
     }
 
-    /** Start a new Transaction
-      */
+    /**
+     * Start a new Transaction
+     */
     public function beginTransaction()
     {
         return self::$instance[$this->dsn]->beginTransaction();
     }
 
-    /** Commit (validate) a transaction
-      */
+    /**
+     * Commit (validate) a transaction
+     */
     public function commit()
     {
         return self::$instance[$this->dsn]->commit();
     }
 
-    /** RollBack a transaction
-      */
+    /**
+     * RollBack a transaction
+     */
     public function rollback()
     {
         return self::$instance[$this->dsn]->rollback();
     }
 
-    /** Hook preread
-      * This hook is run before selecting the data in the database, after the
-      * verification
-      * @param array|null &$select Rows to select with
-      *    $select = array (array ($key, $val, $operator), ...)
-      *    $key=>column, $val=>value to found, $operator=>'LIKE', =...
-      * @param array|null &$display Columns displayed
-      *    $display = array ($col1, $col2...);
-      * @param array|null &$order Sort the columns by orientation
-      *    $order = array (array ($key, $orientation), ...)
-      *    $key=>column, $orientation=ASC/DESC
-      * @param boolean|null &$whereOr The WHERE parameters are separated by OR
-      *    instead of AND
-      * @param array|null &$foreignSelect Add a filter on foreign keys
-      */
+    /**
+     * Hook preread
+     * This hook is run before selecting the data in the database, after the
+     * verification
+     * @param array|null &$select Rows to select with
+     *    $select = array (array ($key, $val, $operator), ...)
+     *    $key=>column, $val=>value to found, $operator=>'LIKE', =...
+     * @param array|null &$display Columns displayed
+     *    $display = array ($col1, $col2...);
+     * @param array|null &$order Sort the columns by orientation
+     *    $order = array (array ($key, $orientation), ...)
+     *    $key=>column, $orientation=ASC/DESC
+     * @param boolean|null &$whereOr The WHERE parameters are separated by OR
+     *    instead of AND
+     * @param array|null &$foreignSelect Add a filter on foreign keys
+     */
     public function hookpreread(
         &$select,
         &$display,
@@ -1837,81 +1905,90 @@ class Dblayer
     ///////////////////
     ///   SETTERS   ///
     ///////////////////
-    /** Set the table property
-      * @param string $table The table name to use
-      */
+    /**
+     * Set the table property
+     * @param string $table The table name to use
+     */
     public function tableSet($table)
     {
         $this->table = $table;
         return $this;
     }
 
-    /** Set the tableprefix property
-      * @param string $tableprefix The prefix to add in table names
-      */
+    /**
+     * Set the tableprefix property
+     * @param string $tableprefix The prefix to add in table names
+     */
     public function tableprefixSet($tableprefix)
     {
         $this->tableprefix = $tableprefix;
         return $this;
     }
 
-    /** Set the fields property
-      * @param array $fields Set the definition of the fields
-      */
+    /**
+     * Set the fields property
+     * @param array $fields Set the definition of the fields
+     */
     public function fieldsSet($fields)
     {
         $this->fields = $fields;
         return $this;
     }
 
-    /** Set the primary property
-      * @param string $primary The primary field
-      */
+    /**
+     * Set the primary property
+     * @param string $primary The primary field
+     */
     public function primarySet($primary)
     {
         $this->primary = $primary;
         return $this;
     }
 
-    /** Set the unique property
-      * @param array $unique The array of the unique contraints
-      */
+    /**
+     * Set the unique property
+     * @param array $unique The array of the unique contraints
+     */
     public function uniqueSet($unique)
     {
         $this->unique = $unique;
         return $this;
     }
 
-    /** Set the foreign property
-      * @param array $foreign The foreign array
-      */
+    /**
+     * Set the foreign property
+     * @param array $foreign The foreign array
+     */
     public function foreignSet($foreign)
     {
         $this->foreign = $foreign;
         return $this;
     }
 
-    /** Set the debug property
-      * @param integer $debug The debug value
-      */
+    /**
+     * Set the debug property
+     * @param integer $debug The debug value
+     */
     public function debugSet($debug)
     {
         $this->debug = $debug;
         return $this;
     }
 
-    /** Set the dsn property
-      * @param string $dsn The DSN to use
-      */
+    /**
+     * Set the dsn property
+     * @param string $dsn The DSN to use
+     */
     public function dsnSet($dsn)
     {
         $this->dsn = $dsn;
         return $this;
     }
 
-    /** Set the titles property
-      * @param array $titles The titles of the fields
-      */
+    /**
+     * Set the titles property
+     * @param array $titles The titles of the fields
+     */
     public function titlesSet($titles)
     {
         $this->titles = $titles;
@@ -1919,38 +1996,39 @@ class Dblayer
     }
 }
 
-/** POC :
-error_reporting (E_ALL);
-class Zone extends DbLayer
-{
-  // The database must be initialized with
-  // CREATE TABLE `dns_zones` (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  //                           zone VARCHAR(255) NOT NULL,
-  //                           viewname VARCHAR(255),
-  //                           viewclients VARCHAR(255),
-  //                           comment VARCHAR(1024),
-  //                           opendate DATETIME NOT NULL,
-  //                           closedate DATETIME,
-  //                           UNIQUE (zone,viewname));
-  protected $table = "dns_zones";
-  protected $fields = array (
-    "id"=>array ("integer", "not null", "autoincrement"),
-    "zone"=>array ("varchar", "255", "not null"),
-    "viewname"=>array ("varchar", "255"),
-    "viewclients"=>array ("varchar", "255"),
-    "comment"=>array ("varchar", "1024"),
-    "opendate"=>array ("datetime", "not null"),
-    "closedate"=>array ("datetime"),
-  );
-  protected $primary = "id";
-  protected $unique = array ("id", array ("zone", "viewname"));
-}
-
-ini_set ("date.timezone", "Europe/Paris");
-$zone = new zone ("sqlite:data/database.db");
-$last = $zone->create (array ("zone"=>"testZone",
-                              "opendate"=>date("Y-m-d H:i:s")));
-//print_r ($zone->read ());
-$zone->update (2040, array ("zone"=>"testZone2"));
-print_r ($zone->delete ($last));
-*/
+/**
+ * POC :
+ * error_reporting (E_ALL);
+ * class Zone extends DbLayer
+ * {
+ * // The database must be initialized with
+ * // CREATE TABLE `dns_zones` (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ * //                           zone VARCHAR(255) NOT NULL,
+ * //                           viewname VARCHAR(255),
+ * //                           viewclients VARCHAR(255),
+ * //                           comment VARCHAR(1024),
+ * //                           opendate DATETIME NOT NULL,
+ * //                           closedate DATETIME,
+ * //                           UNIQUE (zone,viewname));
+ * protected $table = "dns_zones";
+ * protected $fields = array (
+ * "id"=>array ("integer", "not null", "autoincrement"),
+ * "zone"=>array ("varchar", "255", "not null"),
+ * "viewname"=>array ("varchar", "255"),
+ * "viewclients"=>array ("varchar", "255"),
+ * "comment"=>array ("varchar", "1024"),
+ * "opendate"=>array ("datetime", "not null"),
+ * "closedate"=>array ("datetime"),
+ * );
+ * protected $primary = "id";
+ * protected $unique = array ("id", array ("zone", "viewname"));
+ * }
+ *
+ * ini_set ("date.timezone", "Europe/Paris");
+ * $zone = new zone ("sqlite:data/database.db");
+ * $last = $zone->create (array ("zone"=>"testZone",
+ * "opendate"=>date("Y-m-d H:i:s")));
+ * //print_r ($zone->read ());
+ * $zone->update (2040, array ("zone"=>"testZone2"));
+ * print_r ($zone->delete ($last));
+ */
diff --git a/src/Dblayerauthzgroups.php b/src/Dblayerauthzgroups.php
index 659896e..dad6c2b 100644
--- a/src/Dblayerauthzgroups.php
+++ b/src/Dblayerauthzgroups.php
@@ -1,54 +1,73 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** DBLayer with authorization
-  * All the actions in database are conditionned to the rights in authzgroups
-  */
+/**
+ * DBLayer with authorization
+ * All the actions in database are conditionned to the rights in authzgroups
+ */
 class Dblayerauthzgroups extends Dblayer
 {
-    /** The authzgroups object, connected to the database */
+    /**
+     * The authzgroups object, connected to the database
+     */
     public $authzgroups = null;
-    /** The module name for authzgroups */
+    /**
+     * The module name for authzgroups
+     */
     public $module = null;
-    /** The user name for authzgroups */
+    /**
+     * The user name for authzgroups
+     */
     public $user = null;
-    /** The auth information (email, lastname, firstname) */
+    /**
+     * The auth information (email, lastname, firstname)
+     */
     public $auth = null;
-    /** The default group(s) when creating a new object. Can be a string or an
-        array with multiple groups */
+    /**
+     * The default group(s) when creating a new object. Can be a string or an
+     * array with multiple groups
+     */
     public $createGroup = null;
-    /** The default right when creating a new object */
+    /**
+     * The default right when creating a new object
+     */
     public $createRight = "RW";
-    /** Pre-Path in object authzgroups */
+    /**
+     * Pre-Path in object authzgroups
+     */
     public $path = "";
-    /** Flag when primary key is added before search */
+    /**
+     * Flag when primary key is added before search
+     */
     private $primaryKeyAdded = false;
 
     ////////////////////////
     ///   MAIN METHODS   ///
     ////////////////////////
-    /** Hook preread
-      * This hook is run before selecting the data in the database, after the
-      * verification
-      * @param array|null &$select Rows to select with
-      *    $select = array (array ($key, $val, $operator), ...)
-      *    $key=>column, $val=>value to found, $operator=>'LIKE', =...
-      * @param array|null &$display Columns displayed
-      *    $display = array ($col1, $col2...);
-      * @param array|null &$order Sort the columns by orientation
-      *    $order = array (array ($key, $orientation), ...)
-      *    $key=>column, $orientation=ASC/DESC
-      * @param boolean|null &$whereOr The WHERE parameters are separated by OR
-      *                            instead of AND
-      * @param array|null &$foreignSelect Add a filter on foreign keys
-      */
+    /**
+     * Hook preread
+     * This hook is run before selecting the data in the database, after the
+     * verification
+     * @param array|null &$select Rows to select with
+     *    $select = array (array ($key, $val, $operator), ...)
+     *    $key=>column, $val=>value to found, $operator=>'LIKE', =...
+     * @param array|null &$display Columns displayed
+     *    $display = array ($col1, $col2...);
+     * @param array|null &$order Sort the columns by orientation
+     *    $order = array (array ($key, $orientation), ...)
+     *    $key=>column, $orientation=ASC/DESC
+     * @param boolean|null &$whereOr The WHERE parameters are separated by OR
+     *                            instead of AND
+     * @param array|null &$foreignSelect Add a filter on foreign keys
+     */
     public function hookpreread(
         &$select,
         &$display,
@@ -74,7 +93,7 @@ class Dblayerauthzgroups extends Dblayer
                 500
             );
         }
-        if ($display === null || ! in_array($this->primary, $display)) {
+        if ($display === null || ! in_array($this->primary, $display, true)) {
             // Need the primary key to allow/deny access. Add it and remove the data
             // after the access verification
             $display[] = $this->primary;
@@ -82,12 +101,13 @@ class Dblayerauthzgroups extends Dblayer
         }
     }
 
-    /** Hook postread
-      * This hook is run after selecting the data. Return only the allowed data to
-      * the user. It must have at least the RO flag.
-      * @param array $data the data selected by the select
-      * @return array The data modified by the hook
-      */
+    /**
+     * Hook postread
+     * This hook is run after selecting the data. Return only the allowed data to
+     * the user. It must have at least the RO flag.
+     * @param array $data the data selected by the select
+     * @return array The data modified by the hook
+     */
     public function hookpostread($data)
     {
         // TODO : If foreign keys, do we check if the access is allowed too ?
@@ -127,12 +147,13 @@ class Dblayerauthzgroups extends Dblayer
         return $data;
     }
 
-    /** Hook preinsert
-      * This hook is run before inserting a new data in the database, after the
-      * verification
-      * @param array $data the data to insert in the database
-      * @return the modified data
-      */
+    /**
+     * Hook preinsert
+     * This hook is run before inserting a new data in the database, after the
+     * verification
+     * @param array $data the data to insert in the database
+     * @return the modified data
+     */
     public function hookpreinsert($data)
     {
         if ($this->module === null) {
@@ -164,12 +185,13 @@ class Dblayerauthzgroups extends Dblayer
         return $data;
     }
 
-    /** Hook postinsert
-      * This hook is run after successfuly insert a new data in the database
-      * @param array $data The data stored in the database
-      * @param integer $lastID The lastID stored
-      * @return the modified lastID
-      */
+    /**
+     * Hook postinsert
+     * This hook is run after successfuly insert a new data in the database
+     * @param array $data The data stored in the database
+     * @param integer $lastID The lastID stored
+     * @return the modified lastID
+     */
     public function hookpostinsert($data, $lastID)
     {
         if ($this->module === null) {
@@ -220,13 +242,14 @@ class Dblayerauthzgroups extends Dblayer
         return $lastID;
     }
 
-    /** Hook preupdate
-      * This hook is run before updating a data in the database, after the
-      * verification
-      * @param integer $updatekey The key which will be updated
-      * @param array $data The data to store in the provided key
-      * @return the modified data
-      */
+    /**
+     * Hook preupdate
+     * This hook is run before updating a data in the database, after the
+     * verification
+     * @param integer $updatekey The key which will be updated
+     * @param array $data The data to store in the provided key
+     * @return the modified data
+     */
     public function hookpreupdate($updatekey, $data)
     {
         if ($this->module === null) {
@@ -257,11 +280,12 @@ class Dblayerauthzgroups extends Dblayer
         return $data;
     }
 
-    /** Hook predelete
-      * This hook is run before deleting a data in the database
-      * @param string $deletekey The key to delete
-      * @return the modified $deletekey
-      */
+    /**
+     * Hook predelete
+     * This hook is run before deleting a data in the database
+     * @param string $deletekey The key to delete
+     * @return the modified $deletekey
+     */
     public function hookpredelete($deletekey)
     {
         if ($this->module === null) {
@@ -292,12 +316,13 @@ class Dblayerauthzgroups extends Dblayer
         return $deletekey;
     }
 
-    /** Hook postdelete
-      * This hook is run after successfuly deleting a data in the database
-      * @param string $deletekey The key to delete
-      * @param integer $nbLinesDeleted The number of deleted lines
-      * @return $nbLinesUpdated
-      */
+    /**
+     * Hook postdelete
+     * This hook is run after successfuly deleting a data in the database
+     * @param string $deletekey The key to delete
+     * @param integer $nbLinesDeleted The number of deleted lines
+     * @return $nbLinesUpdated
+     */
     public function hookpostdelete($deletekey, $nbLinesDeleted)
     {
         if ($this->module === null) {
@@ -322,8 +347,9 @@ class Dblayerauthzgroups extends Dblayer
         return $nbLinesDeleted;
     }
 
-    /** Return true if all the paths are allowed. Throw an exception elsewhere
-      */
+    /**
+     * Return true if all the paths are allowed. Throw an exception elsewhere
+     */
     private function allowPath()
     {
         if ($this->module === null) {
@@ -360,63 +386,70 @@ class Dblayerauthzgroups extends Dblayer
     ///////////////////
     ///   SETTERS   ///
     ///////////////////
-    /** Set the authzgroups property
-      * @param object $authzgroups The object of the authzgroups
-      */
+    /**
+     * Set the authzgroups property
+     * @param object $authzgroups The object of the authzgroups
+     */
     public function authzgroupsSet($authzgroups)
     {
         $this->authzgroups = $authzgroups;
         return $this;
     }
 
-    /** Set the module property
-      * @param string $module The module name to use
-      */
+    /**
+     * Set the module property
+     * @param string $module The module name to use
+     */
     public function moduleSet($module)
     {
         $this->module = $module;
         return $this;
     }
 
-    /** Set the auth property
-      * @param array $auth The auth array
-      */
+    /**
+     * Set the auth property
+     * @param array $auth The auth array
+     */
     public function authSet($auth)
     {
         $this->auth = $auth;
         return $this;
     }
 
-    /** Set the user property
-      * @param string $user The user to authorize
-      */
+    /**
+     * Set the user property
+     * @param string $user The user to authorize
+     */
     public function userSet($user)
     {
         $this->user = $user;
         return $this;
     }
 
-    /** Set the createGroup property
-      * @param array|string $createGroup The createGroup to set
-      */
+    /**
+     * Set the createGroup property
+     * @param array|string $createGroup The createGroup to set
+     */
     public function createGroupSet($createGroup)
     {
         $this->createGroup = $createGroup;
         return $this;
     }
 
-    /** Set the createRight property
-      * @param string $createRight The right to create
-      */
+    /**
+     * Set the createRight property
+     * @param string $createRight The right to create
+     */
     public function createRightSet($createRight)
     {
         $this->createRight = $createRight;
         return $this;
     }
 
-    /** Set the path property
-      * @param string $path The pre-path to use
-      */
+    /**
+     * Set the path property
+     * @param string $path The pre-path to use
+     */
     public function pathSet($path)
     {
         $this->path = $path;
diff --git a/src/Dblayeroo.php b/src/Dblayeroo.php
index fe4d277..be428da 100644
--- a/src/Dblayeroo.php
+++ b/src/Dblayeroo.php
@@ -1,75 +1,92 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Permit abstraction on the differents SQL databases available
-  */
+/**
+ * Permit abstraction on the differents SQL databases available
+ */
 class Dblayeroo
 {
-    /** The table name to use
-      */
+    /**
+     * The table name to use
+     */
     private $table = null;
-    /** The tableprefix text to prepend to table name (Should finish by _)
-      * Just allow chars !
-      */
+    /**
+     * The tableprefix text to prepend to table name (Should finish by _)
+     * Just allow chars !
+     */
     private $tableprefix = "";
-    /** The fields with the definition of type, and special parameters
-      */
-    private $fields = array();
-    /** The primary field
-      */
+    /**
+     * The fields with the definition of type, and special parameters
+     */
+    private $fields = [];
+    /**
+     * The primary field
+     */
     private $primary = null;
-    /** An array to define the unique fields (or array of unique fields)
-      */
+    /**
+     * An array to define the unique fields (or array of unique fields)
+     */
     private $unique = null;
-    /** An array to define the foreign keys of the field
-      */
-    private $foreign = array();
-    /** Debug of the SQL
-      */
+    /**
+     * An array to define the foreign keys of the field
+     */
+    private $foreign = [];
+    /**
+     * Debug of the SQL
+     */
     protected $debug = false;
-    /** The connecting DSN
-      */
+    /**
+     * The connecting DSN
+     */
     private $dsn = null;
-    /** The driver to use
-      */
+    /**
+     * The driver to use
+     */
     private $driver = null;
-    /** The field group delimiter
-      */
+    /**
+     * The field group delimiter
+     */
     private $sep = "";
-    /** Titles
-      */
-    private $titles = array();
-    /** The real types of each fields. The real types are different of the SQL
-      * types : a "mail" type is stored in a "VARCHAR(255)" in SQL.
-      * The real types are optional : if not set, there is no check.
-      * They are more strict than the SQL types
-      */
-    private $realTypes = array();
+    /**
+     * Titles
+     */
+    private $titles = [];
+    /**
+     * The real types of each fields. The real types are different of the SQL
+     * types : a "mail" type is stored in a "VARCHAR(255)" in SQL.
+     * The real types are optional : if not set, there is no check.
+     * They are more strict than the SQL types
+     */
+    private $realTypes = [];
 
-    /** Limit to one instance of the connection to the same database
-      */
+    /**
+     * Limit to one instance of the connection to the same database
+     */
     // Based on an idea of http://tonylandis.com/php/php5-pdo-singleton-class/
-    private static $instance = array();
+    private static $instance = [];
 
-    /** Store each executed requests meta data to analyze the times, number of
-      * requests, debugging
-      */
-    private static $meta = array();
+    /**
+     * Store each executed requests meta data to analyze the times, number of
+     * requests, debugging
+     */
+    private static $meta = [];
 
-    /** Connection to the database engine
-      * See http://fr2.php.net/manual/en/pdo.construct.php for the $dsn format
-      * @param string $dsn PDO Data Source Name
-      * @param string|null $username Username to connect
-      * @param string|null $password Password to connect
-      * @param string|null $driver_options Driver options to the database
-      */
+    /**
+     * Connection to the database engine
+     * See http://fr2.php.net/manual/en/pdo.construct.php for the $dsn format
+     * @param string $dsn PDO Data Source Name
+     * @param string|null $username Username to connect
+     * @param string|null $password Password to connect
+     * @param string|null $driver_options Driver options to the database
+     */
     public function __construct(
         $dsn,
         $username = null,
@@ -79,13 +96,14 @@ class Dblayeroo
         $this->connect($dsn, $username, $password, $driver_options);
     }
 
-    /** Connection to the database engine
-      * See http://fr2.php.net/manual/en/pdo.construct.php for the $dsn format
-      * @param string $dsn PDO Data Source Name
-      * @param string|null $username Username to connect
-      * @param string|null $password Password to connect
-      * @param string|null $driver_options Driver options to the database
-      */
+    /**
+     * Connection to the database engine
+     * See http://fr2.php.net/manual/en/pdo.construct.php for the $dsn format
+     * @param string $dsn PDO Data Source Name
+     * @param string|null $username Username to connect
+     * @param string|null $password Password to connect
+     * @param string|null $driver_options Driver options to the database
+     */
     public function connect(
         $dsn,
         $username = null,
@@ -103,7 +121,7 @@ class Dblayeroo
             $this->DBException(dgettext("domframework", "No valid DSN provided"));
         }
         $driver[0] = strtolower($driver[0]);
-        if (! in_array($driver[0], pdo_drivers())) {
+        if (! in_array($driver[0], pdo_drivers(), true)) {
             $this->DBException(sprintf(
                 dgettext(
                     "domframework",
@@ -243,59 +261,64 @@ class Dblayeroo
         return self::$instance[$this->dsn];
     }
 
-    /** This function disconnect the database. It is normally only used in phpunit
-      * unit tests
-      */
+    /**
+     * This function disconnect the database. It is normally only used in phpunit
+     * unit tests
+     */
     public function disconnect()
     {
         unset(self::$instance[$this->dsn]);
         self::$sortOrder = 0;
     }
 
-    /** Start a new Transaction
-      */
+    /**
+     * Start a new Transaction
+     */
     public function beginTransaction()
     {
-        self::$meta[] = array(
+        self::$meta[] = [
         "command"      => "BEGIN",
         "sql"          => "BEGIN TRANSACTION",
         "sqltime"      => 0,
         "displayQuery" => "BEGIN TRANSACTION",
         "nbrows"       => 0,
-        );
+        ];
         return self::$instance[$this->dsn]->beginTransaction();
     }
 
-    /** Commit (validate) a transaction
-      */
+    /**
+     * Commit (validate) a transaction
+     */
     public function commit()
     {
-        self::$meta[] = array(
+        self::$meta[] = [
         "command"      => "COMMIT",
         "sql"          => "COMMIT TRANSACTION",
         "sqltime"      => 0,
         "displayQuery" => "COMMIT TRANSACTION",
         "nbrows"       => 0,
-        );
+        ];
         return self::$instance[$this->dsn]->commit();
     }
 
-    /** RollBack a transaction
-      */
+    /**
+     * RollBack a transaction
+     */
     public function rollback()
     {
-        self::$meta[] = array(
+        self::$meta[] = [
         "command"      => "ROLLBACK",
         "sql"          => "ROLLBACK TRANSACTION",
         "sqltime"      => 0,
         "displayQuery" => "ROLLBACK TRANSACTION",
         "nbrows"       => 0,
-        );
+        ];
         return self::$instance[$this->dsn]->rollback();
     }
 
-    /** Return the connected database name from DSN used to connect
-      */
+    /**
+     * Return the connected database name from DSN used to connect
+     */
     public function databasename()
     {
         if ($this->sep === "") {
@@ -309,7 +332,7 @@ class Dblayeroo
             return null;
         }
         $vals = explode(";", substr(strstr($this->dsn, ":"), 1));
-        $dsnExplode = array();
+        $dsnExplode = [];
         foreach ($vals as $val) {
             @list($k, $v) = explode("=", $val);
             $dsnExplode[$k] = $v;
@@ -320,8 +343,9 @@ class Dblayeroo
         return null;
     }
 
-    /** Return all the tables available in the database
-      */
+    /**
+     * Return all the tables available in the database
+     */
     public function listTables()
     {
         if ($this->sep === "") {
@@ -332,7 +356,7 @@ class Dblayeroo
                 $req = "SELECT name FROM sqlite_master WHERE type='table'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     if ($d["name"] !== "sqlite_sequence") {
                         $res[] = $d["name"];
@@ -345,7 +369,7 @@ class Dblayeroo
               WHERE TABLE_SCHEMA='" . $this->databasename() . "'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     $res[] = $d["TABLE_NAME"];
                 }
@@ -356,7 +380,7 @@ class Dblayeroo
               WHERE schemaname = 'public'";
                 $st = self::$instance[$this->dsn]->prepare($req);
                 $st->execute();
-                $res = array();
+                $res = [];
                 while ($d = $st->fetch(\PDO::FETCH_ASSOC)) {
                     $res[] = $d["tablename"];
                 }
@@ -371,22 +395,23 @@ class Dblayeroo
         return array_values($res);
     }
 
-    /** Create the table defined by the differents fields.
-      * Define the SQL syntax based on SQL engines
-      * $table = "dns zones";
-      * $fields = array (
-      *   "id"=>array ("integer", "not null", "autoincrement"),
-      *   "zo ne"=>array ("varchar(255)", "not null"),
-      *   "vie wname"=>array ("varchar(255)"),
-      *   "view clients"=>array ("varchar(255)"),
-      *   "comme nt"=>array ("varchar(1024)"),
-      *   "opendate"=>array ("datetime", "not null"),
-      *   "closedate"=>array ("datetime"),
-      * );
-      * $primary = "id";
-      * $unique = array ("id", array ("zo ne", "vie wname"));
-      * $foreign = array ("zone"=>"table.field", ...);
-      */
+    /**
+     * Create the table defined by the differents fields.
+     * Define the SQL syntax based on SQL engines
+     * $table = "dns zones";
+     * $fields = array (
+     *   "id"=>array ("integer", "not null", "autoincrement"),
+     *   "zo ne"=>array ("varchar(255)", "not null"),
+     *   "vie wname"=>array ("varchar(255)"),
+     *   "view clients"=>array ("varchar(255)"),
+     *   "comme nt"=>array ("varchar(1024)"),
+     *   "opendate"=>array ("datetime", "not null"),
+     *   "closedate"=>array ("datetime"),
+     * );
+     * $primary = "id";
+     * $unique = array ("id", array ("zo ne", "vie wname"));
+     * $foreign = array ("zone"=>"table.field", ...);
+     */
     public function createTable()
     {
         $this->debugLog("Entering createTable", 2);
@@ -658,7 +683,7 @@ class Dblayeroo
                     }
                     // Name of field
                     $sql .= "\"$field\" ";
-                    if (in_array("autoincrement", $params)) {
+                    if (in_array("autoincrement", $params, true)) {
                         if ($this->primary !== $field) {
                             throw new \Exception(sprintf(
                                 dgettext(
@@ -774,8 +799,9 @@ class Dblayeroo
         return self::$instance[$this->dsn]->exec($sql);
     }
 
-    /** Drop the table
-      */
+    /**
+     * Drop the table
+     */
     public function dropTable()
     {
         $this->debugLog("Entering dropTable ()", 2);
@@ -793,9 +819,10 @@ class Dblayeroo
         return self::$instance[$this->dsn]->exec($sql);
     }
 
-    /** Get the informations about a table
-      * @param string $tableName The table to examine
-      */
+    /**
+     * Get the informations about a table
+     * @param string $tableName The table to examine
+     */
     public function getTableSchema($tableName)
     {
         $this->debugLog("Entering getTableSchema (", $tableName, ")", 2);
@@ -806,9 +833,9 @@ class Dblayeroo
                 );
                 $st->execute();
                 $content = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $fields = array();
-                $unique = array();
-                $foreign = array();
+                $fields = [];
+                $unique = [];
+                $foreign = [];
                 $primary = "";
                 foreach ($content as $row) {
                     $type = str_replace(" ", "", strtolower($row["type"]));
@@ -833,7 +860,7 @@ class Dblayeroo
                     $st->execute();
                     $content2 = $st->fetchAll(\PDO::FETCH_ASSOC);
                     if (count($content2) > 1) {
-                        $index = array();
+                        $index = [];
                         foreach ($content2 as $c2) {
                             $index[] = $c2["name"];
                         }
@@ -844,7 +871,7 @@ class Dblayeroo
                     }
                 }
                 ksort($unique);
-                if (! in_array($primary, $unique)) {
+                if (! in_array($primary, $unique, true)) {
                     $unique[] = $primary;
                 }
 
@@ -867,7 +894,7 @@ class Dblayeroo
                 $st->execute();
                 $content = $st->fetchAll(\PDO::FETCH_ASSOC);
                 foreach ($content as $for) {
-                    $tmp = array($for["table"], $for["to"]);
+                    $tmp = [$for["table"], $for["to"]];
                     $cascade = "";
                     if ($for["on_update"] !== "NO ACTION") {
                         $cascade .= "ON UPDATE " . $for["on_update"];
@@ -881,7 +908,7 @@ class Dblayeroo
                     $foreign[$for["from"]] = $tmp;
                 }
 
-                $foreignUsed = array();
+                $foreignUsed = [];
                 foreach ($this->listTables() as $tbl) {
                     $st = self::$instance[$this->dsn]->prepare(
                         "PRAGMA foreign_key_list($tbl)"
@@ -892,17 +919,17 @@ class Dblayeroo
                         if ($row["table"] !== $tableName) {
                             continue;
                         }
-                        $foreignUsed[$row["to"]][] = array(
+                        $foreignUsed[$row["to"]][] = [
                             $tbl, $row["from"]
-                            );
+                            ];
                     }
                 }
-                return array("table"       => $tableName,
+                return ["table"       => $tableName,
                     "fields"      => $fields,
                     "primary"     => $primary,
                     "unique"      => $unique,
                     "foreign"     => $foreign,
-                    "foreignUsed" => $foreignUsed);
+                    "foreignUsed" => $foreignUsed];
                 break;
             case "mysql":
                 $st = self::$instance[$this->dsn]->prepare(
@@ -910,12 +937,12 @@ class Dblayeroo
                 );
                 $st->execute();
                 $content = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $fields = array();
-                $unique = array();
-                $foreign = array("TBD");
+                $fields = [];
+                $unique = [];
+                $foreign = ["TBD"];
                 $primary = "";
                 foreach ($content as $col) {
-                    $tmp = array();
+                    $tmp = [];
                     if ($col["Type"] === "int(11)") {
                         $tmp[] = "integer";
                     } else {
@@ -943,7 +970,7 @@ class Dblayeroo
                         }
                         if (array_key_exists($col["Key_name"], $unique)) {
                             if (!is_array($unique[$col["Key_name"]])) {
-                                $unique[$col["Key_name"]] = array($unique[$col["Key_name"]]);
+                                $unique[$col["Key_name"]] = [$unique[$col["Key_name"]]];
                             }
                             $unique[$col["Key_name"]][] = $col["Column_name"];
                         } else {
@@ -952,7 +979,7 @@ class Dblayeroo
                     }
                 }
                 $unique = array_values($unique);
-                if (! in_array($primary, $unique)) {
+                if (! in_array($primary, $unique, true)) {
                     $unique[] = $primary;
                 }
                 $st = self::$instance[$this->dsn]->prepare("
@@ -963,12 +990,12 @@ class Dblayeroo
             WHERE rCons.CONSTRAINT_SCHEMA=:dbname AND rCons.TABLE_NAME=:table
               AND rCons.CONSTRAINT_NAME=kColUsage.CONSTRAINT_NAME
               AND rCons.CONSTRAINT_SCHEMA=kColUsage.CONSTRAINT_SCHEMA");
-                $st->execute(array(':dbname' => $this->databasename(),
-                          ':table' => $tableName));
+                $st->execute([':dbname' => $this->databasename(),
+                          ':table' => $tableName]);
                 $foreignTmp = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $foreign = array();
+                $foreign = [];
                 foreach ($foreignTmp as $f) {
-                    $tmp = array();
+                    $tmp = [];
                     $tmp[] = $f["REFERENCED_TABLE_NAME"];
                     $tmp[] = $f["REFERENCED_COLUMN_NAME"];
                     $tmp[2] = "";
@@ -1000,26 +1027,26 @@ class Dblayeroo
                           TABLE_SCHEMA=:dbname
                     ORDER BY TABLE_NAME ASC
                 ");
-                $st->execute(array(':dbname' => $this->databasename(),
-                          ':table' => $tableName));
+                $st->execute([':dbname' => $this->databasename(),
+                          ':table' => $tableName]);
                 $foreignUsedTmp = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $foreignUsed = array();
+                $foreignUsed = [];
                 foreach ($foreignUsedTmp as $f) {
-                    $foreignUsed[$f["REFERENCED_COLUMN_NAME"]][] = array(
+                    $foreignUsed[$f["REFERENCED_COLUMN_NAME"]][] = [
                     $f["TABLE_NAME"],
-                    $f["COLUMN_NAME"]);
+                    $f["COLUMN_NAME"]];
                 }
-                return array("table"       => $tableName,
+                return ["table"       => $tableName,
                     "fields"      => $fields,
                     "primary"     => $primary,
                     "unique"      => $unique,
                     "foreign"     => $foreign,
-                    "foreignUsed" => $foreignUsed);
+                    "foreignUsed" => $foreignUsed];
                 break;
             case "pgsql":
-                $fields = array();
-                $unique = array();
-                $foreign = array();
+                $fields = [];
+                $unique = [];
+                $foreign = [];
                 $primary = "";
                 // Get the defined primary key if not autoincrement
                 $st = self::$instance[$this->dsn]->prepare("
@@ -1030,7 +1057,7 @@ class Dblayeroo
         WHERE  i.indrelid = :table::regclass
         AND    i.indisprimary;
         ");
-                $st->execute(array(':table' => $tableName));
+                $st->execute([':table' => $tableName]);
                 $content = $st->fetchAll(\PDO::FETCH_ASSOC);
                 if (key_exists(0, $content)) {
                     $primary = $content[0]["attname"];
@@ -1044,7 +1071,7 @@ class Dblayeroo
                 $st->execute();
                 $content = $st->fetchAll(\PDO::FETCH_ASSOC);
                 foreach ($content as $col) {
-                    $tmp = array();
+                    $tmp = [];
                     if ($col["data_type"] === "character varying") {
                         $tmp[] = "varchar(" . $col["character_maximum_length"] . ")";
                     } else {
@@ -1071,15 +1098,15 @@ class Dblayeroo
                     if (array_key_exists($col["constraint_name"], $unique)) {
                         if (! is_array($unique[$col["constraint_name"]])) {
                             $unique[$col["constraint_name"]] =
-                            array($unique[$col["constraint_name"]]);
+                            [$unique[$col["constraint_name"]]];
                         }
                         $unique[$col["constraint_name"]][] = $col["column_name"];
-                    } elseif (! in_array($col["column_name"], $unique)) {
+                    } elseif (! in_array($col["column_name"], $unique, true)) {
                         $unique[$col["constraint_name"]] = $col["column_name"];
                     }
                 }
                 $unique = array_values($unique);
-                if (! in_array($primary, $unique)) {
+                if (! in_array($primary, $unique, true)) {
                     $unique[] = $primary;
                 }
                 $st = self::$instance[$this->dsn]->prepare("
@@ -1094,12 +1121,12 @@ class Dblayeroo
           AND rCons.constraint_name=kColUsage1.constraint_name
           AND rCons.unique_constraint_name=kColUsage2.constraint_name
       ");
-                $st->execute(array(':dbname' => $this->databasename(),
-                          ':table' => $tableName));
+                $st->execute([':dbname' => $this->databasename(),
+                          ':table' => $tableName]);
                 $foreignTmp = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $foreign = array();
+                $foreign = [];
                 foreach ($foreignTmp as $f) {
-                    $tmp = array();
+                    $tmp = [];
                     $tmp[] = $f["referenced_table_name"];
                     $tmp[] = $f["referenced_column_name"];
                     $tmp[2] = "";
@@ -1140,24 +1167,24 @@ class Dblayeroo
         ORDER BY kColUsage1.table_name
       ");
                 $st->execute(
-                    array(':dbname' => $this->databasename(),
-                      ':table' => $tableName)
+                    [':dbname' => $this->databasename(),
+                      ':table' => $tableName]
                 );
 
                 $foreignUsedTmp = $st->fetchAll(\PDO::FETCH_ASSOC);
-                $foreignUsed = array();
+                $foreignUsed = [];
                 foreach ($foreignUsedTmp as $f) {
-                    $foreignUsed[$f["referenced_column_name"]][] = array(
+                    $foreignUsed[$f["referenced_column_name"]][] = [
                     $f["table_name"],
-                    $f["column_name"]);
+                    $f["column_name"]];
                 }
 
-                return array("table"       => $tableName,
+                return ["table"       => $tableName,
                     "fields"      => $fields,
                     "primary"     => $primary,
                     "unique"      => $unique,
                     "foreign"     => $foreign,
-                    "foreignUsed" => $foreignUsed);
+                    "foreignUsed" => $foreignUsed];
                 break;
             default:
                 $this->DBException(dgettext(
@@ -1167,9 +1194,10 @@ class Dblayeroo
         }
     }
 
-    /** Return the type of the provided field
-      * @param string $field The field to get the type
-      */
+    /**
+     * Return the type of the provided field
+     * @param string $field The field to get the type
+     */
     private function fieldTypeComplete($field)
     {
         //    $this->debugLog ("Entering fieldTypeComplete (",$field,")", 2);
@@ -1196,10 +1224,11 @@ class Dblayeroo
         return $type;
     }
 
-    /** Return the type of the provided field. For varchar(255), return only
-      * varchar
-      * @param string $field The field to get the type
-      */
+    /**
+     * Return the type of the provided field. For varchar(255), return only
+     * varchar
+     * @param string $field The field to get the type
+     */
     private function fieldTypeLight($field)
     {
         $type = $this->fieldTypeComplete($field);
@@ -1207,9 +1236,10 @@ class Dblayeroo
         return $type;
     }
 
-    /** Return the length of a field (generally a varchar)
-      * @param string $field The field to get the type
-      */
+    /**
+     * Return the length of a field (generally a varchar)
+     * @param string $field The field to get the type
+     */
     private function fieldLength($field)
     {
         $type = $this->fieldTypeComplete($field);
@@ -1233,9 +1263,10 @@ class Dblayeroo
     /////////////////////////////
     ///   GETTERS / SETTERS   ///
     /////////////////////////////
-    /** Get/Set the table property
-      * @param string|null $table The table to use
-      */
+    /**
+     * Get/Set the table property
+     * @param string|null $table The table to use
+     */
     public function table($table = null)
     {
         $this->debugLog("Entering table (", $table, ")", 2);
@@ -1252,9 +1283,10 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the tableprefix property
-      * @param string|null $tableprefix The prefix to append
-      */
+    /**
+     * Get/Set the tableprefix property
+     * @param string|null $tableprefix The prefix to append
+     */
     public function tableprefix($tableprefix = null)
     {
         $this->debugLog("Entering tableprefix (", $tableprefix, ")", 2);
@@ -1272,11 +1304,12 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the fields property
-      * The fields to define are in the format:
-      * array ("fieldName"=>array ("type"[, "not null"[, "autoincrement"]]))
-      * @param array|null $fields The fields to define
-      */
+    /**
+     * Get/Set the fields property
+     * The fields to define are in the format:
+     * array ("fieldName"=>array ("type"[, "not null"[, "autoincrement"]]))
+     * @param array|null $fields The fields to define
+     */
     public function fields($fields = null)
     {
         $this->debugLog("Entering fields (VALUE)", 2);
@@ -1356,13 +1389,14 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get all the fields with the table name if needed.
-      * If the objectJoin is set, return the fields name too
-      * @param boolean|null $full Add the table name if the $full is set
-      */
+    /**
+     * Get all the fields with the table name if needed.
+     * If the objectJoin is set, return the fields name too
+     * @param boolean|null $full Add the table name if the $full is set
+     */
     public function fieldsAll($full = false)
     {
-        $fields = array();
+        $fields = [];
         if ($this->joinObject) {
             foreach ($this->joinObject as $obj) {
                 $fields = array_merge($fields, $obj->fieldsAll(true));
@@ -1380,9 +1414,10 @@ class Dblayeroo
         return $fields;
     }
 
-    /** Get/Set the primary property
-      * @param string|null $primary The primary key to use
-      */
+    /**
+     * Get/Set the primary property
+     * @param string|null $primary The primary key to use
+     */
     public function primary($primary = null)
     {
         $this->debugLog("Entering primary (", $primary, ")", 2);
@@ -1402,9 +1437,10 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the unique property
-      * @param array|null $unique The unique fields constraint to add
-      */
+    /**
+     * Get/Set the unique property
+     * @param array|null $unique The unique fields constraint to add
+     */
     public function unique($unique = null)
     {
         $this->debugLog("Entering unique (VALUE)", 2);
@@ -1439,14 +1475,15 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the foreign property
-      * @param array|null $foreign The definition of the foreign constraint
-      * The format is :
-      * array (
-      *   "field" => array ("parentTable", "parentField", "options if needed"),
-      * )
-      * Multiple field and parnentField can be provided, separated by comma
-      */
+    /**
+     * Get/Set the foreign property
+     * @param array|null $foreign The definition of the foreign constraint
+     * The format is :
+     * array (
+     *   "field" => array ("parentTable", "parentField", "options if needed"),
+     * )
+     * Multiple field and parnentField can be provided, separated by comma
+     */
     public function foreign($foreign = null)
     {
         $this->debugLog("Entering foreign (VALUE)", 2);
@@ -1516,9 +1553,10 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the debug property
-      * @param integer|null $debug Set the debug value
-      */
+    /**
+     * Get/Set the debug property
+     * @param integer|null $debug Set the debug value
+     */
     public function debug($debug = null)
     {
         $this->debugLog("Entering debug (", $debug, ")", 2);
@@ -1532,16 +1570,18 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get the sep property
-      */
+    /**
+     * Get the sep property
+     */
     public function sep()
     {
         return $this->sep;
     }
 
-    /** Get/Set the dsn property
-      * @param string|null $dsn Set the DSN property of PDO
-      */
+    /**
+     * Get/Set the dsn property
+     * @param string|null $dsn Set the DSN property of PDO
+     */
     public function dsn($dsn = null)
     {
         $this->debugLog("Entering dsn (", $dsn, ")", 2);
@@ -1555,10 +1595,11 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get/Set the titles property
-      * @param array|null $titles The titles of the fields
-      * @param boolean|null $full Add the table name if the $full is set
-      */
+    /**
+     * Get/Set the titles property
+     * @param array|null $titles The titles of the fields
+     * @param boolean|null $full Add the table name if the $full is set
+     */
     public function titles($titles = null, $full = false)
     {
         $this->debugLog("Entering titles (VALUE)", 2);
@@ -1566,7 +1607,7 @@ class Dblayeroo
             if ($full === false && $this->joinObject === null) {
                 return $this->titles;
             }
-            $titles = array();
+            $titles = [];
             foreach ($this->titles as $key => $val) {
                 $titles[$this->tableprefix . $this->table . "." . $key] = $val;
             }
@@ -1600,32 +1641,34 @@ class Dblayeroo
         return $this;
     }
 
-    /** Dump the configuration of the table in an array
-      */
+    /**
+     * Dump the configuration of the table in an array
+     */
     public function exportConf()
     {
-        return array("table" => $this->table,
+        return ["table" => $this->table,
                   "tableprefix" => $this->tableprefix,
                   "fields" => $this->fields,
                   "primary" => $this->primary,
                   "unique" => $this->unique,
                   "foreign" => $this->foreign,
                   "titles" => $this->titles,
-                  );
+                  ];
     }
 
-    /** Define a real type array
-      * Must be array ("field" => "realtype")
-      * @param array $realTypes The realTypes to set
-      * The allowed real types are defined in test method :
-      *   checkRealType_TYPE ($val, $definition)
-      * The allowed real types are : mail, date, datetime, allowedchars(a23d),
-      * uuid, time, array('val1','val2','val3'), regex(/^[a-zA-Z]{3,}$/i)
-      * integer, integerPositive,
-      * To be done :
-      * integerNegative,
-      * php_function(), function($val) { if ($val > 0) return "MESSAGE";}
-      */
+    /**
+     * Define a real type array
+     * Must be array ("field" => "realtype")
+     * @param array $realTypes The realTypes to set
+     * The allowed real types are defined in test method :
+     *   checkRealType_TYPE ($val, $definition)
+     * The allowed real types are : mail, date, datetime, allowedchars(a23d),
+     * uuid, time, array('val1','val2','val3'), regex(/^[a-zA-Z]{3,}$/i)
+     * integer, integerPositive,
+     * To be done :
+     * integerNegative,
+     * php_function(), function($val) { if ($val > 0) return "MESSAGE";}
+     */
     public function realTypes($realTypes = null)
     {
         if ($realTypes === null) {
@@ -1651,91 +1694,110 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get the meta data or clear them.
-      * The meta data are all the requests done by the dblayeroo, the time needed
-      * for each, the number of rows returned by the SQL server.
-      * They allow to debug the app
-      * @param boolean|null $meta If meta is set, clear the meta-data. If not set,
-      * return the actual value of the meta-data
-      * @return array or $this
-      */
+    /**
+     * Get the meta data or clear them.
+     * The meta data are all the requests done by the dblayeroo, the time needed
+     * for each, the number of rows returned by the SQL server.
+     * They allow to debug the app
+     * @param boolean|null $meta If meta is set, clear the meta-data. If not set,
+     * return the actual value of the meta-data
+     * @return array or $this
+     */
     public function meta($meta = null)
     {
         if ($meta === null) {
             return self::$meta;
         }
-        self::$meta = array();
+        self::$meta = [];
         return $this;
     }
 
     /////////////////////////////////////
     ///   MANAGE THE REQUEST BY OOP   ///
     /////////////////////////////////////
-    /** The command to use
-      */
+    /**
+     * The command to use
+     */
     private $command = "";
-    /** The DISTINCT option
-      */
+    /**
+     * The DISTINCT option
+     */
     private $distinct = "";
-    /** The columns to display in SELECT, with the tables names and the separators
-      * correctely defined
-      */
+    /**
+     * The columns to display in SELECT, with the tables names and the separators
+     * correctely defined
+     */
     private $displayColumn = null;
-    /** The alias associated to each displayColumn
-      */
-    private $displayAlias = array();
-    /** Manage the joins
-      */
-    private $joins = array();
-    /** The WHERE expression
-      */
-    private $whereExpression = array();
-    /** The values for each parameter for the WHERE condition
-      */
-    private $whereValues = array();
-    /** The columns in GROUP BY condition
-      */
+    /**
+     * The alias associated to each displayColumn
+     */
+    private $displayAlias = [];
+    /**
+     * Manage the joins
+     */
+    private $joins = [];
+    /**
+     * The WHERE expression
+     */
+    private $whereExpression = [];
+    /**
+     * The values for each parameter for the WHERE condition
+     */
+    private $whereValues = [];
+    /**
+     * The columns in GROUP BY condition
+     */
     private $groupByExpression = null;
-    /** The ORDER expression
-      */
-    private $orderExpression = array();
-    /** The LIMIT expression
-      */
+    /**
+     * The ORDER expression
+     */
+    private $orderExpression = [];
+    /**
+     * The LIMIT expression
+     */
     private $limitExpression = "";
-    /** The values to SET in INSERT/UPDATE
-      */
-    private $setValues = array();
-    /** The types to SET in INSERT/UPDATE
-      */
-    private $setType = array();
-    /** The dblayeroo object of the foreign keys tables to check
-      */
-    private $setForeignObj = array();
+    /**
+     * The values to SET in INSERT/UPDATE
+     */
+    private $setValues = [];
+    /**
+     * The types to SET in INSERT/UPDATE
+     */
+    private $setType = [];
+    /**
+     * The dblayeroo object of the foreign keys tables to check
+     */
+    private $setForeignObj = [];
 
-    /** If we need to join this object with another one, save the second one in
-      * this property
-      */
+    /**
+     * If we need to join this object with another one, save the second one in
+     * this property
+     */
     private $joinObject;
 
-    /** The debug depth (as we clone object, the depth is increased to debug
-      * easily the functions
-      */
+    /**
+     * The debug depth (as we clone object, the depth is increased to debug
+     * easily the functions
+     */
     protected $debugDepth = 1;
 
-    /** The sort order of select/order entries crossed the differents objects
-      */
+    /**
+     * The sort order of select/order entries crossed the differents objects
+     */
     private static $sortOrder = 0;
 
-    /** The method to get a new sort order acrossed the differents objects
-      */
+    /**
+     * The method to get a new sort order acrossed the differents objects
+     */
     public function getSortOrder()
     {
         ++self::$sortOrder;
         return "order" . self::$sortOrder;
     }
 
-    /** Reinit the SQL request
-      */
+    /**
+     * Reinit the SQL request
+     */
     public function clearRequest()
     {
         $this->debugLog("Entering clearRequest ()", 2);
@@ -1748,25 +1810,26 @@ class Dblayeroo
         $this->command = "";
         $this->distinct = "";
         $this->displayColumn = null;
-        $this->displayAlias = array();
-        $this->joins = array();
-        $this->whereExpression = array();
-        $this->whereValues = array();
+        $this->displayAlias = [];
+        $this->joins = [];
+        $this->whereExpression = [];
+        $this->whereValues = [];
         $this->groupByExpression = null;
-        $this->orderExpression = array();
+        $this->orderExpression = [];
         $this->limitExpression = "";
-        $this->setValues = array();
-        $this->setType = array();
+        $this->setValues = [];
+        $this->setType = [];
         // The foreign keys can be defined in the constructor for all the
         // modifications checks. No need to remove them
         //$this->setForeignObj = array ();
         return $this;
     }
 
-    /** Define a new foreign object
-      * @param object $object The dblayeroo object to use for foreign constraint
-      * checks
-      */
+    /**
+     * Define a new foreign object
+     * @param object $object The dblayeroo object to use for foreign constraint
+     * checks
+     */
     public function setForeignObj($object)
     {
         $this->debugLog("Entering setForeignObj (OBJECT)", 2);
@@ -1791,84 +1854,92 @@ class Dblayeroo
         return $this;
     }
 
-    /** Define the command to execute. Can be
-      * "SELECT", "INSERT", "DELETE", "UPDATE".
-      * @param string $command The command to execute
-      */
+    /**
+     * Define the command to execute. Can be
+     * "SELECT", "INSERT", "DELETE", "UPDATE".
+     * @param string $command The command to execute
+     */
     public function command($command)
     {
         $this->debugLog("Entering command (", $command, ")", 2);
-        $allowed = array("SELECT", "INSERT", "DELETE", "UPDATE");
+        $allowed = ["SELECT", "INSERT", "DELETE", "UPDATE"];
         if (! is_string($command)) {
             $this->DBException("Invalid command provided (not string)");
         }
         $command = strtoupper($command);
-        if (! in_array($command, $allowed)) {
+        if (! in_array($command, $allowed, true)) {
             $this->DBException("Invalid command provided (unknown command)");
         }
         $this->command = $command;
         return $this;
     }
 
-    /** Alias of command ("SELECT")
-      */
+    /**
+     * Alias of command ("SELECT")
+     */
     public function select()
     {
         $this->command = "SELECT";
         return $this;
     }
 
-    /** Alias of command ("INSERT")
-      */
+    /**
+     * Alias of command ("INSERT")
+     */
     public function insert()
     {
         $this->command = "INSERT";
         return $this;
     }
 
-    /** Alias of command ("DELETE")
-      */
+    /**
+     * Alias of command ("DELETE")
+     */
     public function delete()
     {
         $this->command = "DELETE";
         return $this;
     }
 
-    /** Alias of command ("UPDATE")
-      */
+    /**
+     * Alias of command ("UPDATE")
+     */
     public function update()
     {
         $this->command = "UPDATE";
         return $this;
     }
 
-    /** Set the DISTINCT option
-      */
+    /**
+     * Set the DISTINCT option
+     */
     public function setDistinct()
     {
         $this->distinct = "DISTINCT";
         return $this;
     }
 
-    /** Changing the name displayColumns to displayAdd
-      * @param array|string|null $columnNames The columns name, separated by comma
-      * @deprecated 0.36
-      */
-    public function displayColumn($columnNames = array())
+    /**
+     * Changing the name displayColumns to displayAdd
+     * @param array|string|null $columnNames The columns name, separated by comma
+     * @deprecated 0.36
+     */
+    public function displayColumn($columnNames = [])
     {
         return $this->displayAdd($columnNames);
     }
 
-    /** Set the columns to display for the next SELECT request.
-      * The columns are ordered by the first added to the last added
-      * @param array|string|null $columnNames The columns name, separated by comma
-      * By default, display all the columns if this method is not called
-      * If the value is null or not provided or an empty array, do not display
-      * any field
-      * @param array|string|null $aliasNames Add the Aliases to the displayed
-      * columns
-      */
-    public function displayAdd($columnNames = array(), $aliasNames = array())
+    /**
+     * Set the columns to display for the next SELECT request.
+     * The columns are ordered by the first added to the last added
+     * @param array|string|null $columnNames The columns name, separated by comma
+     * By default, display all the columns if this method is not called
+     * If the value is null or not provided or an empty array, do not display
+     * any field
+     * @param array|string|null $aliasNames Add the Aliases to the displayed
+     * columns
+     */
+    public function displayAdd($columnNames = [], $aliasNames = [])
     {
         $this->debugLog(
             "Entering displayAdd (",
@@ -1892,7 +1963,7 @@ class Dblayeroo
             // A string must be separated by comma. But comma can be also in function
             // parameter like GROUP_CONCAT(group,','),field1,field2
             // This block will explode on comma but only if not in a parenthesis block
-            $tmpArr = array();
+            $tmpArr = [];
             $parenthesis = false;
             $tmp = "";
             for ($i = 0; $i < strlen($columnNames); $i++) {
@@ -1927,7 +1998,7 @@ class Dblayeroo
         }
         // If there is no provided names, reset all the defined ones
         if (count($columnNames) === 0) {
-            $this->displayColumn = array();
+            $this->displayColumn = [];
         }
         foreach ($columnNames as $nb => $display) {
             if (! is_string($display)) {
@@ -1942,8 +2013,8 @@ class Dblayeroo
                 $name = trim(substr($name, $pos + 1, -1));
                 $separator = "";
                 if (
-                    in_array($func, array("AVG", "COUNT", "GROUP_CONCAT", "MAX",
-                                    "MIN","SUM"))
+                    in_array($func, ["AVG", "COUNT", "GROUP_CONCAT", "MAX",
+                                    "MIN","SUM"], true)
                 ) {
                     $aggregateFunction = true;
                     // Aggregate function. Add the non aggregate fields to the GROUP BY
@@ -1953,7 +2024,7 @@ class Dblayeroo
                         // there is no already defined displayed Columns.
                         // Used if the group by is called from join object
                         if ($this->displayColumn === null) {
-                            $this->groupByExpression = array();
+                            $this->groupByExpression = [];
                         } else {
                             $this->groupByExpression = $this->displayColumn;
                         }
@@ -2017,24 +2088,25 @@ class Dblayeroo
         return $this;
     }
 
-    /** Return the name of the display field, with $this->sep
-      * Add the table prefix/name if full is set
-      * Allow :
-      *   name,
-      *   DISTINCT name,
-      *   $this->sep.$name.$this->sep,
-      *   DISTINCT $this->sep.$name.$this->sep,
-      *   func(name),
-      *   func(DISTINCT name),
-      *   func($this->sep.$name.$this->sep),
-      *   func(DISTINCT $this->sep.$name.$this->sep),
-      *   func($this->sep.$this->tableprefix.$this->table.$this->sep.".".
-      *        $this->sep.$name.$this->sep)
-      *   func(DISTINCT $this->sep.$this->tableprefix.$this->table.$this->sep.".".
-      *        $this->sep.$name.$this->sep)
-      * @param string $name The name of the field
-      * @param boolean|null $full Add the table prefix/name if set
-      */
+    /**
+     * Return the name of the display field, with $this->sep
+     * Add the table prefix/name if full is set
+     * Allow :
+     *   name,
+     *   DISTINCT name,
+     *   $this->sep.$name.$this->sep,
+     *   DISTINCT $this->sep.$name.$this->sep,
+     *   func(name),
+     *   func(DISTINCT name),
+     *   func($this->sep.$name.$this->sep),
+     *   func(DISTINCT $this->sep.$name.$this->sep),
+     *   func($this->sep.$this->tableprefix.$this->table.$this->sep.".".
+     *        $this->sep.$name.$this->sep)
+     *   func(DISTINCT $this->sep.$this->tableprefix.$this->table.$this->sep.".".
+     *        $this->sep.$name.$this->sep)
+     * @param string $name The name of the field
+     * @param boolean|null $full Add the table prefix/name if set
+     */
     private function displayConvert($name, $full = false)
     {
         $pos = strpos($name, "(");
@@ -2064,15 +2136,16 @@ class Dblayeroo
         return $name;
     }
 
-    /** Get the columns set in the query by displayAdd. If the $full parameter
-      * is set, add the table prefix/name to the result.
-      * If the join object is set, ask to it the columns too
-      * @param boolean $full  Add the table prefix/name if set
-      */
+    /**
+     * Get the columns set in the query by displayAdd. If the $full parameter
+     * is set, add the table prefix/name to the result.
+     * If the join object is set, ask to it the columns too
+     * @param boolean $full  Add the table prefix/name if set
+     */
     public function displayGet($full = false)
     {
-        $columns = array();
-        $displayColumn = array();
+        $columns = [];
+        $displayColumn = [];
         if ($this->joinObject) {
             // The join object will be added at the end
             $full = true;
@@ -2116,51 +2189,55 @@ class Dblayeroo
         return $columns;
     }
 
-    /** Do a inner join between two dblayer objects
-      * The join array is a associated array with local field as key and distant
-      * field as value
-      * @param object $object The dblayeroo object to use for searching the join
-      * data
-      * @param array $joinArray The values to search for join
-      */
+    /**
+     * Do a inner join between two dblayer objects
+     * The join array is a associated array with local field as key and distant
+     * field as value
+     * @param object $object The dblayeroo object to use for searching the join
+     * data
+     * @param array $joinArray The values to search for join
+     */
     public function joinInner($object, $joinArray)
     {
         $this->debugLog("Entering joinInner (OBJECT, JOINARRAY)", 2);
         return $this->joinReal("INNER", $object, $joinArray);
     }
 
-    /** Do a left join between two dblayer objects
-      * The join array is a associated array with local field as key and distant
-      * field as value
-      * @param object $object The dblayeroo object to use for searching the join
-      * data
-      * @param array $joinArray The values to search for join
-      */
+    /**
+     * Do a left join between two dblayer objects
+     * The join array is a associated array with local field as key and distant
+     * field as value
+     * @param object $object The dblayeroo object to use for searching the join
+     * data
+     * @param array $joinArray The values to search for join
+     */
     public function joinLeft($object, $joinArray)
     {
         $this->debugLog("Entering joinLeft (OBJECT, JOINARRAY)", 2);
         return $this->joinReal("LEFT", $object, $joinArray);
     }
 
-    /** Do a right join between two dblayer objects
-      * The join array is a associated array with local field as key and distant
-      * field as value
-      * @param object $object The dblayeroo object to use for searching the join
-      * data
-      * @param array $joinArray The values to search for join
-      */
+    /**
+     * Do a right join between two dblayer objects
+     * The join array is a associated array with local field as key and distant
+     * field as value
+     * @param object $object The dblayeroo object to use for searching the join
+     * data
+     * @param array $joinArray The values to search for join
+     */
     public function joinRight($object, $joinArray)
     {
         $this->debugLog("Entering joinRight (OBJECT, JOINARRAY)", 2);
         return $this->joinReal("RIGHT", $object, $joinArray);
     }
 
-    /** Convert a CONCAT('text',field) to CONCAT('text',`table`.`field`) or
-      * generate an exception if the field is not available in table
-      * If the provided string is not a concat, return the original one
-      * @param string $concat The string to examine
-      * @param object $object The dblayer object to use
-      */
+    /**
+     * Convert a CONCAT('text',field) to CONCAT('text',`table`.`field`) or
+     * generate an exception if the field is not available in table
+     * If the provided string is not a concat, return the original one
+     * @param string $concat The string to examine
+     * @param object $object The dblayer object to use
+     */
     private function concat($concat, $object)
     {
         if (substr($concat, 0, 7) !== "CONCAT(") {
@@ -2196,19 +2273,20 @@ class Dblayeroo
         return $new;
     }
 
-    /** Do the real join
-      * @param string $joinType The join type to use ("INNER", "LEFT", "RIGHT")
-      * @param object $object The dblayeroo object to use for searching the join
-      * data
-      * @param array $joinArray The values to search for join
-      */
+    /**
+     * Do the real join
+     * @param string $joinType The join type to use ("INNER", "LEFT", "RIGHT")
+     * @param object $object The dblayeroo object to use for searching the join
+     * data
+     * @param array $joinArray The values to search for join
+     */
     private function joinReal($joinType, $object, $joinArray)
     {
         $this->debugLog("Entering joinReal (", $joinType, ", OBJECT, JOINARRAY)", 2);
         if (! is_string($joinType)) {
             $this->DBException("Invalid joinType provided to join (not string)");
         }
-        if (! in_array($joinType, array("INNER", "LEFT", "RIGHT"))) {
+        if (! in_array($joinType, ["INNER", "LEFT", "RIGHT"], true)) {
             $this->DBException("Invalid joinType provided to join (not known)");
         }
         if (! is_object($object)) {
@@ -2235,7 +2313,7 @@ class Dblayeroo
         if (empty($joinArray)) {
             $this->DBException("Invalid joinArray provided (empty array)");
         }
-        $newJoinArray = array();
+        $newJoinArray = [];
         foreach ($joinArray as $fieldLocal => $fieldToJoin) {
             if (substr($fieldLocal, 0, 7) === "CONCAT(") {
                 $fieldLocal = $this->concat($fieldLocal, $this);
@@ -2294,16 +2372,17 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get the join SQL part with recursive call of the child joins
-      * @param object|null $joinObject The joinObject to examine too
-      */
+    /**
+     * Get the join SQL part with recursive call of the child joins
+     * @param object|null $joinObject The joinObject to examine too
+     */
     public function joinsGet($joinObject = null)
     {
         $joins = "";
         if ($joinObject === null) {
             $joinObject = $this;
         }
-        if ($joinObject->joins !== array()) {
+        if ($joinObject->joins !== []) {
             $joins = implode("\n ", $joinObject->joins);
         }
         if ($joinObject->joinObject !== null) {
@@ -2314,12 +2393,13 @@ class Dblayeroo
         return trim($joins);
     }
 
-    /** Set a new WHERE expression value
-      * @param string $field The field to check
-      * @param string $operator The operator ("=", "<=", ">=", "!=", "NOT LIKE",
-      * "LIKE", "IS NULL", "REGEXP", "NOT REGEXP")
-      * @param string|null $value The value to search ("" if not provided)
-      */
+    /**
+     * Set a new WHERE expression value
+     * @param string $field The field to check
+     * @param string $operator The operator ("=", "<=", ">=", "!=", "NOT LIKE",
+     * "LIKE", "IS NULL", "REGEXP", "NOT REGEXP")
+     * @param string|null $value The value to search ("" if not provided)
+     */
     public function whereAdd($field, $operator, $value = "")
     {
         $this->debugLog(
@@ -2352,10 +2432,10 @@ class Dblayeroo
             ));
         }
         $operator = strtoupper($operator);
-        $allowed = array("=", "<", "<=", ">", ">=", "!=",
+        $allowed = ["=", "<", "<=", ">", ">=", "!=",
                       "LIKE", "NOT LIKE", "IS NULL", "IS NOT NULL",
-                      "REGEXP", "NOT REGEXP");
-        if (! in_array($operator, $allowed)) {
+                      "REGEXP", "NOT REGEXP"];
+        if (! in_array($operator, $allowed, true)) {
             $this->DBException("Invalid operator provided (unknown operator)");
         }
         // TODO : Check if the value is corresponding to the type of the column
@@ -2384,19 +2464,20 @@ class Dblayeroo
             $this->whereExpression[] =
             $this->sep . $this->tableprefix . $this->table . $this->sep . "." .
             $this->sep . $field . $this->sep . " " . $operator . " :$hash";
-            $this->whereValues[$hash] = array(
+            $this->whereValues[$hash] = [
             "field" => $field,
             "fieldfull" => $this->tableprefix . $this->table . "." . $field,
             "operator" => $operator,
             "value" => $value,
             "hash" => $hash,
-            "type" => $this->fieldTypeLight($field));
+            "type" => $this->fieldTypeLight($field)];
         }
         return $this;
     }
 
-    /** Add a new AND to the WHERE expression
-      */
+    /**
+     * Add a new AND to the WHERE expression
+     */
     public function whereAddAND()
     {
         $this->debugLog("Entering whereAddAND ()", 2);
@@ -2407,8 +2488,9 @@ class Dblayeroo
         return $this;
     }
 
-    /** Add a new OR to the WHERE expression
-      */
+    /**
+     * Add a new OR to the WHERE expression
+     */
     public function whereAddOR()
     {
         $this->debugLog("Entering whereAddOR ()", 2);
@@ -2419,8 +2501,9 @@ class Dblayeroo
         return $this;
     }
 
-    /** Add a new Open Parenthesis to the WHERE expression
-      */
+    /**
+     * Add a new Open Parenthesis to the WHERE expression
+     */
     public function whereAddParenthesisOpen()
     {
         $this->debugLog("Entering whereAddParenthesisOpen ()", 2);
@@ -2436,8 +2519,9 @@ class Dblayeroo
         return $this;
     }
 
-    /** Add a new Close Parenthesis to the WHERE expression
-      */
+    /**
+     * Add a new Close Parenthesis to the WHERE expression
+     */
     public function whereAddParenthesisClose()
     {
         $this->debugLog("Entering whereAddParenthesisClose ()", 2);
@@ -2445,14 +2529,15 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get the WHERE clause of the object.
-      * If the joinObject is set, return all the WHERE clauses
-      */
+    /**
+     * Get the WHERE clause of the object.
+     * If the joinObject is set, return all the WHERE clauses
+     */
     public function whereGetExpression()
     {
         $whereExpression = $this->whereExpression;
         if ($whereExpression === null) {
-            $whereExpression = array();
+            $whereExpression = [];
         }
         if ($this->joinObject !== null) {
             foreach ($this->joinObject as $obj) {
@@ -2475,15 +2560,16 @@ class Dblayeroo
         return $whereExpression;
     }
 
-    /** Get the WHERE values of the object.
-      * If the joinObject is set, return all the WHERE clauses with AND and
-      * parenthesis
-      */
+    /**
+     * Get the WHERE values of the object.
+     * If the joinObject is set, return all the WHERE clauses with AND and
+     * parenthesis
+     */
     public function whereGetValues()
     {
         $whereValues =  $this->whereValues;
         if ($whereValues === null) {
-            $whereValues = array();
+            $whereValues = [];
         }
         if ($this->joinObject !== null) {
             foreach ($this->joinObject as $obj) {
@@ -2496,12 +2582,13 @@ class Dblayeroo
         return $whereValues;
     }
 
-    /** Add a new ORDER sort. The multiple ORDERS are used from the first added to
-      * the last added
-      * @param string $field The field to sort
-      * @param string|null $sort The sort order ("ASC", "DESC", "NATASC",
-      *  "NATDESC");
-      */
+    /**
+     * Add a new ORDER sort. The multiple ORDERS are used from the first added to
+     * the last added
+     * @param string $field The field to sort
+     * @param string|null $sort The sort order ("ASC", "DESC", "NATASC",
+     *  "NATDESC");
+     */
     public function orderAdd($field, $sort = "ASC")
     {
         $this->debugLog("Entering orderAdd (", $field, ", ", $sort, ")", 2);
@@ -2512,14 +2599,14 @@ class Dblayeroo
             $this->DBException("Invalid sort provided (not string)");
         }
         $sort = strtoupper($sort);
-        if (! in_array($sort, array("ASC", "DESC", "NATASC", "NATDESC"))) {
+        if (! in_array($sort, ["ASC", "DESC", "NATASC", "NATDESC"], true)) {
             $this->DBException(
                 "Invalid sort provided (not ASC nor DESC nor NATASC nor NATDESC)"
             );
         }
         if (
             ! array_key_exists($field, $this->fields) &&
-            ! in_array($field, $this->displayAlias)
+            ! in_array($field, $this->displayAlias, true)
         ) {
             $this->DBException(sprintf(
                 "Invalid field to orderAdd '%s' : not defined in table nor in alias",
@@ -2540,15 +2627,16 @@ class Dblayeroo
         return $this;
     }
 
-    /** Get the ORDER fields defined. If a joinObject is set with ORDER statement,
-      * return the joinObject order with its tableprefix/name in addition of
-      * the ones of this object
-      * If the parameter $full is set, add the table prefix/name to the result
-      * @param boolean|null $full Add the table prefix/name if set
-      */
+    /**
+     * Get the ORDER fields defined. If a joinObject is set with ORDER statement,
+     * return the joinObject order with its tableprefix/name in addition of
+     * the ones of this object
+     * If the parameter $full is set, add the table prefix/name to the result
+     * @param boolean|null $full Add the table prefix/name if set
+     */
     public function orderGet($full = false)
     {
-        $order = array();
+        $order = [];
         if ($this->joinObject) {
             $full = true;
         }
@@ -2569,9 +2657,10 @@ class Dblayeroo
         return $order;
     }
 
-    /** Return true if this object or one of the join objects need GROUP BY SQL
-      * part
-      */
+    /**
+     * Return true if this object or one of the join objects need GROUP BY SQL
+     * part
+     */
     public function groupByNeeded()
     {
         $needGroupBy = false;
@@ -2588,26 +2677,27 @@ class Dblayeroo
         return $needGroupBy;
     }
 
-    /** Get the GROUP BY fields defined. If a joinObject is set with GROUP BY
-      * statement, return the joinObject order with its tableprefix/name in
-      * addition of the ones of this object
-      * If the parameter $full is set, add the table prefix/name to the result
-      * @param boolean|null $full Add the table prefix/name if set
-      */
+    /**
+     * Get the GROUP BY fields defined. If a joinObject is set with GROUP BY
+     * statement, return the joinObject order with its tableprefix/name in
+     * addition of the ones of this object
+     * If the parameter $full is set, add the table prefix/name to the result
+     * @param boolean|null $full Add the table prefix/name if set
+     */
     public function groupByGet($full = false)
     {
         if ($this->joinObject) {
             $full = true;
         }
 
-        $localGroupBy = array();
+        $localGroupBy = [];
         // Manage the local object group by entries. In full mode, return the
         // groupByExpression if it is set, or the list of the displayed fields.
         if ($full) {
             if ($this->groupByExpression !== null) {
                 foreach ($this->groupByExpression as $pos => $o) {
                     if ($localGroupBy === null) {
-                        $localGroupBy = array();
+                        $localGroupBy = [];
                     }
                     $localGroupBy[$pos] = $this->sep . $this->tableprefix . $this->table .
                                 $this->sep . "." . $o;
@@ -2623,12 +2713,12 @@ class Dblayeroo
             if ($this->groupByExpression !== null) {
                 $localGroupBy = $this->groupByExpression;
             } else {
-                $localGroupBy = array();
+                $localGroupBy = [];
             }
         }
 
         // Add the distant entries
-        $distantGroupBy = array();
+        $distantGroupBy = [];
         if ($this->joinObject) {
             foreach ($this->joinObject as $obj) {
                 $ext = $obj->groupByGet(true);
@@ -2641,11 +2731,12 @@ class Dblayeroo
         return $groupBy;
     }
 
-    /** Define a LIMIT for the request.
-      * To use only the nbLines, put a 0 on startLine
-      * @param integer $startLine The starting line in the result list
-      * @param integer $nbLines The number of lines to return
-      */
+    /**
+     * Define a LIMIT for the request.
+     * To use only the nbLines, put a 0 on startLine
+     * @param integer $startLine The starting line in the result list
+     * @param integer $nbLines The number of lines to return
+     */
     public function limit($startLine, $nbLines)
     {
         $this->debugLog("Entering limit (", $startLine, ", ", $nbLines, ")", 2);
@@ -2671,9 +2762,10 @@ class Dblayeroo
         return $this;
     }
 
-    /** Define a LIMIT for the request.
-      * @param integer $nbLines The number of lines to return
-      */
+    /**
+     * Define a LIMIT for the request.
+     * @param integer $nbLines The number of lines to return
+     */
     public function limitLines($nbLines)
     {
         $this->debugLog("Entering limitLines (", $nbLines, ")", 2);
@@ -2688,11 +2780,12 @@ class Dblayeroo
         return $this;
     }
 
-    /** Set INSERT/UPDATE values
-      * - The provided array must be an associative array, the field name must be
-      *   provided as key and the value as value. Each field=>val will be updated
-      * @param array $values The values to INSERT or UPDATE
-      */
+    /**
+     * Set INSERT/UPDATE values
+     * - The provided array must be an associative array, the field name must be
+     *   provided as key and the value as value. Each field=>val will be updated
+     * @param array $values The values to INSERT or UPDATE
+     */
     public function setValues($values)
     {
         $this->debugLog("Entering setValues (", $values, ")", 2);
@@ -2701,8 +2794,8 @@ class Dblayeroo
         }
         $values = $this->normalize($values);
         $associative = null;
-        $tmpValues = array();
-        $tmpType = array();
+        $tmpValues = [];
+        $tmpType = [];
         foreach ($values as $key => $val) {
             if (! array_key_exists($key, $this->fields)) {
                 $this->DBException(sprintf(
@@ -2729,8 +2822,9 @@ class Dblayeroo
         return $this;
     }
 
-    /** Create the SQL request
-      */
+    /**
+     * Create the SQL request
+     */
     private function createRequest()
     {
         if ($this->sep === "") {
@@ -2795,7 +2889,7 @@ class Dblayeroo
                     $sql .= "\n LIMIT $this->limitExpression";
                 }
                 // No set Values for SELECT
-                $this->setValues = array();
+                $this->setValues = [];
                 break;
             case "INSERT":
                 $sql = "INSERT INTO $this->sep$this->tableprefix$this->table$this->sep (";
@@ -2821,8 +2915,8 @@ class Dblayeroo
                 }
                 $sql .= ")";
                 // No WHERE in INSERT : remove the WHERE parameters
-                $this->whereExpression = array();
-                $this->whereValues = array();
+                $this->whereExpression = [];
+                $this->whereValues = [];
                 break;
             case "DELETE":
                 $sql = "DELETE FROM $this->sep$this->tableprefix$this->table$this->sep";
@@ -2837,7 +2931,7 @@ class Dblayeroo
                     $sql .= " LIMIT $this->limitExpression";
                 }
                 // No set Values for DELETE
-                $this->setValues = array();
+                $this->setValues = [];
                 break;
             case "UPDATE":
                 $sql = "UPDATE $this->sep$this->tableprefix$this->table$this->sep";
@@ -2871,13 +2965,14 @@ class Dblayeroo
         return $sql;
     }
 
-    /** Prepare the request with the associated entries.
-      * If textForm is true, return a string to display what will be done
-      * If textForm is false, return a statement
-      * @param string $sql The SQL request to prepare
-      * @param boolean $textForm If true, return the result. If false prepare
-      * really the request
-      */
+    /**
+     * Prepare the request with the associated entries.
+     * If textForm is true, return a string to display what will be done
+     * If textForm is false, return a statement
+     * @param string $sql The SQL request to prepare
+     * @param boolean $textForm If true, return the result. If false prepare
+     * really the request
+     */
     private function prepareRequest($sql, $textForm)
     {
         $text = "";
@@ -2988,8 +3083,9 @@ class Dblayeroo
         }
     }
 
-    /** Return the query that will be executed
-      */
+    /**
+     * Return the query that will be executed
+     */
     public function getDisplayQuery()
     {
         $text = "";
@@ -3002,13 +3098,14 @@ class Dblayeroo
         return $text;
     }
 
-    /** Normalize the values before using them.
-      * The normalize is called by methods : verify, checkRealTypes and setValues
-      * By default, remove the spaces (trim) at begin and end.
-      * This method can be overloaded by extending the class
-      * @param array $values The values to test or INSERT or UPDATE
-      * @return array the updated values
-      */
+    /**
+     * Normalize the values before using them.
+     * The normalize is called by methods : verify, checkRealTypes and setValues
+     * By default, remove the spaces (trim) at begin and end.
+     * This method can be overloaded by extending the class
+     * @param array $values The values to test or INSERT or UPDATE
+     * @return array the updated values
+     */
     public function normalize($values)
     {
         if (! is_array($values)) {
@@ -3022,17 +3119,18 @@ class Dblayeroo
         return $values;
     }
 
-    /** Check the provided values which will be inserted or updated against the
-      * database structure.
-      * In update, do not forget to define the whereAdd parameters !
-      * @param array $values The values to test
-      * @param boolean|null $update if true UPDATE request, else INSERT request
-      * @return array The errors found by field
-      */
+    /**
+     * Check the provided values which will be inserted or updated against the
+     * database structure.
+     * In update, do not forget to define the whereAdd parameters !
+     * @param array $values The values to test
+     * @param boolean|null $update if true UPDATE request, else INSERT request
+     * @return array The errors found by field
+     */
     public function verify($values, $update = false)
     {
         $update = !! $update;
-        $errors = array();
+        $errors = [];
         if ($this->table === null) {
             throw new \Exception("No table name defined", 500);
         }
@@ -3051,7 +3149,7 @@ class Dblayeroo
             // - Look if all the NOT NULL fields are filled
             foreach ($this->fields as $field => $params) {
                 if (
-                    in_array("not null", $params) &&
+                    in_array("not null", $params, true) &&
                     ! array_key_exists($field, $values)
                 ) {
                     $errors[$field] = sprintf(
@@ -3062,7 +3160,7 @@ class Dblayeroo
                         $field
                     );
                 } elseif (
-                    ! in_array("not null", $params) &&
+                    ! in_array("not null", $params, true) &&
                     ! array_key_exists($field, $values)
                 ) {
                     continue;
@@ -3084,13 +3182,13 @@ class Dblayeroo
                 continue;
             }
             if (
-                ! in_array("not null", $params) &&
+                ! in_array("not null", $params, true) &&
                 ! array_key_exists($field, $values)
             ) {
                 continue;
             }
             if (
-                in_array("not null", $params) &&
+                in_array("not null", $params, true) &&
                 ! array_key_exists($field, $values)
             ) {
                 $errors[$field] = dgettext(
@@ -3100,8 +3198,8 @@ class Dblayeroo
                 continue;
             }
             if (
-                in_array("not null", $params) &&
-                ! in_array("autoincrement", $params) &&
+                in_array("not null", $params, true) &&
+                ! in_array("autoincrement", $params, true) &&
                 $values[$field] === null
             ) {
                 $errors[$field] = dgettext(
@@ -3201,10 +3299,10 @@ class Dblayeroo
         $this->debugLog("    verify the unique constraint", 2);
         $uniques = $this->unique;
         if (! is_array($uniques)) {
-            $uniques = array();
+            $uniques = [];
         }
-        if (! in_array($this->primary, $uniques)) {
-            $uniques = array_merge(array($this->primary), $uniques);
+        if (! in_array($this->primary, $uniques, true)) {
+            $uniques = array_merge([$this->primary], $uniques);
         }
         $setValues = $values;
         $foundImpactedLines = 0;
@@ -3349,7 +3447,7 @@ class Dblayeroo
                 }
                 if (
                     ! array_key_exists($field, $values) &&
-                    in_array("not null", $this->fields[$field])
+                    in_array("not null", $this->fields[$field], true)
                 ) {
                     $errors[$field] = sprintf(
                         dgettext(
@@ -3372,7 +3470,7 @@ class Dblayeroo
                 }
                 if (
                     ! array_key_exists($field, $values) &&
-                    ! in_array("not null", $this->fields[$field])
+                    ! in_array("not null", $this->fields[$field], true)
                 ) {
                     $values[$field] = null;
                 }
@@ -3410,10 +3508,11 @@ class Dblayeroo
         return $errors;
     }
 
-    /** Check the values before doing really the modification of the database
-      * @param array $values The values to test
-      * @param boolean|null $update if true UPDATE request, else INSERT request
-      */
+    /**
+     * Check the values before doing really the modification of the database
+     * @param array $values The values to test
+     * @param boolean|null $update if true UPDATE request, else INSERT request
+     */
     public function checkValues($values, $update = false)
     {
         $this->debugLog("Entering checkValues (", $update, ")", 2);
@@ -3441,15 +3540,16 @@ class Dblayeroo
         return $errors;
     }
 
-    /** Check the types of the data against the realTypes
-      * Return an array with the field name in error and a message
-      * If allowEmpty is set, do not test the "NOT NULL" feature
-      * In UPDATE, the values don't need be not set : they are already in database
-      * so $allowEmpty is true
-      * @param array $values The values to test
-      * @param boolean|null $allowEmpty Allow the "not null" to not be set
-      * @return array empty array if no error
-      */
+    /**
+     * Check the types of the data against the realTypes
+     * Return an array with the field name in error and a message
+     * If allowEmpty is set, do not test the "NOT NULL" feature
+     * In UPDATE, the values don't need be not set : they are already in database
+     * so $allowEmpty is true
+     * @param array $values The values to test
+     * @param boolean|null $allowEmpty Allow the "not null" to not be set
+     * @return array empty array if no error
+     */
     public function checkRealTypes($values, $allowEmpty = false)
     {
         $this->debugLog(
@@ -3467,12 +3567,12 @@ class Dblayeroo
             );
         }
         $values = $this->normalize($values);
-        $errors = array();
+        $errors = [];
         foreach ($this->fields as $field => $params) {
             if (! key_exists($field, $values) || trim($values[$field]) === "") {
                 if (
-                    in_array("not null", $params) &&
-                    ! in_array("autoincrement", $params)
+                    in_array("not null", $params, true) &&
+                    ! in_array("autoincrement", $params, true)
                 ) {
                     if ($allowEmpty === false) {
                         $errors[$field] = dgettext(
@@ -3511,11 +3611,12 @@ class Dblayeroo
         return $errors;
     }
 
-    /** Execute the pre-defined query
-      * Return the content array if SELECT command is choosed
-      * Return the Last ID if INSERT command is choosed
-      * Return the number of modified lines for UPDATE/DELETE command
-      */
+    /**
+     * Execute the pre-defined query
+     * Return the content array if SELECT command is choosed
+     * Return the Last ID if INSERT command is choosed
+     * Return the number of modified lines for UPDATE/DELETE command
+     */
     public function execute()
     {
         $this->debugLog("Entering execute ()", 2);
@@ -3618,7 +3719,7 @@ class Dblayeroo
                             // Function. The function that return an int must be added in this
                             // list, to cast correctely the value
                             $func = strtoupper(trim(substr($columns[$colNb], 0, $pos)));
-                            if (in_array($func, array("AVG", "COUNT", "MAX", "MIN", "SUM"))) {
+                            if (in_array($func, ["AVG", "COUNT", "MAX", "MIN", "SUM"], true)) {
                                 $val = intval($val);
                             }
                         } else {
@@ -3630,7 +3731,8 @@ class Dblayeroo
                             $name = str_replace("DISTINCT ", "", $name);
                             /*if ($cleanable)
                               $name = str_replace ($this->sep.$this->tableprefix.$this->table.
-                            $this->sep.".", "", $name);*/
+                            $this->sep.".", "", $name);
+ */
                             if (
                                 strtolower($fieldsAll[$name][0]) === "integer" &&
                                 $val !== null
@@ -3648,26 +3750,26 @@ class Dblayeroo
                         unset($result[$rownb][$colNb]);
                     }
                 }
-                self::$meta[] = array(
+                self::$meta[] = [
                 "command"      => $this->command,
                 "sql"          => $sql,
                 "sqltime"      => microtime(true) - $startTime,
                 "displayQuery" => $this->getDisplayQuery(),
                 "nbrows"       => count($result),
-                );
+                ];
                 return $result;
             case "INSERT":
-                self::$meta[] = array(
+                self::$meta[] = [
                 "command"      => $this->command,
                 "sql"          => $sql,
                 "sqltime"      => microtime(true) - $startTime,
                 "displayQuery" => $this->getDisplayQuery(),
                 "nbrows"       => $st->rowCount(),
-                );
+                ];
                 // If the primary key is not autoincrement, return the provided value if
                 // exists
                 if (
-                    ! in_array("autoincrement", $this->fields[$this->primary]) &&
+                    ! in_array("autoincrement", $this->fields[$this->primary], true) &&
                     key_exists($this->primary, $this->setValues)
                 ) {
                     return $this->setValues[$this->primary];
@@ -3676,7 +3778,7 @@ class Dblayeroo
                 // If the primary key is autoincrement and the provided value is not null
                 // Return it
                 if (
-                    in_array("autoincrement", $this->fields[$this->primary]) &&
+                    in_array("autoincrement", $this->fields[$this->primary], true) &&
                     key_exists($this->primary, $this->setValues) &&
                     $this->setValues[$this->primary] !== null
                 ) {
@@ -3689,7 +3791,7 @@ class Dblayeroo
                 $autoInc = null;
                 if ($this->driver === "pgsql") {
                     foreach ($this->fields as $col => $params) {
-                        if (in_array("autoincrement", $params)) {
+                        if (in_array("autoincrement", $params, true)) {
                             $autoInc = $col;
                             break;
                         }
@@ -3706,25 +3808,26 @@ class Dblayeroo
                 return self::$instance[$this->dsn]->lastInsertId($autoInc);
             case "UPDATE":
             case "DELETE":
-                self::$meta[] = array(
+                self::$meta[] = [
                 "command"      => $this->command,
                 "sql"          => $sql,
                 "sqltime"      => microtime(true) - $startTime,
                 "displayQuery" => $this->getDisplayQuery(),
                 "nbrows"       => $st->rowCount(),
-                );
+                ];
                 return $st->rowCount();
             default:
                 $this->DBException("execute : command not defined : no RC");
         }
     }
 
-    /** Execute a non prepared query in the database context.
-      * As there is no verification, this method is DANGEROUS and should not be
-      * used !
-      * @param string $sql The SQL request to directely send to the database
-      * @return PDOStatement The PDO Statement to traverse
-      */
+    /**
+     * Execute a non prepared query in the database context.
+     * As there is no verification, this method is DANGEROUS and should not be
+     * used !
+     * @param string $sql The SQL request to directely send to the database
+     * @return PDOStatement The PDO Statement to traverse
+     */
     public function directQuery($sql)
     {
         if (! key_exists($this->dsn, self::$instance)) {
@@ -3733,19 +3836,21 @@ class Dblayeroo
         return self::$instance[$this->dsn]->query($sql, \PDO::FETCH_ASSOC);
     }
 
-    /** Error management
-      * @param string $message The message to throw in the exception
-      * @param integer|null $code The error code to return to the user
-      */
+    /**
+     * Error management
+     * @param string $message The message to throw in the exception
+     * @param integer|null $code The error code to return to the user
+     */
     public function DBException($message, $code = 500)
     {
         $message = $this->DBExceptionMsg($message);
         throw new \Exception($message, $code);
     }
 
-    /** Return the $message adapted with the debug trace if needed
-      * @param string $message The message to throw in the exception
-      */
+    /**
+     * Return the $message adapted with the debug trace if needed
+     * @param string $message The message to throw in the exception
+     */
     public function DBExceptionMsg($message)
     {
         $backtrace = debug_backtrace();
@@ -3764,10 +3869,11 @@ class Dblayeroo
         return $message;
     }
 
-    /** Debug function
-      * @param mixed ...$message The message to display in debug
-      * @param integer priority The display message if $priority <= $this->debug
-      */
+    /**
+     * Debug function
+     * @param mixed ...$message The message to display in debug
+     * @param integer priority The display message if $priority <= $this->debug
+     */
     public function debugLog($message, $priority)
     {
         if ((!!$this->debug) === false) {
@@ -3800,11 +3906,12 @@ class Dblayeroo
     //////////////////////////////////////////////
     ////   ALL THE CHECK REALTYPES METHODS    ////
     //////////////////////////////////////////////
-    /** Check the type "integerPositive"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "integerPositive"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_integerPositive($val, $definition)
     {
         if (substr($val, 0, 1) === "-") {
@@ -3822,11 +3929,12 @@ class Dblayeroo
         return;
     }
 
-    /** Check the type "integer"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "integer"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_integer($val, $definition)
     {
         if (strspn($val, "0123456789-") !== strlen($val)) {
@@ -3844,12 +3952,13 @@ class Dblayeroo
         return;
     }
 
-    /** Check the type "allowedchars"
-      * the chars must be in UTF-8
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "allowedchars"
+     * the chars must be in UTF-8
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_allowedchars($val, $definition)
     {
         list($func, $param) = explode("(", $definition);
@@ -3873,11 +3982,12 @@ class Dblayeroo
         return dgettext("domframework", "Invalid char provided");
     }
 
-    /** Check the type "array"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "array"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_array($val, $definition)
     {
         list($func, $param) = explode("(", $definition);
@@ -3894,19 +4004,20 @@ class Dblayeroo
         foreach ($array as $key => $tmp) {
             $array[$key] = mb_substr($tmp, 1, -1);
         }
-        if (in_array($val, $array)) {
+        if (in_array($val, $array, true)) {
             return;
         }
         return dgettext("domframework", "Invalid value provided : " .
         "not in allowed list");
     }
 
-    /** Check the type "regex"
-      * Do not forget to add the separators, the ^ and $
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "regex"
+     * Do not forget to add the separators, the ^ and $
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_regex($val, $definition)
     {
         list($func, $param) = explode("(", $definition);
@@ -3930,11 +4041,12 @@ class Dblayeroo
         "do not match the regex");
     }
 
-    /** Check the type "mail"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "mail"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_mail($val, $definition)
     {
         if (!! filter_var($val, FILTER_VALIDATE_EMAIL)) {
@@ -3943,11 +4055,12 @@ class Dblayeroo
         return dgettext("domframework", "Invalid mail provided");
     }
 
-    /** Check the type "uuid"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "uuid"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_uuid($val, $definition)
     {
         if (strlen($val) !== 36) {
@@ -3965,11 +4078,12 @@ class Dblayeroo
         }
     }
 
-    /** Check the type "sqldate"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "sqldate"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_sqldate($val, $definition)
     {
         if (strlen($val) !== 10) {
@@ -3999,11 +4113,12 @@ class Dblayeroo
         }
     }
 
-    /** Check the type "sqltime"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "sqltime"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_sqltime($val, $definition)
     {
         if (strlen($val) !== 8) {
@@ -4033,11 +4148,12 @@ class Dblayeroo
         }
     }
 
-    /** Check the type "sqldatetime"
-      * @param string $val The value to check
-      * @param string $definition The definition of the type
-      * @return string or null
-      */
+    /**
+     * Check the type "sqldatetime"
+     * @param string $val The value to check
+     * @param string $definition The definition of the type
+     * @return string or null
+     */
     private function checkRealType_sqldatetime($val, $definition)
     {
         if (strlen($val) !== 19) {
diff --git a/src/Encrypt.php b/src/Encrypt.php
index 0bd34d4..40bf3ee 100644
--- a/src/Encrypt.php
+++ b/src/Encrypt.php
@@ -1,19 +1,22 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to encrypt/decrypt data
-  */
+/**
+ * Allow to encrypt/decrypt data
+ */
 class Encrypt
 {
-    /** Check if openssl library is enabled
-      */
+    /**
+     * Check if openssl library is enabled
+     */
     public function __construct()
     {
         if (! function_exists("openssl_random_pseudo_bytes")) {
@@ -24,15 +27,16 @@ class Encrypt
         }
     }
 
-    /** Encrypt the payload to not be readable by anybody
-      * @param string $payload The payload to encrypt
-      * @param string $ckey The 24 chars for the cipher key
-      * @param string|null $cipherMethod DES-EDE3-CBC by default
-      * @return encrypted payload
-      */
+    /**
+     * Encrypt the payload to not be readable by anybody
+     * @param string $payload The payload to encrypt
+     * @param string $ckey The 24 chars for the cipher key
+     * @param string|null $cipherMethod DES-EDE3-CBC by default
+     * @return encrypted payload
+     */
     public function encrypt($payload, $ckey, $cipherMethod = "des-ede3-cbc")
     {
-        if (! in_array($cipherMethod, openssl_get_cipher_methods())) {
+        if (! in_array($cipherMethod, openssl_get_cipher_methods(), true)) {
             throw new \Exception(dgettext(
                 "domframework",
                 "Invalid cipher provided to encrypt method : " .
@@ -74,12 +78,13 @@ class Encrypt
         return $ciphertext;
     }
 
-    /** Decrypt the ciphertext
-      * @param string $ciphertext The payload to decrypt
-      * @param string $ckey The 24 chars for the cipher key
-      * @param string|null $cipherMethod DES-EDE3-CBC by default
-      * @return decrypted text
-      */
+    /**
+     * Decrypt the ciphertext
+     * @param string $ciphertext The payload to decrypt
+     * @param string $ckey The 24 chars for the cipher key
+     * @param string|null $cipherMethod DES-EDE3-CBC by default
+     * @return decrypted text
+     */
     public function decrypt($ciphertext, $ckey, $cipherMethod = "des-ede3-cbc")
     {
         if (! is_string($ciphertext)) {
@@ -106,7 +111,7 @@ class Encrypt
                 "Invalid ciphertext provided to decrypt method : empty string"
             ), 500);
         }
-        if (! in_array($cipherMethod, openssl_get_cipher_methods())) {
+        if (! in_array($cipherMethod, openssl_get_cipher_methods(), true)) {
             throw new \Exception(dgettext(
                 "domframework",
                 "Invalid cipherMethod provided to decrypt method : " .
diff --git a/src/File.php b/src/File.php
index a084281..01fec09 100644
--- a/src/File.php
+++ b/src/File.php
@@ -1,39 +1,50 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The file method allow to manage files like PHP with a working chroot on all
-  * plateforms, and a right management compatible with database
-  * Don't follow links !
-  *
-  * To allow an external authorization test in plus of the filesystem check, you
-  * must extends the class and overload checkExternalPathRO and
-  * checkExternalPathRW.
-  */
+/**
+ * The file method allow to manage files like PHP with a working chroot on all
+ * plateforms, and a right management compatible with database
+ * Don't follow links !
+ *
+ * To allow an external authorization test in plus of the filesystem check, you
+ * must extends the class and overload checkExternalPathRO and
+ * checkExternalPathRW.
+ */
 class File
 {
-    /** The virtual current working directory */
+    /**
+     * The virtual current working directory
+     */
     private $cwd = ".";
-    /** The real directory used as root in virtual chroot */
+    /**
+     * The real directory used as root in virtual chroot
+     */
     private $baseDir = "/";
 
-    /** The lock stack */
-    private $locks = array();
+    /**
+     * The lock stack
+     */
+    private $locks = [];
 
-    /** Activate the debug and define the minimum priority to save */
+    /**
+     * Activate the debug and define the minimum priority to save
+     */
     public $debug = 0;
 
-    /** Change the current working directory
-      * @param string $directory Go in the provided directory
-      * @return bool true if the directory is changed
-      * @throws If directory not exists, or the directory is not executable
-      */
+    /**
+     * Change the current working directory
+     * @param string $directory Go in the provided directory
+     * @return bool true if the directory is changed
+     * @throws If directory not exists, or the directory is not executable
+     */
     public function chdir($directory)
     {
         $this->debug(2, "chdir ($directory)");
@@ -48,11 +59,12 @@ class File
         return true;
     }
 
-    /** Change the group for a file/dir...
-      * @param string $filename The file/directory to change
-      * @param mixed $group The group name or group GID
-      * @throws If filename not exists, or the directory is not RW
-      */
+    /**
+     * Change the group for a file/dir...
+     * @param string $filename The file/directory to change
+     * @param mixed $group The group name or group GID
+     * @throws If filename not exists, or the directory is not RW
+     */
     public function chgrp($filename, $group)
     {
         $this->debug(2, "chgrp ($filename, $group)");
@@ -81,11 +93,12 @@ class File
         return $rc;
     }
 
-    /** Change the rights mode for a file/dir...
-      * @param string $filename The file/directory to change
-      * @param integer $mode The mode to use for the filename
-      * @throws If filename not exists, or the directory is not RW
-      */
+    /**
+     * Change the rights mode for a file/dir...
+     * @param string $filename The file/directory to change
+     * @param integer $mode The mode to use for the filename
+     * @throws If filename not exists, or the directory is not RW
+     */
     public function chmod($filename, $mode)
     {
         $this->debug(2, "chmod ($filename, $mode)");
@@ -114,11 +127,12 @@ class File
         return $rc;
     }
 
-    /** Change the owner for a file/dir...
-      * @param string $filename The file/directory to change
-      * @param mixed $user The user name or user UID
-      * @throws If filename not exists, or the directory is not RW
-      */
+    /**
+     * Change the owner for a file/dir...
+     * @param string $filename The file/directory to change
+     * @param mixed $user The user name or user UID
+     * @throws If filename not exists, or the directory is not RW
+     */
     public function chown($filename, $user)
     {
         $this->debug(2, "chown ($filename, $user)");
@@ -160,11 +174,12 @@ class File
         return $rc;
     }
 
-    /** Chroot in the provided directory
-      * @param string $directory The directory to chroot
-      * @return boolean true if the chroot is done, false if there is a failure
-      * @throws If directory not exists, or the directory is not executable
-      */
+    /**
+     * Chroot in the provided directory
+     * @param string $directory The directory to chroot
+     * @return boolean true if the chroot is done, false if there is a failure
+     * @throws If directory not exists, or the directory is not executable
+     */
     public function chroot($directory)
     {
         // Use the checkPathRO (using the $this->baseDir) to not allow to go away of
@@ -178,13 +193,14 @@ class File
         return true;
     }
 
-    /** Get the file contents in an array (like 'file' function, but can not
-      * have the same name as the class...)
-      * @param string $filename Name of the file to read
-      * @return string Content of the file
-      * @throws If parent directory not exists, is not readable, the file is not
-      *         exists or is not readable
-      */
+    /**
+     * Get the file contents in an array (like 'file' function, but can not
+     * have the same name as the class...)
+     * @param string $filename Name of the file to read
+     * @return string Content of the file
+     * @throws If parent directory not exists, is not readable, the file is not
+     *         exists or is not readable
+     */
     public function fileArray($filename)
     {
         $this->debug(2, "file ($filename)");
@@ -213,11 +229,12 @@ class File
         return $contents;
     }
 
-    /** Checks whether a file or directory exists
-      * @param string $filename The file or directory to verify
-      * @return bool true if the file exists, false otherwise
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     * Checks whether a file or directory exists
+     * @param string $filename The file or directory to verify
+     * @return bool true if the file exists, false otherwise
+     * @throws If parent directory not exists, or is not executable
+     */
     public function file_exists($filename)
     {
         $this->debug(2, "file_exists ($filename)");
@@ -235,12 +252,13 @@ class File
         return false;
     }
 
-    /** Get the file contents
-      * @param string $filename Name of the file to read
-      * @return string Content of the file
-      * @throws If parent directory not exists, is not readable, the file is not
-      *         exists or is not readable
-      */
+    /**
+     * Get the file contents
+     * @param string $filename Name of the file to read
+     * @return string Content of the file
+     * @throws If parent directory not exists, is not readable, the file is not
+     *         exists or is not readable
+     */
     public function file_get_contents($filename)
     {
         $this->debug(2, "file_get_contents ($filename)");
@@ -270,14 +288,15 @@ class File
         return $contents;
     }
 
-    /** Write a string to a file
-      * @param string $filename Path to the file where to write the data
-      * @param string|integer $data The data to write
-      * @param integer|null $flags The optional flags
-      * @return integer the length of the data stored
-      * @throws If parent directory not exists, is not writeable, or the file
-      *         exists and is not writeable
-      */
+    /**
+     * Write a string to a file
+     * @param string $filename Path to the file where to write the data
+     * @param string|integer $data The data to write
+     * @param integer|null $flags The optional flags
+     * @return integer the length of the data stored
+     * @throws If parent directory not exists, is not writeable, or the file
+     *         exists and is not writeable
+     */
     public function file_put_contents($filename, $data, $flags = 0)
     {
         $this->debug(2, "file_put_contents ($filename)");
@@ -307,13 +326,14 @@ class File
         return $contents;
     }
 
-    /** Get the file modification time of a file
-      * @param string $filename Path to the file
-      * @return integer|boolean the time the file was last modified, or FALSE
-      * on failure. The time is returned as a Unix timestamp, which is suitable
-      * for the date() function.
-      * @throws If parent directory not exists, is not writeable
-      */
+    /**
+     * Get the file modification time of a file
+     * @param string $filename Path to the file
+     * @return integer|boolean the time the file was last modified, or FALSE
+     * on failure. The time is returned as a Unix timestamp, which is suitable
+     * for the date() function.
+     * @throws If parent directory not exists, is not writeable
+     */
     public function filemtime($filename)
     {
         $this->debug(2, "filemtime ($filename)");
@@ -322,11 +342,12 @@ class File
         return filemtime($filename);
     }
 
-    /** Get the file size
-      * @param string $filename Path to the file
-      * @return integer|boolean the size of the file or FALSE on failure.
-      * @throws If parent directory not exists, is not writeable
-      */
+    /**
+     * Get the file size
+     * @param string $filename Path to the file
+     * @return integer|boolean the size of the file or FALSE on failure.
+     * @throws If parent directory not exists, is not writeable
+     */
     public function filesize($filename)
     {
         $this->debug(2, "filesize ($filename)");
@@ -335,11 +356,12 @@ class File
         return filesize($filename);
     }
 
-    /** Get the file info of the provided filename
-      * @param string $filename Path to the file
-      * @return string the mimetype of the file
-      * @throws If parent directory not exists, is not writeable
-      */
+    /**
+     * Get the file info of the provided filename
+     * @param string $filename Path to the file
+     * @return string the mimetype of the file
+     * @throws If parent directory not exists, is not writeable
+     */
     public function fileinfoMimeType($filename)
     {
         $this->debug(2, "filesize ($filename)");
@@ -349,22 +371,25 @@ class File
         return $finfo->file($filename);
     }
 
-    /** Return the current working directory
-      * @return string the current working directory */
+    /**
+     * Return the current working directory
+     * @return string the current working directory
+     */
     public function getcwd()
     {
         $this->debug(1, "getcwd $this->cwd");
         return $this->cwd;
     }
 
-    /** Find pathnames matching a pattern
-      * If there is some unreadable files, skip them quietly
-      * @param string $pattern The pattern to found
-      * @param integer|null $flags The additional flags
-      * @return array Return an array if there is an error
-      * @throws If parent directory not exists, or is not executable
-      * or if there is one file unreadable
-      */
+    /**
+     * Find pathnames matching a pattern
+     * If there is some unreadable files, skip them quietly
+     * @param string $pattern The pattern to found
+     * @param integer|null $flags The additional flags
+     * @return array Return an array if there is an error
+     * @throws If parent directory not exists, or is not executable
+     * or if there is one file unreadable
+     */
     public function glob($pattern, $flags = 0)
     {
         $this->debug(2, "glob ($pattern, $flags)");
@@ -396,12 +421,13 @@ class File
         return $files;
     }
 
-    /**  Tells whether the given filename is a directory
-      * @param string $filename The filename to test
-      * @return bool true if the $filename is a directory and exists, false
-      *              otherwise
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     *  Tells whether the given filename is a directory
+     * @param string $filename The filename to test
+     * @return bool true if the $filename is a directory and exists, false
+     *              otherwise
+     * @throws If parent directory not exists, or is not executable
+     */
     public function is_dir($filename)
     {
         $this->debug(2, "is_dir ($filename)");
@@ -413,11 +439,12 @@ class File
         return false;
     }
 
-    /**  Tells whether the given filename is a valid file
-      * @param string $filename The filename to test
-      * @return bool true if the $filename is a file and exists, false otherwise
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     *  Tells whether the given filename is a valid file
+     * @param string $filename The filename to test
+     * @return bool true if the $filename is a file and exists, false otherwise
+     * @throws If parent directory not exists, or is not executable
+     */
     public function is_file($filename)
     {
         $this->debug(2, "is_file ($filename)");
@@ -429,11 +456,12 @@ class File
         return false;
     }
 
-    /** Tells whether a file exists and is executable
-      * @param string $filename The filename to test
-      * @return bool true if the $filename is a file exists and is writeable
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     * Tells whether a file exists and is executable
+     * @param string $filename The filename to test
+     * @return bool true if the $filename is a file exists and is writeable
+     * @throws If parent directory not exists, or is not executable
+     */
     public function is_executable($filename)
     {
         $this->debug(2, "is_executable ($filename)");
@@ -445,11 +473,12 @@ class File
         return false;
     }
 
-    /** Tells whether a file exists and is readable
-      * @param string $filename The filename to test
-      * @return bool true if the $filename is a file exists and is readable
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     * Tells whether a file exists and is readable
+     * @param string $filename The filename to test
+     * @return bool true if the $filename is a file exists and is readable
+     * @throws If parent directory not exists, or is not executable
+     */
     public function is_readable($filename)
     {
         $this->debug(2, "is_readable ($filename)");
@@ -461,11 +490,12 @@ class File
         return false;
     }
 
-    /** Tells whether a file exists and is writeable
-      * @param string $filename The filename to test
-      * @return bool true if the $filename is a file exists and is writeable
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     * Tells whether a file exists and is writeable
+     * @param string $filename The filename to test
+     * @return bool true if the $filename is a file exists and is writeable
+     * @throws If parent directory not exists, or is not executable
+     */
     public function is_writeable($filename)
     {
         $this->debug(2, "is_writeable ($filename)");
@@ -477,11 +507,12 @@ class File
         return false;
     }
 
-    /** Lock a file exclusively
-      * @param string $filename The file to lock
-      * @return bool true if the lock is acquired, false otherwise
-      * @throws If parent directory not exists, or is not writeable
-      */
+    /**
+     * Lock a file exclusively
+     * @param string $filename The file to lock
+     * @return bool true if the lock is acquired, false otherwise
+     * @throws If parent directory not exists, or is not writeable
+     */
     public function lockEX($filename)
     {
         $this->debug(2, "lockEX ($filename)");
@@ -509,11 +540,12 @@ class File
         return flock($this->locks[$filename], LOCK_EX);
     }
 
-    /** Lock a file shared (allow multiple read)
-      * @param string $filename The file to lock
-      * @return bool true if the lock is acquired, false otherwise
-      * @throws If parent directory not exists, or is not writeable
-      */
+    /**
+     * Lock a file shared (allow multiple read)
+     * @param string $filename The file to lock
+     * @return bool true if the lock is acquired, false otherwise
+     * @throws If parent directory not exists, or is not writeable
+     */
     public function lockSH($filename)
     {
         $this->debug(2, "lockSH ($filename)");
@@ -541,11 +573,12 @@ class File
         return flock($this->locks[$filename], LOCK_SH);
     }
 
-    /** Unlock a file previously locked
-      * @param string $filename The file to lock
-      * @return bool true if the lock is acquired, false otherwise
-      * @throws If parent directory not exists, or is not writeable
-      */
+    /**
+     * Unlock a file previously locked
+     * @param string $filename The file to lock
+     * @return bool true if the lock is acquired, false otherwise
+     * @throws If parent directory not exists, or is not writeable
+     */
     public function lockUN($filename)
     {
         $this->debug(2, "lockUN ($filename)");
@@ -560,11 +593,12 @@ class File
         return $res;
     }
 
-    /** Calculate the md5 sum of a file
-      * @param string $filename The file to hash
-      * @return string the calulated hash
-      * @throws If the file doesn't exists
-      */
+    /**
+     * Calculate the md5 sum of a file
+     * @param string $filename The file to hash
+     * @return string the calulated hash
+     * @throws If the file doesn't exists
+     */
     public function md5_file($filename)
     {
         $this->debug(2, "md5_file ($filename)");
@@ -591,14 +625,15 @@ class File
         return md5_file($filename);
     }
 
-    /** Create a new directory
-      * @param string $pathname The directory to create
-      * @param integer $mode The mode to create (0777 by default)
-      * @param boolean $recursive (false by default)
-      * @return bool true if the directory is correctely created, false if the
-      *              directory already exists
-      * @throws If parent directory not exists, is not writeable
-      */
+    /**
+     * Create a new directory
+     * @param string $pathname The directory to create
+     * @param integer $mode The mode to create (0777 by default)
+     * @param boolean $recursive (false by default)
+     * @return bool true if the directory is correctely created, false if the
+     *              directory already exists
+     * @throws If parent directory not exists, is not writeable
+     */
     public function mkdir($pathname, $mode = 0777, $recursive = false)
     {
         $this->debug(2, "mkdir ($pathname, $mode, $recursive)");
@@ -642,12 +677,13 @@ class File
         return $rc;
     }
 
-    /** Copy a file or a directory
-      * @param string $oldname The file to copy
-      * @param string $newname The new name of the file. It will be
-      * overwrited if it already exists
-      * @return bool
-      */
+    /**
+     * Copy a file or a directory
+     * @param string $oldname The file to copy
+     * @param string $newname The new name of the file. It will be
+     * overwrited if it already exists
+     * @return bool
+     */
     public function copy($oldname, $newname)
     {
         $this->debug(2, "copy ($oldname, $newname)");
@@ -671,12 +707,13 @@ class File
         return $rc;
     }
 
-    /** Renames a file or directory
-      * @param string $oldname The file or directory to rename
-      * @param string $newname The new name of the file or directory. It will be
-      * overwrited if it already exists
-      * @return bool
-      */
+    /**
+     * Renames a file or directory
+     * @param string $oldname The file or directory to rename
+     * @param string $newname The new name of the file or directory. It will be
+     * overwrited if it already exists
+     * @return bool
+     */
     public function rename($oldname, $newname)
     {
         $this->debug(2, "rename ($oldname, $newname)");
@@ -689,11 +726,12 @@ class File
         return $rc;
     }
 
-    /** Return a ini file converted to an array
-      * @param string $filename The filename of the ini file being parsed.
-      * @param boolean $process_sections Process the sections
-      * @return array
-      */
+    /**
+     * Return a ini file converted to an array
+     * @param string $filename The filename of the ini file being parsed.
+     * @param boolean $process_sections Process the sections
+     * @return array
+     */
     public function parse_ini_file($filename, $process_sections = false)
     {
         $this->debug(2, "parse_ini_file ($filename, $process_sections)");
@@ -720,11 +758,12 @@ class File
         return parse_ini_file($filename, $process_sections);
     }
 
-    /** Return the canonical absolute path. Do not check if the directory exists,
-      * if there is links. Just calculate the realpath based on the chroot value
-      * @param string $path the path to analyze
-      * @return string the canonical absolute path
-      */
+    /**
+     * Return the canonical absolute path. Do not check if the directory exists,
+     * if there is links. Just calculate the realpath based on the chroot value
+     * @param string $path the path to analyze
+     * @return string the canonical absolute path
+     */
     public function realpath($path)
     {
         $oriPath = $path;
@@ -738,7 +777,7 @@ class File
         $tmp = explode("/", $current);
         foreach ($parts as $part) {
             if ($part === "") {
-                $tmp = array();
+                $tmp = [];
             } elseif ($part === ".") {
                 continue;
             } elseif ($part === "..") {
@@ -765,15 +804,16 @@ class File
         return $path;
     }
 
-    /** Remove the provided directory
-      * If the recurse flag is true, remove the content too (files and
-      * directories)
-      * @param string $dirname The directory to remove
-      * @param boolean $recursive Remove recursively
-      * @return bool true if all is removed, false otherwise
-      * @throws If parent directory not exists, is not writeable or the current
-      *         dir is not writeable
-      */
+    /**
+     * Remove the provided directory
+     * If the recurse flag is true, remove the content too (files and
+     * directories)
+     * @param string $dirname The directory to remove
+     * @param boolean $recursive Remove recursively
+     * @return bool true if all is removed, false otherwise
+     * @throws If parent directory not exists, is not writeable or the current
+     *         dir is not writeable
+     */
     public function rmdir($dirname, $recursive = false)
     {
         $this->debug(2, "rmdir ($dirname, $recursive)");
@@ -783,7 +823,7 @@ class File
         if ($recursive === false) {
             return @rmdir($tmpdirname);
         }
-        $files = array_diff(scandir($tmpdirname), array(".", ".."));
+        $files = array_diff(scandir($tmpdirname), [".", ".."]);
         foreach ($files as $file) {
             if (is_dir("$tmpdirname/$file")) {
                 $this->rmdir("$dirname/$file", $recursive);
@@ -794,30 +834,32 @@ class File
         return rmdir($tmpdirname);
     }
 
-    /** Return the list of files and directories in the directory.
-      * Do not return the . and .. virtual dirs.
-      * The result is sorted
-      * @param string $directory The directory to read
-      * @return array the list of files and dirs
-      * @throws If directory not exists, or is not executable
-      */
+    /**
+     * Return the list of files and directories in the directory.
+     * Do not return the . and .. virtual dirs.
+     * The result is sorted
+     * @param string $directory The directory to read
+     * @return array the list of files and dirs
+     * @throws If directory not exists, or is not executable
+     */
     public function scandir($directory)
     {
         $this->debug(2, "scandir ($directory)");
         $directory = $this->realpath($directory);
         $this->checkPathRO($directory);
-        $res = array_values(array_diff(scandir($directory), array('..', '.')));
+        $res = array_values(array_diff(scandir($directory), ['..', '.']));
         natsort($res);
         return $res;
     }
 
-    /** Return the list of files and directories in the directory.
-      * Do not return the . and .. virtual dirs.
-      * The result is NOT sorted
-      * @param string $directory The directory to read
-      * @return array the list of files and dirs
-      * @throws If directory not exists, or is not executable
-      */
+    /**
+     * Return the list of files and directories in the directory.
+     * Do not return the . and .. virtual dirs.
+     * The result is NOT sorted
+     * @param string $directory The directory to read
+     * @return array the list of files and dirs
+     * @throws If directory not exists, or is not executable
+     */
     public function scandirNotSorted($directory)
     {
         $this->debug(2, "scandirNotSorted ($directory)");
@@ -825,16 +867,17 @@ class File
         $this->checkPathRO($directory);
         $res = array_values(array_diff(
             scandir($directory, SCANDIR_SORT_NONE),
-            array('..', '.')
+            ['..', '.']
         ));
         return $res;
     }
 
-    /** Calculate the sha1 sum of a file
-      * @param string $filename The file to hash
-      * @return string the calulated hash
-      * @throws If the file doesn't exists
-      */
+    /**
+     * Calculate the sha1 sum of a file
+     * @param string $filename The file to hash
+     * @return string the calulated hash
+     * @throws If the file doesn't exists
+     */
     public function sha1_file($filename)
     {
         $this->debug(2, "sha1_file ($filename)");
@@ -861,15 +904,16 @@ class File
         return sha1_file($filename);
     }
 
-    /** Create a new file or update the timestamp if the file exists
-      * @param string $filename the filename
-      * @param integer|null $time the timestamp to use (actual timestamp if not
-      * defined)
-      * @param integer|null $atime the access timestamp to use (actual timestamp
-      * if not defined)
-      * @return bool true or false on failure
-      * @throws If parent directory not exists, is not writeable
-      */
+    /**
+     * Create a new file or update the timestamp if the file exists
+     * @param string $filename the filename
+     * @param integer|null $time the timestamp to use (actual timestamp if not
+     * defined)
+     * @param integer|null $atime the access timestamp to use (actual timestamp
+     * if not defined)
+     * @return bool true or false on failure
+     * @throws If parent directory not exists, is not writeable
+     */
     public function touch($filename, $time = null, $atime = null)
     {
         $this->debug(2, "touch ($filename, $time, $atime)");
@@ -886,11 +930,12 @@ class File
         return $rc;
     }
 
-    /** Delete an existing file.
-      * @param string $filename The filename to remove
-      * @return bool true if the file si removed, false otherwise
-      * @throws If parent directory not exists, or is not executable
-      */
+    /**
+     * Delete an existing file.
+     * @param string $filename The filename to remove
+     * @return bool true if the file si removed, false otherwise
+     * @throws If parent directory not exists, or is not executable
+     */
     public function unlink($filename)
     {
         $this->debug(2, "unlink ($filename)");
@@ -902,15 +947,16 @@ class File
         return unlink($filename);
     }
 
-    /** Check all the parents of the $directory if they are available, and
-      * executable. The path must exists.
-      * Must use the filesystem path (complete) and not the version in chroot.
-      * The last directoy must be executable and readable (no test for writeable)
-      * @param string $path The directory path to check
-      * @return boolean true if the path is executable for all the parents and
-      * for the last directory
-      * @throws if there is a missing part, or a parent is not executable
-      */
+    /**
+     * Check all the parents of the $directory if they are available, and
+     * executable. The path must exists.
+     * Must use the filesystem path (complete) and not the version in chroot.
+     * The last directoy must be executable and readable (no test for writeable)
+     * @param string $path The directory path to check
+     * @return boolean true if the path is executable for all the parents and
+     * for the last directory
+     * @throws if there is a missing part, or a parent is not executable
+     */
     private function checkPathRO($path)
     {
         $this->debug(2, "checkPathRO ($path)");
@@ -1007,15 +1053,16 @@ class File
         return $this->checkExternalPathRO($path);
     }
 
-    /** Check all the parents of the $directory if they are available, and
-      * executable. The path must exists.
-      * Must use the filesystem path (complete) and not the version in chroot.
-      * The last directoy must be executable and readable and writeable
-      * @param string $path The directory path to check
-      * @return true if the path is executable for all the parents and for the
-      *              last directory
-      * @throws if there is a missing part, or a parent is not executable
-      */
+    /**
+     * Check all the parents of the $directory if they are available, and
+     * executable. The path must exists.
+     * Must use the filesystem path (complete) and not the version in chroot.
+     * The last directoy must be executable and readable and writeable
+     * @param string $path The directory path to check
+     * @return true if the path is executable for all the parents and for the
+     *              last directory
+     * @throws if there is a missing part, or a parent is not executable
+     */
     private function checkPathRW($path)
     {
         $this->debug(2, "checkPathRW ($path)");
@@ -1047,12 +1094,13 @@ class File
         return true;
     }
 
-    /** Save a debug log
-      * @param integer $prio The message priority. Should be higher than
-      *        $this->debug to save the message
-      * @param string $message The message to save
-      * @return null
-      */
+    /**
+     * Save a debug log
+     * @param integer $prio The message priority. Should be higher than
+     *        $this->debug to save the message
+     * @param string $message The message to save
+     * @return null
+     */
     private function debug($prio, $message)
     {
         if ($this->debug === false || $this->debug === 0) {
@@ -1066,21 +1114,23 @@ class File
         }
     }
 
-    /** External function allowed to be overloaded to test the RO access to a
-      * resource
-      * @param string $path The path to test in the filesystem
-      * @return boolean true if RO access, false if not
-      */
+    /**
+     * External function allowed to be overloaded to test the RO access to a
+     * resource
+     * @param string $path The path to test in the filesystem
+     * @return boolean true if RO access, false if not
+     */
     public function checkExternalPathRO($path)
     {
         return true;
     }
 
-    /** External function allowed to be overloaded to test the RW access to a
-      * resource
-      * @param string $path The path to test in the filesystem
-      * @return boolean true if RW access, false if not
-      */
+    /**
+     * External function allowed to be overloaded to test the RW access to a
+     * resource
+     * @param string $path The path to test in the filesystem
+     * @return boolean true if RW access, false if not
+     */
     public function checkExternalPathRW($path)
     {
         return true;
diff --git a/src/Fork.php b/src/Fork.php
index 3d469d4..facd842 100644
--- a/src/Fork.php
+++ b/src/Fork.php
@@ -1,23 +1,27 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the fork of children in Posix mode
-  */
+/**
+ * Manage the fork of children in Posix mode
+ */
 class Fork
 {
-    /** The PID list of childs
-      */
-    private $pidList = array();
+    /**
+     * The PID list of childs
+     */
+    private $pidList = [];
 
-    /** The constructor check if the posix functions exists
-      */
+    /**
+     * The constructor check if the posix functions exists
+     */
     public function __construct()
     {
         if (! function_exists("pcntl_fork")) {
@@ -33,28 +37,31 @@ class Fork
         }
     }
 
-    /** Return the number of active PID
-      */
+    /**
+     * Return the number of active PID
+     */
     public function childCount()
     {
         return count($this->pidList);
     }
 
-    /** Return the list of the active PID
-      */
+    /**
+     * Return the list of the active PID
+     */
     public function childList()
     {
         return $this->pidList;
     }
 
-    /** Create a child
-      * If some parameters are provided, the called child method will receive them
-      * This function fork and return the child PID
-      * @param callable $callable The callback method to use in child
-      * @param mixed|null $params The params to provide to child method
-      * @return The child PID
-      */
-    public function startChild($callable, $params = array())
+    /**
+     * Create a child
+     * If some parameters are provided, the called child method will receive them
+     * This function fork and return the child PID
+     * @param callable $callable The callback method to use in child
+     * @param mixed|null $params The params to provide to child method
+     * @return The child PID
+     */
+    public function startChild($callable, $params = [])
     {
         $pid = pcntl_fork();
         if ($pid === -1) {
@@ -71,16 +78,17 @@ class Fork
         exit;
     }
 
-    /** Create a detached child. The terminal is closed. All the displayed
-      * messages from the child are silently dropped.
-      * If some parameters are provided, the called child method will receive them
-      * This function fork and return the child PID
-      * @param string $name The name displayed in the processus list
-      * @param callable $callable The callback method to use in child
-      * @param mixed|null $params The params to provide to child method
-      * @return The child PID
-      */
-    public function startDetachedChild($name, $callable, $params = array())
+    /**
+     * Create a detached child. The terminal is closed. All the displayed
+     * messages from the child are silently dropped.
+     * If some parameters are provided, the called child method will receive them
+     * This function fork and return the child PID
+     * @param string $name The name displayed in the processus list
+     * @param callable $callable The callback method to use in child
+     * @param mixed|null $params The params to provide to child method
+     * @return The child PID
+     */
+    public function startDetachedChild($name, $callable, $params = [])
     {
         $pid = pcntl_fork();
         if ($pid === -1) {
@@ -116,9 +124,10 @@ class Fork
         exit;
     }
 
-    /** Wait the end of one child
-      * Return the PID of the dead child
-      */
+    /**
+     * Wait the end of one child
+     * Return the PID of the dead child
+     */
     public function waitEndChild()
     {
         while (1) {
@@ -131,8 +140,9 @@ class Fork
         }
     }
 
-    /** Clean the childs which are finished. Do not block the process
-      */
+    /**
+     * Clean the childs which are finished. Do not block the process
+     */
     public function cleanEndChild()
     {
         $stoppedPid =  pcntl_wait($status, WNOHANG);
@@ -142,15 +152,16 @@ class Fork
         }
     }
 
-    /** Stop (SIGTERM) a specific child.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer $pid The PID of the child to stop
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return $pid if the child is dead correctely. Return false if the child is
-      * not dead in the $maxWait time
-      */
+    /**
+     * Stop (SIGTERM) a specific child.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer $pid The PID of the child to stop
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return $pid if the child is dead correctely. Return false if the child is
+     * not dead in the $maxWait time
+     */
     public function stopChild($pid, $maxWait = null)
     {
         if (! key_exists($pid, $this->pidList)) {
@@ -162,15 +173,16 @@ class Fork
         return $this->sendSignalToChild(SIGTERM, $pid, $maxWait);
     }
 
-    /** Kill (SIGKILL) a specific child.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer $pid The PID of the child to stop
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return $pid if the child is dead correctely. Return false if the child is
-      * not dead in the $maxWait time
-      */
+    /**
+     * Kill (SIGKILL) a specific child.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer $pid The PID of the child to stop
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return $pid if the child is dead correctely. Return false if the child is
+     * not dead in the $maxWait time
+     */
     public function killChild($pid, $maxWait = null)
     {
         if (! key_exists($pid, $this->pidList)) {
@@ -182,16 +194,17 @@ class Fork
         return $this->sendSignalToChild(SIGKILL, $pid, $maxWait);
     }
 
-    /** Send a signal to a specific child.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer $signal The signal to send to child (SIGTERM or SIGKILL)
-      * @param integer $pid The PID of the child to stop
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return $pid if the child is dead correctely. Return false if the child is
-      * not dead in the $maxWait time
-      */
+    /**
+     * Send a signal to a specific child.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer $signal The signal to send to child (SIGTERM or SIGKILL)
+     * @param integer $pid The PID of the child to stop
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return $pid if the child is dead correctely. Return false if the child is
+     * not dead in the $maxWait time
+     */
     private function sendSignalToChild($signal, $pid, $maxWait = null)
     {
         posix_kill($pid, $signal);
@@ -209,41 +222,44 @@ class Fork
         return $pid;
     }
 
-    /** Stop all the existing children.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return true if all the children are dead correctely. Return false if at
-      * least one child isnot dead in the $maxWait time
-      */
+    /**
+     * Stop all the existing children.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return true if all the children are dead correctely. Return false if at
+     * least one child isnot dead in the $maxWait time
+     */
     public function stopAll($maxWait = null)
     {
         return $this->sendSigToAll(SIGTERM, $maxWait);
     }
 
-    /** Kill all the existing children.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return true if all the children are dead correctely. Return false if at
-      * least one child isnot dead in the $maxWait time
-      */
+    /**
+     * Kill all the existing children.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return true if all the children are dead correctely. Return false if at
+     * least one child isnot dead in the $maxWait time
+     */
     public function killAll($maxWait = null)
     {
         return $this->sendSigToAll(SIGKILL, $maxWait);
     }
 
-    /** Send a stop or kill signal to all the existing children.
-      * If the $maxWait parameter is set, wait the dead of the child for $maxWait
-      * seconds. If $maxWait is not set, do not wait the child, only send it the
-      * signal
-      * @param integer $signal The signal to send to child (SIGTERM or SIGKILL)
-      * @param integer|null $maxWait The maximum time to wait the child if set
-      * @return true if all the children are dead correctely. Return false if at
-      * least one child isnot dead in the $maxWait time
-      */
+    /**
+     * Send a stop or kill signal to all the existing children.
+     * If the $maxWait parameter is set, wait the dead of the child for $maxWait
+     * seconds. If $maxWait is not set, do not wait the child, only send it the
+     * signal
+     * @param integer $signal The signal to send to child (SIGTERM or SIGKILL)
+     * @param integer|null $maxWait The maximum time to wait the child if set
+     * @return true if all the children are dead correctely. Return false if at
+     * least one child isnot dead in the $maxWait time
+     */
     private function sendSigToAll($signal, $maxWait = null)
     {
         foreach ($this->pidList as $pid) {
diff --git a/src/Form.php b/src/Form.php
index d7efa75..498ff61 100644
--- a/src/Form.php
+++ b/src/Form.php
@@ -1,161 +1,187 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class permit to create easily some forms to HTML (or text mode in
-  * future).
-  * Each field can be checked in AJAX or HTML.
-  */
+/**
+ * This class permit to create easily some forms to HTML (or text mode in
+ * future).
+ * Each field can be checked in AJAX or HTML.
+ */
 class Form
 {
-    /** All the fields
-      */
+    /**
+     * All the fields
+     */
     private $fields = null;
-    /** The name of the form
-      */
+    /**
+     * The name of the form
+     */
     private $formName;
-    /** Allow to debug the PHP
-      */
+    /**
+     * Allow to debug the PHP
+     */
     public $debug = 0;
-    /** CSRF protection
-      * By default, the CSRF protection is active if a SESSION is active too.
-      * It can be disabled if needed. An Exception is raised if the form is send
-      * back without the token
-      */
+    /**
+     * CSRF protection
+     * By default, the CSRF protection is active if a SESSION is active too.
+     * It can be disabled if needed. An Exception is raised if the form is send
+     * back without the token
+     */
     public $csrf = true;
-    /** Name of the CSRF hidden field in HTML page
-      */
+    /**
+     * Name of the CSRF hidden field in HTML page
+     */
     public $csrfField = "CSRF_TOKEN";
-    /** The CSRF token value
-      */
+    /**
+     * The CSRF token value
+     */
     private $csrfToken = "";
 
-    /** The method used to send the values
-      */
+    /**
+     * The method used to send the values
+     */
     private $method = "post";
 
-    /** The Bootstrap width of the column of titles
-      */
+    /**
+     * The Bootstrap width of the column of titles
+     */
     public $titlewidth = 2;
-    /** The Bootstrap width of the column of fields
-      */
+    /**
+     * The Bootstrap width of the column of fields
+     */
     public $fieldwidth = 10;
 
-    /** Define a class for form object
-      */
+    /**
+     * Define a class for form object
+     */
     public $formClass = "form-horizontal";
 
-    /** The logging callable method
-      */
+    /**
+     * The logging callable method
+     */
     private $loggingCallable = null;
-    /** The logging basemsg
-      */
+    /**
+     * The logging basemsg
+     */
     private $loggingBasemsg = "";
 
-    /** Form template (Bootstrap3 by default)
-      */
+    /**
+     * Form template (Bootstrap3 by default)
+     */
     private $formTemplate = "Bootstrap3";
 
-    /** Create a form
-      * @param string|null $formName The form name
-      */
+    /**
+     * Create a form
+     * @param string|null $formName The form name
+     */
     public function __construct($formName = "form")
     {
         $this->formName = $formName;
     }
 
     // The setters of the properties
-    /** Set the debug level
-      * @param integer $val The debug value
-      */
+    /**
+     * Set the debug level
+     * @param integer $val The debug value
+     */
     public function debug($val)
     {
         $this->debug = $val;
         return $this;
     }
 
-    /** Set the csrf enable
-      * @param integer $val The csrf check
-      */
+    /**
+     * Set the csrf enable
+     * @param integer $val The csrf check
+     */
     public function csrf($val)
     {
         $this->csrf = !! $val;
         return $this;
     }
 
-    /** Set the method
-      * @param string $val The method to use
-      */
+    /**
+     * Set the method
+     * @param string $val The method to use
+     */
     public function method($val)
     {
         $this->method = strtolower($val);
         return $this;
     }
 
-    /** Set the csrf token name
-      * @param integer $val The csrf token name
-      */
+    /**
+     * Set the csrf token name
+     * @param integer $val The csrf token name
+     */
     public function csrfField($val)
     {
         $this->csrfField = $val;
         return $this;
     }
 
-    /** Set the titlewidth
-      * @param integer $val The titlewidth
-      */
+    /**
+     * Set the titlewidth
+     * @param integer $val The titlewidth
+     */
     public function titlewidth($val)
     {
         $this->titlewidth = $val;
         return $this;
     }
 
-    /** Set the fieldwidth
-      * @param integer $val The fieldwidth
-      */
+    /**
+     * Set the fieldwidth
+     * @param integer $val The fieldwidth
+     */
     public function fieldwidth($val)
     {
         $this->fieldwidth = $val;
         return $this;
     }
 
-    /** Set the formClass
-      * @param integer $val The formClass
-      */
+    /**
+     * Set the formClass
+     * @param integer $val The formClass
+     */
     public function formClass($val)
     {
         $this->formClass = $val;
         return $this;
     }
 
-    /** Set logging class an method
-      * @param callable $loggingCallable The callable function. This method will
-      * receive two params : the LOG level (LOG_ERROR...) and the message
-      * @param string|null $loggingBasemsg The basemsg added at the beginning of
-      * the log
-      */
+    /**
+     * Set logging class an method
+     * @param callable $loggingCallable The callable function. This method will
+     * receive two params : the LOG level (LOG_ERROR...) and the message
+     * @param string|null $loggingBasemsg The basemsg added at the beginning of
+     * the log
+     */
     public function logging($loggingCallable, $loggingBasemsg = "")
     {
         $this->loggingCallable = $loggingCallable;
         $this->loggingBasemsg = $loggingBasemsg;
     }
 
-    /** Set the Form Templating to use.
-      * Can be : Bootstrap3, Bootstrap4 (later Bulma)
-      * @param string $formTemplate The template to use
-      */
+    /**
+     * Set the Form Templating to use.
+     * Can be : Bootstrap3, Bootstrap4 (later Bulma)
+     * @param string $formTemplate The template to use
+     */
     public function formTemplate($formTemplate)
     {
         if (
             ! in_array(
                 $formTemplate,
-                array("Bootstrap3", "Bootstrap4")
+                ["Bootstrap3", "Bootstrap4"],
+                true
             )
         ) {
             throw new \Exception("Unknown formTemplate provided", 500);
@@ -164,10 +190,11 @@ class Form
         return $this;
     }
 
-    /** The private method to log if the $this->loggingCallable is defined
-      * @param integer $prio The priority of the message
-      * @param string $msg The message to store
-      */
+    /**
+     * The private method to log if the $this->loggingCallable is defined
+     * @param integer $prio The priority of the message
+     * @param string $msg The message to store
+     */
     private function loggingCallable($prio, $msg)
     {
         if (! is_callable($this->loggingCallable)) {
@@ -180,55 +207,58 @@ class Form
         call_user_func($this->loggingCallable, $prio, $base . $msg);
     }
 
-    /** Save the array of fields into the structure.
-      * Available :
-      * - name        : name of the field in the HTML page
-      * - label       : label written to the describe the field
-      * - [titles]    : text written in radio/checkboxes
-      * - [defaults]  : default values. Must be array for checkbox/select, and
-      *                 string for others
-      * - [type]      : text, password, hidden, checkbox, select, radio, submit,
-      *                 textarea
-      *                 text by default
-      * - [help]      : The Help message (written below the field). Overwrited in
-      *                 case of error
-      * - [multiple]  : Multiple selection are possible (if the type supports it)
-      * - [group]     : define a fieldset and define the title with groupe name
-      *                 Warning : all the elements of the same group must be
-      *                 consecutive !
-      * - [readonly]  : put a read-only flag on the field (the user see it but
-      *                 can't interract on it. The value will be sent to next
-      *                 page
-      * - [mandatory] : boolean to add a red star at end of label
-      * - [hidden]    : hide the field (add a style='display:hidden' to the field)
-      * - [maxlength] : the maximum length of the content of the field in chars
-      * - [rows]      : Number of rows
-      * - [cols]      : Number of columns
-      * - [placeholder] : The text to be displayed in the placeholder
-      *
-      * @param array $fields The fields to be displayed
-      */
+    /**
+     * Save the array of fields into the structure.
+     * Available :
+     * - name        : name of the field in the HTML page
+     * - label       : label written to the describe the field
+     * - [titles]    : text written in radio/checkboxes
+     * - [defaults]  : default values. Must be array for checkbox/select, and
+     *                 string for others
+     * - [type]      : text, password, hidden, checkbox, select, radio, submit,
+     *                 textarea
+     *                 text by default
+     * - [help]      : The Help message (written below the field). Overwrited in
+     *                 case of error
+     * - [multiple]  : Multiple selection are possible (if the type supports it)
+     * - [group]     : define a fieldset and define the title with groupe name
+     *                 Warning : all the elements of the same group must be
+     *                 consecutive !
+     * - [readonly]  : put a read-only flag on the field (the user see it but
+     *                 can't interract on it. The value will be sent to next
+     *                 page
+     * - [mandatory] : boolean to add a red star at end of label
+     * - [hidden]    : hide the field (add a style='display:hidden' to the field)
+     * - [maxlength] : the maximum length of the content of the field in chars
+     * - [rows]      : Number of rows
+     * - [cols]      : Number of columns
+     * - [placeholder] : The text to be displayed in the placeholder
+     *
+     * @param array $fields The fields to be displayed
+     */
     public function fields($fields)
     {
         $this->fields = $fields;
     }
 
-    /** Add a field to the form. For the details of a field, see the description
-      * in fields method
-      * @param object $field The field to add
-      */
+    /**
+     * Add a field to the form. For the details of a field, see the description
+     * in fields method
+     * @param object $field The field to add
+     */
     public function addfield($field)
     {
         $this->fields[] = $field;
     }
 
-    /** Return the values provided by the user. Test the CSRF before continue
-      * NEVER read the values from $_POST in your codes or CSRF will not be
-      * checked
-      */
+    /**
+     * Return the values provided by the user. Test the CSRF before continue
+     * NEVER read the values from $_POST in your codes or CSRF will not be
+     * checked
+     */
     public function values()
     {
-        $values = array();
+        $values = [];
         if ($this->method === "post") {
             if (isset($_POST[$this->formName])) {
                 $values = $_POST[$this->formName];
@@ -283,20 +313,21 @@ class Form
         return $values;
     }
 
-    /** Return the fields in HTML code. If $values is provided, use it in place
-      * of default values. In case of select boxes, $values are the selected
-      * elements
-      * $method is the method written in method field of <form>
-      * @param string|null $method The method to use to transmit the form (POST,
-      *                            GET)
-      * @param array|null $values The default values of the fields
-      * @param array|null $errors The fields to put in error with the associated
-      *                           message
-      */
+    /**
+     * Return the fields in HTML code. If $values is provided, use it in place
+     * of default values. In case of select boxes, $values are the selected
+     * elements
+     * $method is the method written in method field of <form>
+     * @param string|null $method The method to use to transmit the form (POST,
+     *                            GET)
+     * @param array|null $values The default values of the fields
+     * @param array|null $errors The fields to put in error with the associated
+     *                           message
+     */
     public function printHTML(
         $method = 'post',
         $values = null,
-        $errors = array()
+        $errors = []
     ) {
         if (count($this->fields) === 0) {
             $this->loggingCallable(
@@ -360,7 +391,7 @@ class Form
                 if (is_array($errors[$field->name])) {
                     $field->errors = $errors[$field->name];
                 } else {
-                    $field->errors = array("error", $errors[$field->name]);
+                    $field->errors = ["error", $errors[$field->name]];
                 }
                 if ($field->type === "hidden") {
                     $field->type = "text";
@@ -421,9 +452,10 @@ class Form
         return $res;
     }
 
-    /** Check the token from the user
-      * @param string $tokenFromUser The value form the user's token
-      */
+    /**
+     * Check the token from the user
+     * @param string $tokenFromUser The value form the user's token
+     */
     public function checkToken($tokenFromUser)
     {
         $csrf = new Csrf();
@@ -433,8 +465,9 @@ class Form
         $csrf->checkThenDeleteToken($tokenFromUser);
     }
 
-    /** Return the token generated in form
-      */
+    /**
+     * Return the token generated in form
+     */
     public function getToken()
     {
         if ($this->csrfToken === "") {
@@ -443,22 +476,23 @@ class Form
         return $this->csrfToken;
     }
 
-    /** Check if the parameters are correct with the defined fields
-      * Need the session !
-      * @param array $values The values to check
-      * @param array|null $fields The fields definition (or use the session
-      * stored one if the value is null)
-      * @return array containing the errors
-      */
-    public function verify($values, $fields = array())
+    /**
+     * Check if the parameters are correct with the defined fields
+     * Need the session !
+     * @param array $values The values to check
+     * @param array|null $fields The fields definition (or use the session
+     * stored one if the value is null)
+     * @return array containing the errors
+     */
+    public function verify($values, $fields = [])
     {
         if (count($fields) === 0) {
             if (! isset($_SESSION["domframework"]["form"]["fields"])) {
-                return array();
+                return [];
             }
             $fields = $_SESSION["domframework"]["form"]["fields"];
         }
-        $errors = array();
+        $errors = [];
         foreach ($fields as $field) {
             if (
                 $field->mandatory !== null &&
@@ -474,25 +508,26 @@ class Form
         return $errors;
     }
 
-    /** If there is at least one error reported in $errors, save the old values
-      * and the errors in the session, and redirect to the provided url.
-      * If there is no error, do nothing
-      * @param array $values The values of the fields filled by the user
-      * @param array $errors The errors detected by a verify
-      * @param object $route the route object
-      * @param string|null $url The URL to redirect. If not provided, use the
-      * $route->requestURL () method to found the calling page
-      *
-      * Example :
-        $form = new \Domframework\form ();
-        $form->logging (array ('\apps\general\controllers\logging', 'log'),
-                        $authHTML["email"]);
-        $values = $form->values ();
-        $errors = $spaceObj->verify ($values);
-        $form->redirectIfError ($values, $errors, $route, "/admin/space/");
-        $spaceuuid = $spaceObj->spaceCreateConceal ($values["spacename"]);
-        $route->redirect ("/admin/space/");
-      */
+    /**
+     * If there is at least one error reported in $errors, save the old values
+     * and the errors in the session, and redirect to the provided url.
+     * If there is no error, do nothing
+     * @param array $values The values of the fields filled by the user
+     * @param array $errors The errors detected by a verify
+     * @param object $route the route object
+     * @param string|null $url The URL to redirect. If not provided, use the
+     * $route->requestURL () method to found the calling page
+     *
+     * Example :
+     * $form = new \Domframework\form ();
+     * $form->logging (array ('\apps\general\controllers\logging', 'log'),
+     * $authHTML["email"]);
+     * $values = $form->values ();
+     * $errors = $spaceObj->verify ($values);
+     * $form->redirectIfError ($values, $errors, $route, "/admin/space/");
+     * $spaceuuid = $spaceObj->spaceCreateConceal ($values["spacename"]);
+     * $route->redirect ("/admin/space/");
+     */
     public function redirectIfError($values, $errors, $route, $url = "")
     {
         $this->saveValuesErrors($values, $errors);
@@ -505,13 +540,14 @@ class Form
         $this->saveValuesErrorsReset();
     }
 
-    /** Save the values and errors to be displayed in the next page if the session
-      * is available
-      * Need the session to work
-      * @param array $values The values of the fields filled by the user
-      * @param array|null $errors The errors detected by a verify
-      */
-    public function saveValuesErrors($values, $errors = array())
+    /**
+     * Save the values and errors to be displayed in the next page if the session
+     * is available
+     * Need the session to work
+     * @param array $values The values of the fields filled by the user
+     * @param array|null $errors The errors detected by a verify
+     */
+    public function saveValuesErrors($values, $errors = [])
     {
         if (isset($_SESSION)) {
             $_SESSION["domframework"]["form"][$this->formName]["values"] = $values;
@@ -519,20 +555,22 @@ class Form
         }
     }
 
-    /** Reset the saved values to provide a clean form next page
-      * Need the session to work
-      */
+    /**
+     * Reset the saved values to provide a clean form next page
+     * Need the session to work
+     */
     public function saveValuesErrorsReset()
     {
         unset($_SESSION["domframework"]["form"][$this->formName]["values"]);
         unset($_SESSION["domframework"]["form"][$this->formName]["errors"]);
     }
 
-    /** Get the stored values if there is one. If there is no stored values,
-      * return the values provided as parameter
-      * @param array $values The values returned if there is no stored values
-      * @return array The values to use
-      */
+    /**
+     * Get the stored values if there is one. If there is no stored values,
+     * return the values provided as parameter
+     * @param array $values The values returned if there is no stored values
+     * @return array The values to use
+     */
     public function getOldValues($values)
     {
         if (isset($_SESSION["domframework"]["form"][$this->formName]["values"])) {
@@ -542,11 +580,12 @@ class Form
         return $values;
     }
 
-    /** Get the stored errors if there is one. If there is no sorted errors,
-      * return the errors provided as parameter
-      * @param array $errors The values returned if there is no stored values
-      * @return array The errors to use
-      */
+    /**
+     * Get the stored errors if there is one. If there is no sorted errors,
+     * return the errors provided as parameter
+     * @param array $errors The values returned if there is no stored values
+     * @return array The errors to use
+     */
     public function getOldErrors($errors)
     {
         if (isset($_SESSION["domframework"]["form"][$this->formName]["errors"])) {
@@ -556,15 +595,16 @@ class Form
         return $errors;
     }
 
-    /** Convert Date received in one format to another.
-      * If the provided string is not corresponding to the format, don't change
-      * anything.
-      * Format used http://php.net/manual/en/datetime.createfromformat.php
-      * @param string $inputDate The date to modify
-      * @param string $inputFormat The input format of the date
-      * @param string $outputFormat The output format of the date
-      * @return string
-      */
+    /**
+     * Convert Date received in one format to another.
+     * If the provided string is not corresponding to the format, don't change
+     * anything.
+     * Format used http://php.net/manual/en/datetime.createfromformat.php
+     * @param string $inputDate The date to modify
+     * @param string $inputFormat The input format of the date
+     * @param string $outputFormat The output format of the date
+     * @return string
+     */
     public function convertDate($inputDate, $inputFormat, $outputFormat)
     {
         $date = \DateTime::CreateFromFormat($inputFormat, $inputDate);
diff --git a/src/Formfield.php b/src/Formfield.php
index 227c04b..7506d7e 100644
--- a/src/Formfield.php
+++ b/src/Formfield.php
@@ -1,85 +1,107 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The definition of a formfield
-  */
+/**
+ * The definition of a formfield
+ */
 class Formfield
 {
-    /** The form name
-      */
+    /**
+     * The form name
+     */
     public $formName;
-    /** The name of the field
-      */
+    /**
+     * The name of the field
+     */
     public $name;
-    /** The label of the field
-      */
+    /**
+     * The label of the field
+     */
     public $label;
-    /** The titles of the field
-      */
+    /**
+     * The titles of the field
+     */
     public $titles;
-    /** The defaults values of the field
-      */
+    /**
+     * The defaults values of the field
+     */
     public $defaults;
-    /** The type of the field (text, password, checkbox, select)
-      */
+    /**
+     * The type of the field (text, password, checkbox, select)
+     */
     public $type = "text";
-    /** The state of the field : hidden or show
-      */
+    /**
+     * The state of the field : hidden or show
+     */
     public $hidden = false;
-    /** Allow a help message to be displayed below the field. In case of error,
-      * it is overrided by the error message
-      */
+    /**
+     * Allow a help message to be displayed below the field. In case of error,
+     * it is overrided by the error message
+     */
     public $help;
-    /** Display the placeholder if needed
-      */
+    /**
+     * Display the placeholder if needed
+     */
     public $placeholder = false;
-    /** The multiplicity of selection of the field (available in select only)
-      */
+    /**
+     * The multiplicity of selection of the field (available in select only)
+     */
     public $multiple;
-    /** The name of group for the fields
-      */
+    /**
+     * The name of group for the fields
+     */
     public $group;
-    /** The read-only feature of the field
-      */
+    /**
+     * The read-only feature of the field
+     */
     public $readonly;
-    /** The field is mandatory
-      */
+    /**
+     * The field is mandatory
+     */
     public $mandatory;
-    /** The statut of error of the field
-      */
+    /**
+     * The statut of error of the field
+     */
     public $error;
-    /** Number of rows
-      */
+    /**
+     * Number of rows
+     */
     public $rows;
-    /** Number of columns
-      */
+    /**
+     * Number of columns
+     */
     public $cols;
-    /** The Bootstrap width of the column of titles
-      */
+    /**
+     * The Bootstrap width of the column of titles
+     */
     public $titlewidth = 2;
-    /** The Bootstrap width of the column of fields
-      */
+    /**
+     * The Bootstrap width of the column of fields
+     */
     public $fieldwidth = 10;
 
-    /** When adding a field, the name and the label are the minimum mandatory
-      * @param string $name Name of the field
-      * @param string|null $label Label of the field
-      */
+    /**
+     * When adding a field, the name and the label are the minimum mandatory
+     * @param string $name Name of the field
+     * @param string|null $label Label of the field
+     */
     public function __construct($name, $label = "")
     {
         $this->name = $name;
         $this->label = $label;
     }
 
-    /** Display really the form
-      */
+    /**
+     * Display really the form
+     */
     public function display()
     {
         $func = "field" . $this->formTemplate . $this->type;
@@ -87,90 +109,100 @@ class Formfield
     }
 
     // Setters for all the properties of the class
-    /** Set the type of the field
-      * @param string $val The value of the type of the field
-      */
+    /**
+     * Set the type of the field
+     * @param string $val The value of the type of the field
+     */
     public function type($val)
     {
         $this->type = $val;
         return $this;
     }
 
-    /** Set the hidden of the field
-      * @param string $val The value of the hidden of the field
-      */
+    /**
+     * Set the hidden of the field
+     * @param string $val The value of the hidden of the field
+     */
     public function hidden($val)
     {
         $this->hidden = !! $val;
         return $this;
     }
 
-    /** Set the help of the field
-      * @param string $val The value of the help of the field
-      */
+    /**
+     * Set the help of the field
+     * @param string $val The value of the help of the field
+     */
     public function help($val)
     {
         $this->help = $val;
         return $this;
     }
 
-    /** Set the placeholder
-      * @param string $val The value of the placeholder
-      */
+    /**
+     * Set the placeholder
+     * @param string $val The value of the placeholder
+     */
     public function placeholder($val)
     {
         $this->placeholder = $val;
         return $this;
     }
 
-    /** Set the multiple
-      * @param string $val The value of the multiple
-      */
+    /**
+     * Set the multiple
+     * @param string $val The value of the multiple
+     */
     public function multiple($val)
     {
         $this->multiple = $val;
         return $this;
     }
 
-    /** Set the group
-      * @param string $val The value of the group
-      */
+    /**
+     * Set the group
+     * @param string $val The value of the group
+     */
     public function group($val)
     {
         $this->group = $val;
         return $this;
     }
 
-    /** Set the readonly
-      * @param string $val The value of the readonly
-      */
+    /**
+     * Set the readonly
+     * @param string $val The value of the readonly
+     */
     public function readonly($val)
     {
         $this->readonly = !! $val;
         return $this;
     }
 
-    /** Set the mandatory
-      * @param string $val The value of the mandatory
-      */
+    /**
+     * Set the mandatory
+     * @param string $val The value of the mandatory
+     */
     public function mandatory($val)
     {
         $this->mandatory = !! $val;
         return $this;
     }
 
-    /** Set the rows
-      * @param string $val The value of the rows
-      */
+    /**
+     * Set the rows
+     * @param string $val The value of the rows
+     */
     public function rows($val)
     {
         $this->rows = $val;
         return $this;
     }
 
-    /** Set the cols
-      * @param string $val The value of the cols
-      */
+    /**
+     * Set the cols
+     * @param string $val The value of the cols
+     */
     public function cols($val)
     {
         $this->cols = $val;
@@ -180,14 +212,15 @@ class Formfield
     //////////////////////////
     ////    BOOTSTRAP3    ////
     //////////////////////////
-    /** Return the checkbox defined
-      */
+    /**
+     * Return the checkbox defined
+     */
     private function fieldBootstrap3checkbox()
     {
         // No $this->multiple, $this->rows $this->cols $this->placeholder,
         //    $this->maxlength
         if (! is_array($this->titles) || count($this->titles) === 0) {
-            $titles = array("");
+            $titles = [""];
         } else {
             $titles = $this->titles;
         }
@@ -326,8 +359,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the hidden field defined
-      */
+    /**
+     * Return the hidden field defined
+     */
     private function fieldBootstrap3hidden()
     {
         $res = "";
@@ -347,8 +381,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the password field defined
-      */
+    /**
+     * Return the password field defined
+     */
     private function fieldBootstrap3password()
     {
         $res = "";
@@ -430,8 +465,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the radio field defined
-      */
+    /**
+     * Return the radio field defined
+     */
     private function fieldBootstrap3radio()
     {
         $res = "";
@@ -469,7 +505,7 @@ class Formfield
         }
         $res .= "    <div class='col-sm-$this->fieldwidth'>\n";
         if (is_string($this->defaults)) {
-            $this->defaults = array($this->defaults);
+            $this->defaults = [$this->defaults];
         }
         $res .= "      <input type='hidden'";
         $res .= " name='$this->formName" . "[";
@@ -531,8 +567,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the checkbox defined
-      */
+    /**
+     * Return the checkbox defined
+     */
     private function fieldBootstrap3select()
     {
         // No $this->placeholder $this->maxlength
@@ -627,7 +664,7 @@ class Formfield
                 } elseif (
                     isset($this->values) &&
                     is_array($this->values) &&
-                    in_array($key, $this->values)
+                    in_array($key, $this->values, true)
                 ) {
                     $res .= " selected='selected'";
                 }
@@ -660,8 +697,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the submit defined
-      */
+    /**
+     * Return the submit defined
+     */
     private function fieldBootstrap3submit()
     {
         $res = "";
@@ -704,8 +742,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the textarea defined
-      */
+    /**
+     * Return the textarea defined
+     */
     private function fieldBootstrap3textarea()
     {
         $res = "";
@@ -789,8 +828,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the text defined
-      */
+    /**
+     * Return the text defined
+     */
     private function fieldBootstrap3text()
     {
         $res = "";
@@ -872,8 +912,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the file defined
-      */
+    /**
+     * Return the file defined
+     */
     private function fieldBootstrap3file()
     {
         $res = "";
@@ -973,14 +1014,15 @@ class Formfield
     //////////////////////////
     ////    BOOTSTRAP4    ////
     //////////////////////////
-    /** Return the checkbox defined
-      */
+    /**
+     * Return the checkbox defined
+     */
     private function fieldBootstrap4checkbox()
     {
         // No $this->multiple, $this->rows $this->cols $this->placeholder,
         //    $this->maxlength
         if (! is_array($this->titles) || count($this->titles) === 0) {
-            $this->titles = array("");
+            $this->titles = [""];
         }
         $res = "";
         $res .= "<div class='form-group";
@@ -1127,8 +1169,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the hidden field defined
-      */
+    /**
+     * Return the hidden field defined
+     */
     private function fieldBootstrap4hidden()
     {
         $res = "";
@@ -1148,8 +1191,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the password field defined
-      */
+    /**
+     * Return the password field defined
+     */
     private function fieldBootstrap4password()
     {
         $res = "";
@@ -1239,8 +1283,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the radio field defined
-      */
+    /**
+     * Return the radio field defined
+     */
     private function fieldBootstrap4radio()
     {
         $res = "";
@@ -1284,7 +1329,7 @@ class Formfield
         }
         $res .= "    <div class='col-sm-$this->fieldwidth'>\n";
         if (is_string($this->defaults)) {
-            $this->defaults = array($this->defaults);
+            $this->defaults = [$this->defaults];
         }
         $res .= "      <input type='hidden'";
         $res .= " name='$this->formName" . "[";
@@ -1348,8 +1393,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the checkbox defined
-      */
+    /**
+     * Return the checkbox defined
+     */
     private function fieldBootstrap4select()
     {
         // No $this->placeholder $this->maxlength
@@ -1454,7 +1500,7 @@ class Formfield
                 } elseif (
                     isset($this->values) &&
                     is_array($this->values) &&
-                    in_array($key, $this->values)
+                    in_array($key, $this->values, true)
                 ) {
                     $res .= " selected='selected'";
                 }
@@ -1485,8 +1531,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the submit defined
-      */
+    /**
+     * Return the submit defined
+     */
     private function fieldBootstrap4submit()
     {
         $res = "";
@@ -1529,8 +1576,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the textarea defined
-      */
+    /**
+     * Return the textarea defined
+     */
     private function fieldBootstrap4textarea()
     {
         $res = "";
@@ -1622,8 +1670,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the text defined
-      */
+    /**
+     * Return the text defined
+     */
     private function fieldBootstrap4text()
     {
         $res = "";
@@ -1713,8 +1762,9 @@ class Formfield
         return $res;
     }
 
-    /** Return the file defined
-      */
+    /**
+     * Return the file defined
+     */
     private function fieldBootstrap4file()
     {
         $res = "";
diff --git a/src/Fts.php b/src/Fts.php
index b834e54..71263f8 100644
--- a/src/Fts.php
+++ b/src/Fts.php
@@ -1,57 +1,66 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The Full Text Search
-  * Analyze the provided search text (like a search engine), and create the
-  * sql query to found the answer. It also allow to check if a sentence is valid
-  * against a searched text
-  * Manage the sentences (enclosed in quotes), or the standalone words,
-  * Manage the non wanted field (beginning by -),
-  * Do not search if the word is smaller than a parameter.
-  * Each sentence or word can be modified by external methods separately
-  */
+/**
+ * The Full Text Search
+ * Analyze the provided search text (like a search engine), and create the
+ * sql query to found the answer. It also allow to check if a sentence is valid
+ * against a searched text
+ * Manage the sentences (enclosed in quotes), or the standalone words,
+ * Manage the non wanted field (beginning by -),
+ * Do not search if the word is smaller than a parameter.
+ * Each sentence or word can be modified by external methods separately
+ */
 class Fts
 {
     ///////////////////////////
     ////     PROPERTIES    ////
     ///////////////////////////
-    /** The minimum length of a token to search
-      */
+    /**
+     * The minimum length of a token to search
+     */
     public $minLength = 3;
 
-    /** The tokens found in the query, with the minus state if the user do not
-      * want the provided token
-      */
+    /**
+     * The tokens found in the query, with the minus state if the user do not
+     * want the provided token
+     */
     private $tokens = null;
 
-    /** The tokens without the too small tokens
-      */
+    /**
+     * The tokens without the too small tokens
+     */
     private $tokensMin = null;
 
-    /** The regexes created by the parser
-      */
+    /**
+     * The regexes created by the parser
+     */
     private $regexes = null;
 
-    /** The callable method to run on each word of the query
-      */
+    /**
+     * The callable method to run on each word of the query
+     */
     private $callTokenWord = null;
 
-    /** The callable method to run on each sentence of the query
-      */
+    /**
+     * The callable method to run on each sentence of the query
+     */
     private $callTokenSentence = null;
 
     ////////////////////////////
     ////     CONSTRUCTOR    ////
     ////////////////////////////
-    /** The constructor check the availability of the MB module
-      */
+    /**
+     * The constructor check the availability of the MB module
+     */
     public function __construct()
     {
         if (! function_exists("mb_strlen")) {
@@ -65,32 +74,36 @@ class Fts
     ////////////////////////
     ////     GETTERS    ////
     ////////////////////////
-    /** Get the tokens store after the search
-      */
+    /**
+     * Get the tokens store after the search
+     */
     public function getTokens()
     {
         return $this->tokens;
     }
 
-    /** Get the tokens store after the search, without the too small ones
-      */
+    /**
+     * Get the tokens store after the search, without the too small ones
+     */
     public function getTokensMin()
     {
         return $this->tokensMin;
     }
 
-    /** Get the regexes defined after the analyzer
-      */
+    /**
+     * Get the regexes defined after the analyzer
+     */
     public function getRegexes()
     {
         return $this->regexes;
     }
 
-    /** Set the method to call on tokens word only
-      * The method must return the token updated
-      * @param callable $callable The callable method
-      * @return $this
-      */
+    /**
+     * Set the method to call on tokens word only
+     * The method must return the token updated
+     * @param callable $callable The callable method
+     * @return $this
+     */
     public function callTokenWord($callable)
     {
         if (! is_callable($callable)) {
@@ -103,11 +116,12 @@ class Fts
         return $this;
     }
 
-    /** Set the method to call on tokens sentence only
-      * The method must return the token updated
-      * @param callable $callable The callable method
-      * @return $this
-      */
+    /**
+     * Set the method to call on tokens sentence only
+     * The method must return the token updated
+     * @param callable $callable The callable method
+     * @return $this
+     */
     public function callTokenSentence($callable)
     {
         if (! is_callable($callable)) {
@@ -123,11 +137,12 @@ class Fts
     //////////////////////////////
     ////    PUBLIC METHODS    ////
     //////////////////////////////
-    /** Explode the query text provided in $query, to be used to search in
-      * database, file...
-      * @param string $query The text to found in the database
-      * @return array The operator and the associated regex value to search
-      */
+    /**
+     * Explode the query text provided in $query, to be used to search in
+     * database, file...
+     * @param string $query The text to found in the database
+     * @return array The operator and the associated regex value to search
+     */
     public function search($query)
     {
         $query = trim($query);
@@ -153,11 +168,12 @@ class Fts
         return $this->regexes;
     }
 
-    /** Construct the query based on the tokens.
-      * The tokens can be updated by methods so the query may be modified by the
-      * external methods
-      * @return string
-      */
+    /**
+     * Construct the query based on the tokens.
+     * The tokens can be updated by methods so the query may be modified by the
+     * external methods
+     * @return string
+     */
     public function getQuery()
     {
         $res = "";
@@ -174,11 +190,12 @@ class Fts
         return $res;
     }
 
-    /** Return $line if the $query match against $line, or false if not
-      * @param string $line The line to examine
-      * @param string $query The query to apply on it
-      * @return string|false The $line if match, false
-      */
+    /**
+     * Return $line if the $query match against $line, or false if not
+     * @param string $line The line to examine
+     * @param string $query The query to apply on it
+     * @return string|false The $line if match, false
+     */
     public function searchString($line, $query)
     {
         $regexes = $this->search($query);
@@ -200,18 +217,19 @@ class Fts
         return $line;
     }
 
-    /** Search in SQL
-      * @param string $query The text to found in the database
-      * @param object $dblayeroo The dblayeroo object to query
-      * @param array|null $fields The fields in $dblayeroo to look for data. If
-      * null, look in all the fields defined in the dblayeroo object
-      * @return array The result of the query
-      */
+    /**
+     * Search in SQL
+     * @param string $query The text to found in the database
+     * @param object $dblayeroo The dblayeroo object to query
+     * @param array|null $fields The fields in $dblayeroo to look for data. If
+     * null, look in all the fields defined in the dblayeroo object
+     * @return array The result of the query
+     */
     public function searchSQL($query, $dblayeroo, $fields)
     {
         $regexes = $this->search($query);
         if (empty($regexes["operator"])) {
-            return array();
+            return [];
         }
         // Clone the object to not modify a previously defined query
         $dbl = clone $dblayeroo;
@@ -259,11 +277,12 @@ class Fts
     ///////////////////////////////
     ////    PRIVATE METHODS    ////
     ///////////////////////////////
-    /** Create the regex associated to the provided tokens and minuses
-      * @param array $tokens The token list
-      * @param array $minuses The minuses list
-      * @return array The operator and the associated regex value to search
-      */
+    /**
+     * Create the regex associated to the provided tokens and minuses
+     * @param array $tokens The token list
+     * @param array $minuses The minuses list
+     * @return array The operator and the associated regex value to search
+     */
     private function regex($tokens, $minuses)
     {
         if (! is_array($tokens)) {
@@ -278,8 +297,8 @@ class Fts
                 500
             );
         }
-        $operator = array();
-        $value = array();
+        $operator = [];
+        $value = [];
         foreach ($tokens as $key => $token) {
             if ($minuses[$key] === "-") {
                 $operator[$key] = "NOT REGEXP";
@@ -290,15 +309,16 @@ class Fts
                      preg_quote($token) .
                      "([<> \[\]\)\"',.;/:!?\r\n]|$)";
         }
-        return array("operator" => $operator, "value" => $value);
+        return ["operator" => $operator, "value" => $value];
     }
 
-    /** Remove the tokens with too small length. Remove the not desired minuses
-      * too.
-      * @param array $tokens The token list
-      * @param array $minuses The minuses list
-      * @return array tokens and minuses
-      */
+    /**
+     * Remove the tokens with too small length. Remove the not desired minuses
+     * too.
+     * @param array $tokens The token list
+     * @param array $minuses The minuses list
+     * @return array tokens and minuses
+     */
     private function tokenMinLength($tokens, $minuses)
     {
         if (! is_array($tokens)) {
@@ -313,30 +333,31 @@ class Fts
                 500
             );
         }
-        $newTokens = array();
-        $newMinuses = array();
+        $newTokens = [];
+        $newMinuses = [];
         foreach ($tokens as $key => $token) {
             if (mb_strlen($token) >= $this->minLength) {
                 $newTokens[] = $token;
                 $newMinuses[] = $minuses[$key];
             }
         }
-        return  array("tokens" => $newTokens, "minuses" => $newMinuses);
+        return  ["tokens" => $newTokens, "minuses" => $newMinuses];
     }
 
-    /** Return an array with the $query tokenized
-      * @param string $query The text to tokenize
-      * @return array tokens and minuses
-      */
+    /**
+     * Return an array with the $query tokenized
+     * @param string $query The text to tokenize
+     * @return array tokens and minuses
+     */
     private function tokenizer($query)
     {
         if (! is_string($query)) {
             throw new \Exception("Invalid query provided to fts:tokenizer", 500);
         }
         $debug = false;
-        $tokens = array();
-        $sentences = array();
-        $minuses = array();
+        $tokens = [];
+        $sentences = [];
+        $minuses = [];
         // Look for sentences
         $offset = 0;
         if ($debug) {
@@ -394,8 +415,8 @@ class Fts
         if ($debug) {
             print_r($tokens);
         }
-        return array("tokens" => $tokens,
+        return ["tokens" => $tokens,
                   "sentences" => $sentences,
-                  "minuses" => $minuses);
+                  "minuses" => $minuses];
     }
 }
diff --git a/src/Getopts.php b/src/Getopts.php
index 1b5a9f2..adf805c 100644
--- a/src/Getopts.php
+++ b/src/Getopts.php
@@ -1,46 +1,54 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the options provided on the command line
-  * Parameters can be :
-  * - Manage -d -dd -ddd as -d -d -d
-  * - Manage mandatory parameter to argument: -f file (-f: in getopt)
-  * - Manage optional parameter to argument: -b (-b:: in getopt)
-  * The long options start with two dashes, the short start with one dash and
-  * can only be one letter
-  * If the token is "--", the following value can start by dash
-  */
+/**
+ * Manage the options provided on the command line
+ * Parameters can be :
+ * - Manage -d -dd -ddd as -d -d -d
+ * - Manage mandatory parameter to argument: -f file (-f: in getopt)
+ * - Manage optional parameter to argument: -b (-b:: in getopt)
+ * The long options start with two dashes, the short start with one dash and
+ * can only be one letter
+ * If the token is "--", the following value can start by dash
+ */
 class Getopts
 {
-    /** The list of options to check
-      */
-    private $options = array();
+    /**
+     * The list of options to check
+     */
+    private $options = [];
 
-    /** The simulate line entry
-      */
+    /**
+     * The simulate line entry
+     */
     private $simulate;
 
-    /** The parameters scanned from the command line or from the simulate entry
-      */
+    /**
+     * The parameters scanned from the command line or from the simulate entry
+     */
     private $parameters;
 
-    /** The rest of the line which is not analyzed
-      */
+    /**
+     * The rest of the line which is not analyzed
+     */
     private $restOfLine;
 
-    /** The name of the program called ($argv[0])
-      */
+    /**
+     * The name of the program called ($argv[0])
+     */
     private $programName;
 
-    /** The constructor check the availability of the MB module
-      */
+    /**
+     * The constructor check the availability of the MB module
+     */
     public function __construct()
     {
         if (! function_exists("mb_strlen")) {
@@ -51,9 +59,10 @@ class Getopts
         }
     }
 
-    /** Set/Get the simulate value
-      * @param string|null $simulate The simulate to get/set
-      */
+    /**
+     * Set/Get the simulate value
+     * @param string|null $simulate The simulate to get/set
+     */
     public function simulate($simulate = null)
     {
         if ($simulate === null) {
@@ -72,18 +81,19 @@ class Getopts
         return $this;
     }
 
-    /** Add a new option to check
-      * @param string $identifier The identifier of the options
-      * @param string $short The short options (one letter with/without
-      * semi-colon) to check
-      * @param array|string $long The long options without double dash,
-      * with/without semi-colon to check. If string, use colon to separate the
-      * options
-      * @param string $description The description of the option
-      * @param string $paramName The description (or name) of the parameter
-      * @param integer $multiple The same identifier can be called multiple time.
-      * Set $multiple to set the maximum number of values
-      */
+    /**
+     * Add a new option to check
+     * @param string $identifier The identifier of the options
+     * @param string $short The short options (one letter with/without
+     * semi-colon) to check
+     * @param array|string $long The long options without double dash,
+     * with/without semi-colon to check. If string, use colon to separate the
+     * options
+     * @param string $description The description of the option
+     * @param string $paramName The description (or name) of the parameter
+     * @param integer $multiple The same identifier can be called multiple time.
+     * Set $multiple to set the maximum number of values
+     */
     public function add(
         $identifier,
         $short,
@@ -129,7 +139,7 @@ class Getopts
             if (trim($long) !== "") {
                 $long = explode(",", $long);
             } else {
-                $long = array();
+                $long = [];
             }
         }
         if (
@@ -184,8 +194,8 @@ class Getopts
         foreach ($long as $key => $l) {
             $long[$key] = "--" . $l;
         }
-        $optShort = array();
-        $optLong = array();
+        $optShort = [];
+        $optLong = [];
         foreach ($this->options as $opt) {
             // Do not allow to add if the short is already defined (with : or :: or
             // without any)
@@ -277,34 +287,35 @@ class Getopts
             }
         }
 
-        $this->options[] = array("identifier" => $identifier,
+        $this->options[] = ["identifier" => $identifier,
                               "short" => $short,
                               "long" => $long,
                               "description" => trim($description),
                               "paramName" => trim($paramName),
-                              "multiple" => $multiple);
+                              "multiple" => $multiple];
         return $this;
     }
 
-    /** Scan the command line and fill the parameters.
-      * Use the simulate line if provided or use the $argv if not
-      * Set the parameters property to an array
-      * @return $this;
-      */
+    /**
+     * Scan the command line and fill the parameters.
+     * Use the simulate line if provided or use the $argv if not
+     * Set the parameters property to an array
+     * @return $this;
+     */
     public function scan()
     {
         global $argv;
         if ($argv === null) {
             // getopts is launched in WebServer. Can not analyze anything
             $this->programName = "";
-            $this->parameters = array();
-            $this->restOfLine = array();
+            $this->parameters = [];
+            $this->restOfLine = [];
             return $this;
         }
         if ($this->simulate !== null) {
             $commandLine = $this->simulate;
         } else {
-            $args = array();
+            $args = [];
             foreach ($argv as $arg) {
                 if (strpos($arg, " ") !== false || $arg === "") {
                     $args[] = "\"$arg\"";
@@ -315,7 +326,7 @@ class Getopts
             $commandLine = implode(" ", $args);
         }
         $debug = false;
-        $tokens = array();
+        $tokens = [];
         $prevToken = "";
         // Look for sentences in the arguments of the command line
         $offset = 0;
@@ -375,20 +386,20 @@ class Getopts
 
         // Analyze the tokens to fill the $this->parameters
         if ($this->restOfLine === null) {
-            $this->restOfLine = array();
+            $this->restOfLine = [];
         }
         if (! array_key_exists(0, $tokens)) {
             throw new \Exception("Can not find the program name (\$argv[0]", 500);
         }
         $this->programName = array_shift($tokens);
         foreach ($this->options as $option) {
-            foreach (array("short", "long") as $len) {
+            foreach (["short", "long"] as $len) {
                 foreach ($option[$len] as $opt) {
                     if ($option["multiple"] < 2) {
                         if ($debug) {
                             echo "CHECK $opt UNIQUE -> ";
                         }
-                        $keys = array_keys($tokens, str_replace(":", "", $opt));
+                        $keys = array_keys($tokens, str_replace(":", "", $opt), true);
                         if (count($keys) === 0) {
                             if ($debug) {
                                 echo "Option Not found\n";
@@ -472,7 +483,7 @@ class Getopts
                         if ($debug) {
                             echo "CHECK $opt MULTIPLE -> ";
                         }
-                        $keys = array_keys($tokens, str_replace(":", "", $opt));
+                        $keys = array_keys($tokens, str_replace(":", "", $opt), true);
                         if (count($keys) === 0) {
                             if ($debug) {
                                 echo "Option Not found\n";
@@ -555,20 +566,21 @@ class Getopts
             ), implode(",", $tokens)), 500);
         }
         if ($this->parameters === null) {
-            $this->parameters = array();
+            $this->parameters = [];
         }
         return $this;
     }
 
-    /** Get the value of the option if set in the command line. If simulate is
-      * defined, use it.
-      * Return false if the option is not set
-      * Return true if the option is set without parameter
-      * Return the content of the parameter if the option is set and parameter is
-      * defined
-      * Throw an exception if the identifier is not set
-      * @param string $identifier The identifier option to get
-      */
+    /**
+     * Get the value of the option if set in the command line. If simulate is
+     * defined, use it.
+     * Return false if the option is not set
+     * Return true if the option is set without parameter
+     * Return the content of the parameter if the option is set and parameter is
+     * defined
+     * Throw an exception if the identifier is not set
+     * @param string $identifier The identifier option to get
+     */
     public function get($identifier)
     {
         $exists = false;
@@ -591,13 +603,14 @@ class Getopts
             return $this->parameters[$identifier];
         }
         if ($opt["multiple"] > 1) {
-            return array();
+            return [];
         }
         return false;
     }
 
-    /** Get the value found in the rest of line (after the double dashes)
-      */
+    /**
+     * Get the value found in the rest of line (after the double dashes)
+     */
     public function restOfLine()
     {
         if ($this->restOfLine === null) {
@@ -606,8 +619,9 @@ class Getopts
         return $this->restOfLine;
     }
 
-    /** Get the name of the program found in the command line
-      */
+    /**
+     * Get the name of the program found in the command line
+     */
     public function programName()
     {
         if ($this->programName === null) {
@@ -616,8 +630,9 @@ class Getopts
         return $this->programName;
     }
 
-    /** Get the Help message with all the descriptions and options
-      */
+    /**
+     * Get the Help message with all the descriptions and options
+     */
     public function help()
     {
         if (count($this->options) === 0) {
@@ -626,7 +641,7 @@ class Getopts
         $d = "";
         foreach ($this->options as $opt) {
             $i = 0;
-            foreach (array("short", "long") as $len) {
+            foreach (["short", "long"] as $len) {
                 foreach ($opt[$len] as $option) {
                     if (strpos($option, ":") !== false) {
                         $param = true;
diff --git a/src/Graph.php b/src/Graph.php
index 34dbf25..c8604a6 100644
--- a/src/Graph.php
+++ b/src/Graph.php
@@ -1,66 +1,80 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to generate an image which is a graphic. A graphic takes
-  * an array of values and draw the lines/histo... like a spreadsheet
-  * graph methods are :
-  *   ->height ($height) or ->width ($width) The heigh/width of the graph
-  */
+/**
+ * This class allow to generate an image which is a graphic. A graphic takes
+ * an array of values and draw the lines/histo... like a spreadsheet
+ * graph methods are :
+ *   ->height ($height) or ->width ($width) The heigh/width of the graph
+ */
 class Graph
 {
-    /** The X axis object
-      */
+    /**
+     * The X axis object
+     */
     public $axisX = null;
 
-    /** The main Y axis object
-      */
+    /**
+     * The main Y axis object
+     */
     public $axisY1 = null;
 
-    /** The optional secondary Y axis object
-      */
+    /**
+     * The optional secondary Y axis object
+     */
     public $axisY2 = null;
 
-    /** The legend object
-      */
+    /**
+     * The legend object
+     */
     public $legend = null;
 
-    /** The graph title object
-      */
+    /**
+     * The graph title object
+     */
     public $title = null;
 
-    /** The height of the graph (150px by default)
-      */
+    /**
+     * The height of the graph (150px by default)
+     */
     private $height = 200;
 
-    /** The width of the graph (200px by default)
-      */
+    /**
+     * The width of the graph (200px by default)
+     */
     private $width = 300;
 
-    /** The background color of the graph (white by default)
-      */
+    /**
+     * The background color of the graph (white by default)
+     */
     private $bgcolor = "whitesmoke";
 
-    /** The graph style by default. Each serie can define another value
-      */
+    /**
+     * The graph style by default. Each serie can define another value
+     */
     private $style = null;
 
-    /** The data object
-      */
+    /**
+     * The data object
+     */
     public $data = null;
 
-    /** The series object
-      */
+    /**
+     * The series object
+     */
     public $series = null;
 
-    /** Constructor : create the objects
-      */
+    /**
+     * Constructor : create the objects
+     */
     public function __construct()
     {
         if (! function_exists("imagecreatetruecolor")) {
@@ -100,10 +114,11 @@ class Graph
         $this->style()->palette("basic");
     }
 
-    /** Set the title position of the graph if the parameter is provided.
-      * Get the title position of the graph if the parameter is not provided
-      * @param string|null $titlePosition The title position of the graph
-      */
+    /**
+     * Set the title position of the graph if the parameter is provided.
+     * Get the title position of the graph if the parameter is not provided
+     * @param string|null $titlePosition The title position of the graph
+     */
     public function titlePosition($titlePosition = null)
     {
         if ($titlePosition === null) {
@@ -122,10 +137,11 @@ class Graph
         return $this;
     }
 
-    /** Set the height of the graph if the parameter is provided.
-      * Get the height of the graph if the parameter is not provided
-      * @param integer|null $height The height of the graph
-      */
+    /**
+     * Set the height of the graph if the parameter is provided.
+     * Get the height of the graph if the parameter is not provided
+     * @param integer|null $height The height of the graph
+     */
     public function height($height = null)
     {
         if ($height === null) {
@@ -141,10 +157,11 @@ class Graph
         return $this;
     }
 
-    /** Set the background-color of the graph if the parameter is provided.
-      * Get the background-color of the graph if the parameter is not provided
-      * @param string|null $bgcolor The background-color of the graph
-      */
+    /**
+     * Set the background-color of the graph if the parameter is provided.
+     * Get the background-color of the graph if the parameter is not provided
+     * @param string|null $bgcolor The background-color of the graph
+     */
     public function bgcolor($bgcolor = null)
     {
         if ($bgcolor === null) {
@@ -152,7 +169,7 @@ class Graph
         }
         if (
             ! is_string($bgcolor) ||
-            ! in_array($bgcolor, Color::colorList())
+            ! in_array($bgcolor, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -163,10 +180,11 @@ class Graph
         return $this;
     }
 
-    /** Set the width of the graph if the parameter is provided.
-      * Get the width of the graph if the parameter is not provided
-      * @param integer|null $width The width of the graph
-      */
+    /**
+     * Set the width of the graph if the parameter is provided.
+     * Get the width of the graph if the parameter is not provided
+     * @param integer|null $width The width of the graph
+     */
     public function width($width = null)
     {
         if ($width === null) {
@@ -182,10 +200,11 @@ class Graph
         return $this;
     }
 
-    /** Set the default style of the graph if the parameter is provided.
-      * Get the default style of the graph if the parameter is not provided
-      * @param string|null $style The style of the graph
-      */
+    /**
+     * Set the default style of the graph if the parameter is provided.
+     * Get the default style of the graph if the parameter is not provided
+     * @param string|null $style The style of the graph
+     */
     public function style($style = null)
     {
         if ($style === null) {
@@ -193,7 +212,7 @@ class Graph
         }
         if (
             ! is_string($style) ||
-            ! in_array($style, array("line", "points", "linePoints"))
+            ! in_array($style, ["line", "points", "linePoints"], true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -208,8 +227,9 @@ class Graph
         return $this->style;
     }
 
-    /** Draw the graph to the screen with the previous defined parameters
-      */
+    /**
+     * Draw the graph to the screen with the previous defined parameters
+     */
     private function drawReal()
     {
         // Read the data
@@ -370,7 +390,7 @@ class Graph
         // The coordinates of the free space. Will be modified each time something
         // is drawing on the graph
         // xtop, ytop, xbottom, ybottom
-        $free = array(0, 0, imagesx($gd), imagesy($gd));
+        $free = [0, 0, imagesx($gd), imagesy($gd)];
         // Add the title on top
         $free = $this->title->draw($gd, $free);
         // Add the legend on right
@@ -432,17 +452,19 @@ class Graph
         imagedestroy($gd);
     }
 
-    /** Draw the graph to the screen with the previous defined parameters
-      */
+    /**
+     * Draw the graph to the screen with the previous defined parameters
+     */
     public function drawImage()
     {
         header('Content-Type: image/png');
         $this->drawReal();
     }
 
-    /** Return the image coded in base64
-      * @return string The base64 string
-      */
+    /**
+     * Return the image coded in base64
+     * @return string The base64 string
+     */
     public function drawBase64()
     {
         ob_start();
diff --git a/src/GraphAxisGeneral.php b/src/GraphAxisGeneral.php
index ed62465..a975794 100644
--- a/src/GraphAxisGeneral.php
+++ b/src/GraphAxisGeneral.php
@@ -1,77 +1,95 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The general axis management */
+/**
+ * The general axis management
+ */
 class GraphAxisGeneral
 {
-    /** The min value of the axis. Do not use it if the axis is composed of labels
-      */
+    /**
+     * The min value of the axis. Do not use it if the axis is composed of labels
+     */
     protected $min = null;
 
-    /** The max value of the axis. Do not use it if the axis is composed of labels
-      */
+    /**
+     * The max value of the axis. Do not use it if the axis is composed of labels
+     */
     protected $max = null;
 
-    /** The label max to display
-      */
+    /**
+     * The label max to display
+     */
     protected $labelMax;
 
-    /** The label min to display
-      */
+    /**
+     * The label min to display
+     */
     protected $labelMin;
 
-    /** The data displayed as values on the axis
-      */
+    /**
+     * The data displayed as values on the axis
+     */
     protected $data;
 
-    /** Set if the axis is only numerical (true) or is composed of labels (false)
-      */
+    /**
+     * Set if the axis is only numerical (true) or is composed of labels (false)
+     */
     protected $numerical;
 
-    /** The minimum bottom position in pixels. Used on vertical axis
-      */
+    /**
+     * The minimum bottom position in pixels. Used on vertical axis
+     */
     protected $bottom;
 
-    /** The maximum top position in pixels. Used on vertical axis
-      */
+    /**
+     * The maximum top position in pixels. Used on vertical axis
+     */
     protected $top;
 
-    /** The minimum left position in pixels. Used on horizontal axis
-      */
+    /**
+     * The minimum left position in pixels. Used on horizontal axis
+     */
     protected $left;
 
-    /** The maximum right position in pixels. Used on horizontal axis
-      */
+    /**
+     * The maximum right position in pixels. Used on horizontal axis
+     */
     protected $right;
 
-    /** The fontfile to write the labels
-      */
+    /**
+     * The fontfile to write the labels
+     */
     protected $fontfile;
 
-    /** The fontsize to write the labels
-      */
+    /**
+     * The fontsize to write the labels
+     */
     protected $fontsize = 8;
 
-    /** Axis color
-      */
+    /**
+     * Axis color
+     */
     protected $axisColor;
 
-    /** Grid color on the axis
-      * Can be set to null or "transparent" to not display the grid
-      */
+    /**
+     * Grid color on the axis
+     * Can be set to null or "transparent" to not display the grid
+     */
     protected $gridColor;
 
-    /** Set the min value of the axis if the parameter is provided.
-      * Get the min value of the axis if the parameter is not provided
-      * @param integer|null $min The min value of the axis
-      */
+    /**
+     * Set the min value of the axis if the parameter is provided.
+     * Get the min value of the axis if the parameter is not provided
+     * @param integer|null $min The min value of the axis
+     */
     public function min($min = null)
     {
         if ($min === null) {
@@ -87,10 +105,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the max value of the axis if the parameter is provided.
-      * Get the max value of the axis if the parameter is not provided
-      * @param integer|null $max The max value of the axis
-      */
+    /**
+     * Set the max value of the axis if the parameter is provided.
+     * Get the max value of the axis if the parameter is not provided
+     * @param integer|null $max The max value of the axis
+     */
     public function max($max = null)
     {
         if ($max === null) {
@@ -106,10 +125,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the data of the axis if the parameter is provided.
-      * Get the data of the axis if the parameter is not provided
-      * @param array|null $data The data of the axis
-      */
+    /**
+     * Set the data of the axis if the parameter is provided.
+     * Get the data of the axis if the parameter is not provided
+     * @param array|null $data The data of the axis
+     */
     public function data($data = null)
     {
         if ($data === null) {
@@ -138,11 +158,12 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set if the axis is numerical or composed of labels if the parameter is
-      * provided.
-      * Get if the axis is numerical if the parameter is not provided
-      * @param boolean|null $numerical the axis is numerical
-      */
+    /**
+     * Set if the axis is numerical or composed of labels if the parameter is
+     * provided.
+     * Get if the axis is numerical if the parameter is not provided
+     * @param boolean|null $numerical the axis is numerical
+     */
     public function numerical($numerical = null)
     {
         if ($numerical === null) {
@@ -159,10 +180,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the bottom position of the axis if the parameter is provided.
-      * Get the bottom position of the axis if the parameter is not provided
-      * @param integer|null $bottom The bottom position of the axis
-      */
+    /**
+     * Set the bottom position of the axis if the parameter is provided.
+     * Get the bottom position of the axis if the parameter is not provided
+     * @param integer|null $bottom The bottom position of the axis
+     */
     public function bottom($bottom = null)
     {
         if ($bottom === null) {
@@ -178,10 +200,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the top position of the axis if the parameter is provided.
-      * Get the top position of the axis if the parameter is not provided
-      * @param integer|null $top The top position of the axis
-      */
+    /**
+     * Set the top position of the axis if the parameter is provided.
+     * Get the top position of the axis if the parameter is not provided
+     * @param integer|null $top The top position of the axis
+     */
     public function top($top = null)
     {
         if ($top === null) {
@@ -197,10 +220,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the left position of the axis if the parameter is provided.
-      * Get the left position of the axis if the parameter is not provided
-      * @param integer|null $left The left position of the axis
-      */
+    /**
+     * Set the left position of the axis if the parameter is provided.
+     * Get the left position of the axis if the parameter is not provided
+     * @param integer|null $left The left position of the axis
+     */
     public function left($left = null)
     {
         if ($left === null) {
@@ -216,10 +240,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the right position of the axis if the parameter is provided.
-      * Get the right position of the axis if the parameter is not provided
-      * @param integer|null $right The right position of the axis
-      */
+    /**
+     * Set the right position of the axis if the parameter is provided.
+     * Get the right position of the axis if the parameter is not provided
+     * @param integer|null $right The right position of the axis
+     */
     public function right($right = null)
     {
         if ($right === null) {
@@ -235,10 +260,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the fontfile of the labels if the parameter is provided.
-      * Get the fontfile of the labels if the parameter is not provided
-      * @param string|null $fontfile The fontfile of the title
-      */
+    /**
+     * Set the fontfile of the labels if the parameter is provided.
+     * Get the fontfile of the labels if the parameter is not provided
+     * @param string|null $fontfile The fontfile of the title
+     */
     public function fontfile($fontfile = null)
     {
         if ($fontfile === null) {
@@ -257,10 +283,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the font size of the labels if the parameter is provided.
-      * Get the font size of the labels if the parameter is not provided
-      * @param integer|null $fontsize The font size of the title
-      */
+    /**
+     * Set the font size of the labels if the parameter is provided.
+     * Get the font size of the labels if the parameter is not provided
+     * @param integer|null $fontsize The font size of the title
+     */
     public function fontsize($fontsize = null)
     {
         if ($fontsize === null) {
@@ -276,10 +303,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the axis color if the parameter is provided.
-      * Get the axis color if the parameter is not provided
-      * @param string|null $axisColor The axis color
-      */
+    /**
+     * Set the axis color if the parameter is provided.
+     * Get the axis color if the parameter is not provided
+     * @param string|null $axisColor The axis color
+     */
     public function axisColor($axisColor = null)
     {
         if ($axisColor === null) {
@@ -287,7 +315,7 @@ class GraphAxisGeneral
         }
         if (
             ! is_string($axisColor) ||
-            ! in_array($axisColor, Color::colorList())
+            ! in_array($axisColor, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -298,10 +326,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Set the grid color if the parameter is provided.
-      * Get the grid color if the parameter is not provided
-      * @param string|null $gridColor The grid color
-      */
+    /**
+     * Set the grid color if the parameter is provided.
+     * Get the grid color if the parameter is not provided
+     * @param string|null $gridColor The grid color
+     */
     public function gridColor($gridColor = null)
     {
         if ($gridColor === null) {
@@ -309,7 +338,7 @@ class GraphAxisGeneral
         }
         if (
             ! is_string($gridColor) ||
-            ! in_array($gridColor, Color::colorList())
+            ! in_array($gridColor, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -320,10 +349,11 @@ class GraphAxisGeneral
         return $this;
     }
 
-    /** Calculate the labels that will be displayed on the axis
-      * @param integer $nbMaxValues The maximum number of values to return
-      * @return array The array of labels to display
-      */
+    /**
+     * Calculate the labels that will be displayed on the axis
+     * @param integer $nbMaxValues The maximum number of values to return
+     * @return array The array of labels to display
+     */
     protected function labels($nbMaxValues)
     {
         // Activate the debug of this method
@@ -376,7 +406,7 @@ class GraphAxisGeneral
             if ($scale === 0 || $scale === 0.0) {
                 die("Scale equal 0 on line " . __LINE__ . "\n");
             }
-            $labels = array();
+            $labels = [];
             if ($this->min <= 0 && $this->max >= 0) {
                 // Return the 0 label and the values arround it
                 $zeroAlreadyDraw = false;
diff --git a/src/GraphAxisHorizontal.php b/src/GraphAxisHorizontal.php
index af7f089..92c1e03 100644
--- a/src/GraphAxisHorizontal.php
+++ b/src/GraphAxisHorizontal.php
@@ -1,20 +1,24 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graph Axis Horizontal class */
+/**
+ * The graph Axis Horizontal class
+ */
 class GraphAxisHorizontal extends GraphAxisGeneral
 {
-    /** Calculate the position in pixels for a value
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the position in pixels for a value
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function position($value)
     {
         if ($value === null) {
@@ -53,7 +57,7 @@ class GraphAxisHorizontal extends GraphAxisGeneral
                     "No data defined for Axis"
                 ) . " " . get_class($this), 406);
             }
-            $pos = array_search($value, $this->data);
+            $pos = array_search($value, $this->data, true);
             if ($pos === false) {
                 return null;
             }
@@ -62,10 +66,11 @@ class GraphAxisHorizontal extends GraphAxisGeneral
         }
     }
 
-    /** Calculate the positionMin, used for labeled axies
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the positionMin, used for labeled axies
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function positionMin($value)
     {
         if ($this->numerical) {
@@ -77,7 +82,7 @@ class GraphAxisHorizontal extends GraphAxisGeneral
                 "No data defined for Axis"
             ) . " " . get_class($this), 406);
         }
-        $pos = array_search($value, $this->data);
+        $pos = array_search($value, $this->data, true);
         if ($pos === false) {
             return null;
         }
@@ -85,10 +90,11 @@ class GraphAxisHorizontal extends GraphAxisGeneral
         return intval($this->left + $width * $pos);
     }
 
-    /** Calculate the positionMax, used for labeled axies
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the positionMax, used for labeled axies
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function positionMax($value)
     {
         $posCenter = $this->position($value);
@@ -101,7 +107,7 @@ class GraphAxisHorizontal extends GraphAxisGeneral
                 "No data defined for Axis"
             ) . " " . get_class($this), 406);
         }
-        $pos = array_search($value, $this->data);
+        $pos = array_search($value, $this->data, true);
         if ($pos === false) {
             return null;
         }
diff --git a/src/GraphAxisVertical.php b/src/GraphAxisVertical.php
index 766198c..023a731 100644
--- a/src/GraphAxisVertical.php
+++ b/src/GraphAxisVertical.php
@@ -1,35 +1,43 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the vertical axis */
+/**
+ * Manage the vertical axis
+ */
 class GraphAxisVertical extends GraphAxisGeneral
 {
-    /** The angle choosed to draw the graph
-      */
+    /**
+     * The angle choosed to draw the graph
+     */
     private $angle;
 
-    /** The padding between the label and the axis
-      */
+    /**
+     * The padding between the label and the axis
+     */
     protected $padding = 7;
 
-    /** The width of the labels + padding (it is the base of the graph) in pixels
-      */
+    /**
+     * The width of the labels + padding (it is the base of the graph) in pixels
+     */
     protected $width;
 
-    /** The number of chars to be displayed in one label
-      */
+    /**
+     * The number of chars to be displayed in one label
+     */
     protected $nbcharsLabel = 0;
 
-    /** Look for the width of the Y axis
-      * @param resource $gd The resource to modify
-      */
+    /**
+     * Look for the width of the Y axis
+     * @param resource $gd The resource to modify
+     */
     public function getWidth($gd)
     {
         if ($this->numerical) {
@@ -73,10 +81,11 @@ class GraphAxisVertical extends GraphAxisGeneral
         }
     }
 
-    /** Calculate the position in pixels for a value
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the position in pixels for a value
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function position($value)
     {
         if ($value === null) {
@@ -111,7 +120,7 @@ class GraphAxisVertical extends GraphAxisGeneral
                     "No data defined for Axis"
                 ) . " " . get_class($this), 406);
             }
-            $pos = array_search($value, $this->data);
+            $pos = array_search($value, $this->data, true);
             if ($pos === false) {
                 return null;
             }
@@ -121,10 +130,11 @@ class GraphAxisVertical extends GraphAxisGeneral
         }
     }
 
-    /** Calculate the positionMin, used for labeled axies
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the positionMin, used for labeled axies
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function positionMin($value)
     {
         if ($this->numerical) {
@@ -136,7 +146,7 @@ class GraphAxisVertical extends GraphAxisGeneral
                 "No data defined for Axis"
             ) . " " . get_class($this), 406);
         }
-        $pos = array_search($value, $this->data);
+        $pos = array_search($value, $this->data, true);
         if ($pos === false) {
             return null;
         }
@@ -144,10 +154,11 @@ class GraphAxisVertical extends GraphAxisGeneral
         return intval($this->bottom + $width * $pos);
     }
 
-    /** Calculate the positionMax, used for labeled axies
-      * If the value is out of range, return null to not draw the point
-      * @param string|float|integer $value The value to position
-      */
+    /**
+     * Calculate the positionMax, used for labeled axies
+     * If the value is out of range, return null to not draw the point
+     * @param string|float|integer $value The value to position
+     */
     public function positionMax($value)
     {
         $posCenter = $this->position($value);
@@ -160,7 +171,7 @@ class GraphAxisVertical extends GraphAxisGeneral
                 "No data defined for Axis"
             ) . " " . get_class($this), 406);
         }
-        $pos = array_search($value, $this->data);
+        $pos = array_search($value, $this->data, true);
         if ($pos === false) {
             return null;
         }
@@ -168,9 +179,10 @@ class GraphAxisVertical extends GraphAxisGeneral
         return intval($this->bottom + $width * $pos + $width);
     }
 
-    /** Draw the axis labels and lines
-      * @param resource $gd The resource to modify
-      */
+    /**
+     * Draw the axis labels and lines
+     * @param resource $gd The resource to modify
+     */
     public function draw($gd)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
diff --git a/src/GraphAxisX.php b/src/GraphAxisX.php
index cf07f2b..4b27b68 100644
--- a/src/GraphAxisX.php
+++ b/src/GraphAxisX.php
@@ -1,36 +1,44 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The X axis management */
+/**
+ * The X axis management
+ */
 class GraphAxisX extends GraphAxisHorizontal
 {
-    /** The angle choosed to draw the graph
-      */
+    /**
+     * The angle choosed to draw the graph
+     */
     private $angle;
 
-    /** The padding between the label and the axis
-      */
+    /**
+     * The padding between the label and the axis
+     */
     private $padding = 7;
 
-    /** The heigth of the labels + padding (it is the base of the graph) in pixels
-      */
+    /**
+     * The heigth of the labels + padding (it is the base of the graph) in pixels
+     */
     private $height;
 
-    /** The number of chars to be displayed in one label
-      */
+    /**
+     * The number of chars to be displayed in one label
+     */
     protected $nbcharsLabel = 0;
 
-    /** Look for the height of the X axis based on the angle of the text when it
-      * will be drawn
-      * @param resource $gd The resource to modify
-      */
+    /**
+     * Look for the height of the X axis based on the angle of the text when it
+     * will be drawn
+     * @param resource $gd The resource to modify
+     */
     public function getHeight($gd)
     {
         // Look for the angle of the value. Start Horizontally (angle=0), then
@@ -62,7 +70,7 @@ class GraphAxisX extends GraphAxisHorizontal
             if ($this->data === null) {
                 return 0;
             }
-            foreach (array(0, 45, 90) as $this->angle) {
+            foreach ([0, 45, 90] as $this->angle) {
                 $bboxMaxHeight = 0;
                 foreach ($this->data as $key => $value) {
                     if ($width === null) {
@@ -90,9 +98,10 @@ class GraphAxisX extends GraphAxisHorizontal
         return $bboxMaxHeight + 2 * $this->padding;
     }
 
-    /** Draw the axis
-      * @param resource $gd The resource to modify
-      */
+    /**
+     * Draw the axis
+     * @param resource $gd The resource to modify
+     */
     public function draw($gd)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
@@ -194,11 +203,12 @@ class GraphAxisX extends GraphAxisHorizontal
         }
     }
 
-    /** Draw the grid
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      * @param integer|float $position The position to draw
-      */
+    /**
+     * Draw the grid
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     * @param integer|float $position The position to draw
+     */
     protected function drawGrid($gd, $width, $position)
     {
         if ($this->gridColor === null || $this->gridColor === "transparent") {
diff --git a/src/GraphAxisY1.php b/src/GraphAxisY1.php
index 8b636a9..7dc0639 100644
--- a/src/GraphAxisY1.php
+++ b/src/GraphAxisY1.php
@@ -1,21 +1,25 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The Y1 axis management */
+/**
+ * The Y1 axis management
+ */
 class GraphAxisY1 extends GraphAxisVertical
 {
-    /** Draw one value on the axis
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      * @param integer|float $val The value to draw
-      */
+    /**
+     * Draw one value on the axis
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     * @param integer|float $val The value to draw
+     */
     protected function drawOne($gd, $width, $val)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
@@ -60,21 +64,23 @@ class GraphAxisY1 extends GraphAxisVertical
         }
     }
 
-    /** Draw the axis
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      */
+    /**
+     * Draw the axis
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     */
     protected function drawAxis($gd, $width)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
         imageline($gd, $width, $this->bottom, $width, $this->top, $axisColor);
     }
 
-    /** Draw the grid
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      * @param integer|float $val The value to draw
-      */
+    /**
+     * Draw the grid
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     * @param integer|float $val The value to draw
+     */
     protected function drawGrid($gd, $width, $val)
     {
         if ($this->gridColor === null || $this->gridColor === "transparent") {
diff --git a/src/GraphAxisY2.php b/src/GraphAxisY2.php
index 193f2b8..1d8a5b3 100644
--- a/src/GraphAxisY2.php
+++ b/src/GraphAxisY2.php
@@ -1,21 +1,25 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The Y2 axis management */
+/**
+ * The Y2 axis management
+ */
 class GraphAxisY2 extends GraphAxisVertical
 {
-    /** Draw one value on the axis
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      * @param integer|float $val The value to draw
-      */
+    /**
+     * Draw one value on the axis
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     * @param integer|float $val The value to draw
+     */
     protected function drawOne($gd, $width, $val)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
@@ -60,10 +64,11 @@ class GraphAxisY2 extends GraphAxisVertical
         }
     }
 
-    /** Draw the axis
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      */
+    /**
+     * Draw the axis
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     */
     protected function drawAxis($gd, $width)
     {
         $axisColor = Color::allocateFromText($gd, $this->axisColor);
@@ -77,11 +82,12 @@ class GraphAxisY2 extends GraphAxisVertical
         );
     }
 
-    /** Draw the grid
-      * @param resource $gd The resource to modify
-      * @param integer $width The width of the labels on the axis
-      * @param integer|float $val The value to draw
-      */
+    /**
+     * Draw the grid
+     * @param resource $gd The resource to modify
+     * @param integer $width The width of the labels on the axis
+     * @param integer|float $val The value to draw
+     */
     protected function drawGrid($gd, $width, $val)
     {
         // The grid can't be graphed for Y2 axis : only the Y1 axis is allowed
diff --git a/src/GraphData.php b/src/GraphData.php
index edee1b6..e015964 100644
--- a/src/GraphData.php
+++ b/src/GraphData.php
@@ -1,35 +1,43 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Read the data */
+/**
+ * Read the data
+ */
 class GraphData
 {
-    /** Store the data when the user provided them. Store them in array form
-      */
+    /**
+     * Store the data when the user provided them. Store them in array form
+     */
     private $data;
 
-    /** The titles are on the first line
-      */
+    /**
+     * The titles are on the first line
+     */
     private $titlesOnFirstLine = null;
 
-    /** The titles are on the first column
-      */
+    /**
+     * The titles are on the first column
+     */
     private $titlesOnFirstColumn = null;
 
-    /** The data are stored horizontally
-      */
+    /**
+     * The data are stored horizontally
+     */
     private $horizontalData = null;
 
-    /** Get the data from an indexed array
-      * @param array $array The data array to graph
-      */
+    /**
+     * Get the data from an indexed array
+     * @param array $array The data array to graph
+     */
     public function arrayIndexed($array)
     {
         $this->data = $array;
@@ -45,10 +53,11 @@ class GraphData
         return $this;
     }
 
-    /** Get the data from an associative array
-      * The associative array are provided by database results
-      * @param array $array The data array to graph
-      */
+    /**
+     * Get the data from an associative array
+     * The associative array are provided by database results
+     * @param array $array The data array to graph
+     */
     public function arrayAssociative($array)
     {
         if (! is_array($array)) {
@@ -60,8 +69,8 @@ class GraphData
                 406
             );
         }
-        $titles = array();
-        $this->data = array();
+        $titles = [];
+        $this->data = [];
         foreach ($array as $line => $lineArr) {
             foreach ($lineArr as $key => $cell) {
                 $titles[$key] = "";
@@ -72,9 +81,10 @@ class GraphData
         return $this;
     }
 
-    /** Get the data from a CSV string
-      * @param string $csv The CSV string
-      */
+    /**
+     * Get the data from a CSV string
+     * @param string $csv The CSV string
+     */
     public function csv($csv)
     {
         $csv = trim($csv);
@@ -92,9 +102,10 @@ class GraphData
         return $this;
     }
 
-    /** Get the data from a JSON string
-      * @param string $json The JSON string
-      */
+    /**
+     * Get the data from a JSON string
+     * @param string $json The JSON string
+     */
     public function json($json)
     {
         $this->data = json_decode($json, true);
@@ -110,11 +121,12 @@ class GraphData
         return $this;
     }
 
-    /** Titles on first line
-      * Set the value if the parameter is provided, get the value if the parameter
-      * is not set
-      * @param boolean|null $titlesOnFirstLine The titles on first line
-      */
+    /**
+     * Titles on first line
+     * Set the value if the parameter is provided, get the value if the parameter
+     * is not set
+     * @param boolean|null $titlesOnFirstLine The titles on first line
+     */
     public function titlesOnFirstLine($titlesOnFirstLine = null)
     {
         if ($titlesOnFirstLine === null) {
@@ -133,11 +145,12 @@ class GraphData
         return $this;
     }
 
-    /** Titles on first column
-      * Set the value if the parameter is provided, get the value if the parameter
-      * is not set
-      * @param boolean|null $titlesOnFirstColumn The titles on first column
-      */
+    /**
+     * Titles on first column
+     * Set the value if the parameter is provided, get the value if the parameter
+     * is not set
+     * @param boolean|null $titlesOnFirstColumn The titles on first column
+     */
     public function titlesOnFirstColumn($titlesOnFirstColumn = null)
     {
         if ($titlesOnFirstColumn === null) {
@@ -156,11 +169,12 @@ class GraphData
         return $this;
     }
 
-    /** The data are stored horizontally in the array
-      * Set the value if the parameter is provided, get the value if the parameter
-      * is not set
-      * @param boolean|null $horizontalData The data are stored horizontally
-      */
+    /**
+     * The data are stored horizontally in the array
+     * Set the value if the parameter is provided, get the value if the parameter
+     * is not set
+     * @param boolean|null $horizontalData The data are stored horizontally
+     */
     public function horizontalData($horizontalData = null)
     {
         if ($horizontalData === null) {
@@ -179,13 +193,14 @@ class GraphData
         return $this;
     }
 
-    /** Get the series in an array with the associated values
-      */
+    /**
+     * Get the series in an array with the associated values
+     */
     public function getSeries()
     {
         // 0. If there is no data to graph, nothing to do
         if (count($this->data) === 0) {
-            return array();
+            return [];
         }
 
         // 1. If $this->titlesOnFirstLine === null, look if the first line contains
@@ -237,12 +252,12 @@ class GraphData
         }
 
         // 4. Create the series
-        $colTitles = array();
-        $lineTitles = array();
-        $series = array();
+        $colTitles = [];
+        $lineTitles = [];
+        $series = [];
         foreach ($this->data as $linePos => $lineArr) {
             if (! is_array($lineArr)) {
-                $lineArr = array($lineArr);
+                $lineArr = [$lineArr];
             }
             if ($linePos === 0) {
                 if ($this->titlesOnFirstLine) {
@@ -251,7 +266,7 @@ class GraphData
                         // First line with titles and vertical data: get the series names
                         $series = array_flip($lineArr);
                         foreach ($series as &$value) {
-                            $value = array();
+                            $value = [];
                         }
                         if ($this->titlesOnFirstColumn) {
                             array_shift($series);
@@ -281,7 +296,7 @@ class GraphData
                     if ($this->titlesOnFirstColumn) {
                         $lineTitles[$linePos] = $cell;
                         if ($this->horizontalData === true) {
-                            $series[$cell] = array();
+                            $series[$cell] = [];
                         }
                         continue;
                     } else {
diff --git a/src/GraphLegend.php b/src/GraphLegend.php
index d250061..bed5b6e 100644
--- a/src/GraphLegend.php
+++ b/src/GraphLegend.php
@@ -1,48 +1,59 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphLegend object */
+/**
+ * The graphLegend object
+ */
 class GraphLegend
 {
-    /** Show the legend (no legend by default)
-      */
+    /**
+     * Show the legend (no legend by default)
+     */
     private $show = false;
 
-    /** The TTF fontfile to use
-      */
+    /**
+     * The TTF fontfile to use
+     */
     private $fontfile = null;
 
-    /** The font size to use
-      */
+    /**
+     * The font size to use
+     */
     private $fontsize = 10;
 
-    /** The legend color for the font
-      */
+    /**
+     * The legend color for the font
+     */
     private $color = "black";
 
-    /** The legend background-color
-      */
+    /**
+     * The legend background-color
+     */
     private $bgcolor = "white";
 
-    /** The legend border color
-      */
+    /**
+     * The legend border color
+     */
     private $borderColor = "black";
 
-    /** The padding arround the title (in px)
-      */
+    /**
+     * The padding arround the title (in px)
+     */
     private $padding = 10;
 
-    /** Set the legend display status if the parameter is provided.
-      * Get the legend display status if the parameter is not provided
-      * @param boolean|null $show The legend display status
-      */
+    /**
+     * Set the legend display status if the parameter is provided.
+     * Get the legend display status if the parameter is not provided
+     * @param boolean|null $show The legend display status
+     */
     public function show($show = null)
     {
         if ($show === null) {
@@ -58,10 +69,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the fontfile of the legend if the parameter is provided.
-      * Get the fontfile of the legend if the parameter is not provided
-      * @param string|null $fontfile The fontfile of the legend
-      */
+    /**
+     * Set the fontfile of the legend if the parameter is provided.
+     * Get the fontfile of the legend if the parameter is not provided
+     * @param string|null $fontfile The fontfile of the legend
+     */
     public function fontfile($fontfile = null)
     {
         if ($fontfile === null) {
@@ -80,10 +92,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the font size of the legend if the parameter is provided.
-      * Get the font size of the legend if the parameter is not provided
-      * @param integer|null $fontsize The font size of the legend
-      */
+    /**
+     * Set the font size of the legend if the parameter is provided.
+     * Get the font size of the legend if the parameter is not provided
+     * @param integer|null $fontsize The font size of the legend
+     */
     public function fontsize($fontsize = null)
     {
         if ($fontsize === null) {
@@ -99,10 +112,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the color of the legend if the parameter is provided.
-      * Get the color of the legend if the parameter is not provided
-      * @param string|null $color The color of the legend
-      */
+    /**
+     * Set the color of the legend if the parameter is provided.
+     * Get the color of the legend if the parameter is not provided
+     * @param string|null $color The color of the legend
+     */
     public function color($color = null)
     {
         if ($color === null) {
@@ -110,7 +124,7 @@ class GraphLegend
         }
         if (
             ! is_string($color) ||
-            ! in_array($color, Color::colorList())
+            ! in_array($color, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -121,10 +135,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the background-color of the legend if the parameter is provided.
-      * Get the background-color of the legend if the parameter is not provided
-      * @param string|null $bgcolor The background-color of the legend
-      */
+    /**
+     * Set the background-color of the legend if the parameter is provided.
+     * Get the background-color of the legend if the parameter is not provided
+     * @param string|null $bgcolor The background-color of the legend
+     */
     public function bgcolor($bgcolor = null)
     {
         if ($bgcolor === null) {
@@ -132,7 +147,7 @@ class GraphLegend
         }
         if (
             ! is_string($bgcolor) ||
-            ! in_array($bgcolor, Color::colorList())
+            ! in_array($bgcolor, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -143,10 +158,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the border color of the legend if the parameter is provided.
-      * Get the border color of the legend if the parameter is not provided
-      * @param string|null $borderColor The border color of the legend
-      */
+    /**
+     * Set the border color of the legend if the parameter is provided.
+     * Get the border color of the legend if the parameter is not provided
+     * @param string|null $borderColor The border color of the legend
+     */
     public function borderColor($borderColor = null)
     {
         if ($borderColor === null) {
@@ -154,7 +170,7 @@ class GraphLegend
         }
         if (
             ! is_string($borderColor) ||
-            ! in_array($borderColor, Color::colorList())
+            ! in_array($borderColor, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -165,10 +181,11 @@ class GraphLegend
         return $this;
     }
 
-    /** Set the padding of the legend if the parameter is provided.
-      * Get the padding of the legend if the parameter is not provided
-      * @param integer|null $padding The padding of the legend
-      */
+    /**
+     * Set the padding of the legend if the parameter is provided.
+     * Get the padding of the legend if the parameter is not provided
+     * @param integer|null $padding The padding of the legend
+     */
     public function padding($padding = null)
     {
         if ($padding === null) {
@@ -184,12 +201,13 @@ class GraphLegend
         return $this;
     }
 
-    /** Draw the legend in the $gd resource provided
-      * @param resource $gd The resource to modify
-      * @param array $free The free space coordinates on the graphic
-      * @param object $series The series to graph
-      * @return array the new free coordinates array
-      */
+    /**
+     * Draw the legend in the $gd resource provided
+     * @param resource $gd The resource to modify
+     * @param array $free The free space coordinates on the graphic
+     * @param object $series The series to graph
+     * @return array the new free coordinates array
+     */
     public function draw($gd, $free, $series)
     {
         if ($this->show === false) {
@@ -265,7 +283,7 @@ class GraphLegend
             $series->serie($serie)->style()->sample($gd, $x1 + 15, $y);
             $y += $this->padding;
         }
-        $free = array($free[0], $free[1], $x1 - 5, $free[3]);
+        $free = [$free[0], $free[1], $x1 - 5, $free[3]];
         return $free;
     }
 }
diff --git a/src/GraphPalette.php b/src/GraphPalette.php
index 623b8e9..8b27b48 100644
--- a/src/GraphPalette.php
+++ b/src/GraphPalette.php
@@ -1,34 +1,38 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphPalette class */
+/**
+ * The graphPalette class
+ */
 class GraphPalette
 {
-    /** Get the complete palette
-      * @param string $name The palette name to get
-      */
+    /**
+     * Get the complete palette
+     * @param string $name The palette name to get
+     */
     public static function getPalette($name)
     {
-        $palette = array(
-        "basic" => array(
-        array("bgcolor" => "indianred", "color" => "firebrick"),
-        array("bgcolor" => "lightblue", "color" => "blue"),
-        array("bgcolor" => "peru", "color" => "maroon"),
-        array("bgcolor" => "mediumaquamarine", "color" => "teal"),
-        array("bgcolor" => "orange", "color" => "goldenrod"),
-        array("bgcolor" => "limegreen", "color" => "green"),
-        array("bgcolor" => "darkgrey", "color" => "grey"),
-        array("bgcolor" => "darkyellow1", "color" => "darkyellow2"),
-        array("bgcolor" => "grey", "color" => "black"),
-        ),
-        );
+        $palette = [
+        "basic" => [
+        ["bgcolor" => "indianred", "color" => "firebrick"],
+        ["bgcolor" => "lightblue", "color" => "blue"],
+        ["bgcolor" => "peru", "color" => "maroon"],
+        ["bgcolor" => "mediumaquamarine", "color" => "teal"],
+        ["bgcolor" => "orange", "color" => "goldenrod"],
+        ["bgcolor" => "limegreen", "color" => "green"],
+        ["bgcolor" => "darkgrey", "color" => "grey"],
+        ["bgcolor" => "darkyellow1", "color" => "darkyellow2"],
+        ["bgcolor" => "grey", "color" => "black"],
+        ],
+        ];
         if (! is_string($name) || ! array_key_exists($name, $palette)) {
             throw new \Exception(dgettext(
                 "domframework",
diff --git a/src/GraphSerie.php b/src/GraphSerie.php
index e9efbaa..b593e57 100644
--- a/src/GraphSerie.php
+++ b/src/GraphSerie.php
@@ -1,64 +1,79 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The serie object */
+/**
+ * The serie object
+ */
 class GraphSerie
 {
-    /** The name of the serie
-      */
+    /**
+     * The name of the serie
+     */
     private $name;
 
-    /** The data values for the serie
-      */
+    /**
+     * The data values for the serie
+     */
     private $data;
 
-    /** The numericalKey is true if all the keys are numeric
-      */
+    /**
+     * The numericalKey is true if all the keys are numeric
+     */
     private $numericalKey = null;
 
-    /** The minimum key of the serie
-      */
+    /**
+     * The minimum key of the serie
+     */
     private $minKey = null;
 
-    /** The maximum key of the serie
-      */
+    /**
+     * The maximum key of the serie
+     */
     private $maxKey = null;
 
-    /** The numericalValue is true if all the values are numeric
-      */
+    /**
+     * The numericalValue is true if all the values are numeric
+     */
     private $numericalValue = null;
 
-    /** The minimum value of the serie
-      */
+    /**
+     * The minimum value of the serie
+     */
     private $minValue = null;
 
-    /** The maximum value of the serie
-      */
+    /**
+     * The maximum value of the serie
+     */
     private $maxValue = null;
 
-    /** The style object for the serie
-      */
+    /**
+     * The style object for the serie
+     */
     private $style;
-    /** If set, hide this serie and do not display it
-      */
+    /**
+     * If set, hide this serie and do not display it
+     */
     private $hide;
 
-    /** The axis used to draw the serie.
-      * If false for main Y axis
-      * If true for secondary Y axis
-      */
+    /**
+     * The axis used to draw the serie.
+     * If false for main Y axis
+     * If true for secondary Y axis
+     */
     private $axisYsecondary = false;
 
-    /** When creating the serie, save the name
-      * @param string $name The name of the serie
-      */
+    /**
+     * When creating the serie, save the name
+     * @param string $name The name of the serie
+     */
     public function __construct($name)
     {
         if (! is_string($name)) {
@@ -73,10 +88,11 @@ class GraphSerie
         $this->name = $name;
     }
 
-    /** Set the data for the serie
-        If the parameter is not provided, return the actual $data value
-      * @param array|null $data The data to store in the serie
-      */
+    /**
+     * Set the data for the serie
+     * If the parameter is not provided, return the actual $data value
+     * @param array|null $data The data to store in the serie
+     */
     public function data($data = null)
     {
         if ($data === null) {
@@ -96,8 +112,9 @@ class GraphSerie
         return $this;
     }
 
-    /** Get the minimum and maximum values and keys
-      */
+    /**
+     * Get the minimum and maximum values and keys
+     */
     private function minmax()
     {
         if ($this->data === null) {
@@ -136,10 +153,11 @@ class GraphSerie
         }
     }
 
-    /** Set/get the numeric value of the serie
-      * If the parameter is not provided, return the actual state
-      * @param boolean|null $numericalValue The state of the numeric value
-      */
+    /**
+     * Set/get the numeric value of the serie
+     * If the parameter is not provided, return the actual state
+     * @param boolean|null $numericalValue The state of the numeric value
+     */
     public function numericalValue($numericalValue = null)
     {
         if ($numericalValue === null) {
@@ -155,8 +173,9 @@ class GraphSerie
         return $this;
     }
 
-    /** The minimum value of the serie
-      */
+    /**
+     * The minimum value of the serie
+     */
     public function minValue()
     {
         if ($this->minValue === null && $this->data !== null) {
@@ -165,8 +184,9 @@ class GraphSerie
         return $this->minValue;
     }
 
-    /** The maximum value of the serie
-      */
+    /**
+     * The maximum value of the serie
+     */
     public function maxValue()
     {
         if ($this->maxValue === null && $this->data !== null) {
@@ -175,10 +195,11 @@ class GraphSerie
         return $this->maxValue;
     }
 
-    /** Set/get the numeric key of the serie
-      * If the parameter is not provided, return the actual state
-      * @param boolean|null $numericalKey The state of the numeric key
-      */
+    /**
+     * Set/get the numeric key of the serie
+     * If the parameter is not provided, return the actual state
+     * @param boolean|null $numericalKey The state of the numeric key
+     */
     public function numericalKey($numericalKey = null)
     {
         if ($numericalKey === null) {
@@ -194,8 +215,9 @@ class GraphSerie
         return $this;
     }
 
-    /** The minimum key of the serie
-      */
+    /**
+     * The minimum key of the serie
+     */
     public function minKey()
     {
         if ($this->minKey === null && $this->data !== null) {
@@ -204,8 +226,9 @@ class GraphSerie
         return $this->minKey;
     }
 
-    /** The maximum key of the serie
-      */
+    /**
+     * The maximum key of the serie
+     */
     public function maxKey()
     {
         if ($this->maxKey === null && $this->data !== null) {
@@ -214,17 +237,19 @@ class GraphSerie
         return $this->maxKey;
     }
 
-    /** The number of elements in the serie
-      */
+    /**
+     * The number of elements in the serie
+     */
     public function count()
     {
         return count($this->data);
     }
 
-    /** Set/Get the graph style for the serie
-      * If the parameter is not provided, return the actual state
-      * @param string|object|null $style The graph style
-      */
+    /**
+     * Set/Get the graph style for the serie
+     * If the parameter is not provided, return the actual state
+     * @param string|object|null $style The graph style
+     */
     public function style($style = null)
     {
         if ($style === null) {
@@ -236,7 +261,7 @@ class GraphSerie
         }
         if (
             ! is_string($style) ||
-            ! in_array($style, array("line", "points", "linePoints"))
+            ! in_array($style, ["line", "points", "linePoints"], true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -249,10 +274,11 @@ class GraphSerie
         }
         return $this->style;
     }
-    /** Set/Get the hidden state of the serie
-      * If the parameter is not provided, return the actual state
-      * @param boolean|null $hide The hidden state
-      */
+    /**
+     * Set/Get the hidden state of the serie
+     * If the parameter is not provided, return the actual state
+     * @param boolean|null $hide The hidden state
+     */
     public function hide($hide = null)
     {
         if ($hide === null) {
@@ -268,11 +294,12 @@ class GraphSerie
         return $this;
     }
 
-    /** The serie is based on the secondary Y axis
-      * Set the value if the parameter is provided, get the value if the parameter
-      * is not set
-      * @param boolean|null $axisYsecondary The Serie on secondary Y axis
-      */
+    /**
+     * The serie is based on the secondary Y axis
+     * Set the value if the parameter is provided, get the value if the parameter
+     * is not set
+     * @param boolean|null $axisYsecondary The Serie on secondary Y axis
+     */
     public function axisYsecondary($axisYsecondary = null)
     {
         if ($axisYsecondary === null) {
@@ -291,12 +318,13 @@ class GraphSerie
         return $this;
     }
 
-    /** Draw the serie with the defined style class
-      * @param resource $gd The resource to modify
-      * @param array $free The free space coordinates on the graphic
-      * @param object $axisX The axis X used on the graph
-      * @param object $axisY The axis Y used on the graph
-      */
+    /**
+     * Draw the serie with the defined style class
+     * @param resource $gd The resource to modify
+     * @param array $free The free space coordinates on the graphic
+     * @param object $axisX The axis X used on the graph
+     * @param object $axisY The axis Y used on the graph
+     */
     public function draw($gd, $free, $axisX, $axisY)
     {
         if ($this->hide === true) {
diff --git a/src/GraphSeries.php b/src/GraphSeries.php
index ece29f6..efb194d 100644
--- a/src/GraphSeries.php
+++ b/src/GraphSeries.php
@@ -1,23 +1,29 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The series objects */
+/**
+ * The series objects
+ */
 class GraphSeries
 {
-    /** The series stored */
-    private $series = array();
+    /**
+     * The series stored
+     */
+    private $series = [];
 
-    /** Return the serie object choosed. If doesn't exists, it is created before
-      * be returned
-      * @param string $name The name of the serie to create
-      */
+    /**
+     * Return the serie object choosed. If doesn't exists, it is created before
+     * be returned
+     * @param string $name The name of the serie to create
+     */
     public function serie($name)
     {
         if (is_integer($name)) {
@@ -38,8 +44,9 @@ class GraphSeries
         return $this->series[$name];
     }
 
-    /** Get the list of the defined series
-      */
+    /**
+     * Get the list of the defined series
+     */
     public function getList()
     {
         $series = [];
@@ -52,9 +59,10 @@ class GraphSeries
         return $series;
     }
 
-    /** Remove an existing serie
-      * @param string $name The name of the serie to remove
-      */
+    /**
+     * Remove an existing serie
+     * @param string $name The name of the serie to remove
+     */
     public function remove($name)
     {
         if (! is_string($name)) {
diff --git a/src/GraphStyleLine.php b/src/GraphStyleLine.php
index 9783df4..d5d9798 100644
--- a/src/GraphStyleLine.php
+++ b/src/GraphStyleLine.php
@@ -1,25 +1,32 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphStyleLine : draw a graph with line */
+/**
+ * The graphStyleLine : draw a graph with line
+ */
 class GraphStyleLine extends GraphStyleLinePoints
 {
-    /** The point color background. To hide the points, choose "transparent"
-      */
+    /**
+     * The point color background. To hide the points, choose "transparent"
+     */
     protected $pointBgcolor = "transparent";
 
-    /** The point color border
-      */
+    /**
+     * The point color border
+     */
     protected $pointColor = "transparent";
 
-    /** Return the name of the style */
+    /**
+     * Return the name of the style
+     */
     public function name()
     {
         return "line";
diff --git a/src/GraphStyleLinePoints.php b/src/GraphStyleLinePoints.php
index 96d9ffa..d04f23f 100644
--- a/src/GraphStyleLinePoints.php
+++ b/src/GraphStyleLinePoints.php
@@ -1,56 +1,72 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphStyleLine : draw a graph with lines */
+/**
+ * The graphStyleLine : draw a graph with lines
+ */
 class GraphStyleLinePoints
 {
-    /** The line color. To hide the lines, choose "transparent"
-      */
+    /**
+     * The line color. To hide the lines, choose "transparent"
+     */
     protected $lineColor;
 
-    /** The point color background. To hide the points, choose "transparent"
-      */
+    /**
+     * The point color background. To hide the points, choose "transparent"
+     */
     protected $pointBgcolor;
 
-    /** The point color border
-      */
+    /**
+     * The point color border
+     */
     protected $pointColor;
 
-    /** The point shape (square, circle, triangle, lozenge)
-      */
+    /**
+     * The point shape (square, circle, triangle, lozenge)
+     */
     protected $pointShape;
 
-    /** The point width in pixel
-      */
+    /**
+     * The point width in pixel
+     */
     protected $pointWidth;
 
-    /** The number of the colors/shapes to use
-      */
+    /**
+     * The number of the colors/shapes to use
+     */
     protected $number;
 
-    /** The allowed shapes */
-    protected $allowedShapes = array("square", "circle", "triangle", "lozenge");
+    /**
+     * The allowed shapes
+     */
+    protected $allowedShapes = ["square", "circle", "triangle", "lozenge"];
 
-    /** The palette to use */
+    /**
+     * The palette to use
+     */
     protected $palette;
 
-    /** Return the name of the style */
+    /**
+     * Return the name of the style
+     */
     public function name()
     {
         return "lineAndPoints";
     }
 
-    /** Set the line color if the parameter is provided.
-      * Get the line color if the parameter is not provided
-      * @param string|null $lineColor The line color
-      */
+    /**
+     * Set the line color if the parameter is provided.
+     * Get the line color if the parameter is not provided
+     * @param string|null $lineColor The line color
+     */
     public function lineColor($lineColor = null)
     {
         if ($lineColor === null) {
@@ -59,7 +75,7 @@ class GraphStyleLinePoints
         if (
             ! is_string($lineColor) ||
             ($lineColor !== "transparent" &&
-            ! in_array($lineColor, Color::colorList()))
+            ! in_array($lineColor, Color::colorList(), true))
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -70,10 +86,11 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Set the palette to use if the parameter is provided
-      * Get the palette if the parameter is not provided
-      * @param string|null $palette The palette to use
-      */
+    /**
+     * Set the palette to use if the parameter is provided
+     * Get the palette if the parameter is not provided
+     * @param string|null $palette The palette to use
+     */
     public function palette($palette = null)
     {
         if ($palette === null) {
@@ -89,10 +106,11 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Set the point background color if the parameter is provided.
-      * Get the point background color if the parameter is not provided
-      * @param string|null $pointBgcolor The point background color
-      */
+    /**
+     * Set the point background color if the parameter is provided.
+     * Get the point background color if the parameter is not provided
+     * @param string|null $pointBgcolor The point background color
+     */
     public function pointBgcolor($pointBgcolor = null)
     {
         if ($pointBgcolor === null) {
@@ -101,7 +119,7 @@ class GraphStyleLinePoints
         if (
             ! is_string($pointBgcolor) ||
             ($pointBgcolor !== "transparent" &&
-            ! in_array($pointBgcolor, Color::colorList()))
+            ! in_array($pointBgcolor, Color::colorList(), true))
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -112,10 +130,11 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Set the point border color if the parameter is provided.
-      * Get the point border color if the parameter is not provided
-      * @param string|null $pointColor The point border color
-      */
+    /**
+     * Set the point border color if the parameter is provided.
+     * Get the point border color if the parameter is not provided
+     * @param string|null $pointColor The point border color
+     */
     public function pointColor($pointColor = null)
     {
         if ($pointColor === null) {
@@ -124,7 +143,7 @@ class GraphStyleLinePoints
         if (
             ! is_string($pointColor) ||
             ($pointColor !== "transparent" &&
-            ! in_array($pointColor, Color::colorList()))
+            ! in_array($pointColor, Color::colorList(), true))
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -135,10 +154,11 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Set the point shape if the parameter is provided.
-      * Get the point shape if the parameter is not provided
-      * @param string|null $pointShape The point shape
-      */
+    /**
+     * Set the point shape if the parameter is provided.
+     * Get the point shape if the parameter is not provided
+     * @param string|null $pointShape The point shape
+     */
     public function pointShape($pointShape = null)
     {
         if ($pointShape === null) {
@@ -146,7 +166,7 @@ class GraphStyleLinePoints
         }
         if (
             ! is_string($pointShape) ||
-            ! in_array($pointShape, $this->allowedShapes)
+            ! in_array($pointShape, $this->allowedShapes, true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -157,10 +177,11 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Set the point width if the parameter is provided.
-      * Get the point width if the parameter is not provided
-      * @param string|null $pointWidth The point width
-      */
+    /**
+     * Set the point width if the parameter is provided.
+     * Get the point width if the parameter is not provided
+     * @param string|null $pointWidth The point width
+     */
     public function pointWidth($pointWidth = null)
     {
         if ($pointWidth === null) {
@@ -176,11 +197,12 @@ class GraphStyleLinePoints
         return $this;
     }
 
-    /** Select the colors, shapes by the serie number.
-      * Do not change any property if the property is already defined
-      * If the parameter is not provided, return the value
-      * @param integer|null $number The serie number
-      */
+    /**
+     * Select the colors, shapes by the serie number.
+     * Do not change any property if the property is already defined
+     * If the parameter is not provided, return the value
+     * @param integer|null $number The serie number
+     */
     public function number($number = null)
     {
         if ($number === null) {
@@ -209,14 +231,15 @@ class GraphStyleLinePoints
         }
     }
 
-    /** Draw in the $gd resource, in the $free array, the data with the parameter
-      * of the style
-      * @param resource $gd The resource to modify
-      * @param array $free The free space coordinates on the graphic
-      * @param array $data The data to graph
-      * @param object $axisX The X axis used to graph
-      * @param object $axisY The Y axis used to graph
-      */
+    /**
+     * Draw in the $gd resource, in the $free array, the data with the parameter
+     * of the style
+     * @param resource $gd The resource to modify
+     * @param array $free The free space coordinates on the graphic
+     * @param array $data The data to graph
+     * @param object $axisX The X axis used to graph
+     * @param object $axisY The Y axis used to graph
+     */
     public function draw($gd, $free, $data, $axisX, $axisY)
     {
         if ($this->lineColor !== "transparent") {
@@ -261,11 +284,12 @@ class GraphStyleLinePoints
         }
     }
 
-    /** Draw a point defined in the property of the class
-      * @param resource $gd The resource to modify
-      * @param integer $posX The X position to draw the point
-      * @param integer $posY The Y position to draw the point
-      */
+    /**
+     * Draw a point defined in the property of the class
+     * @param resource $gd The resource to modify
+     * @param integer $posX The X position to draw the point
+     * @param integer $posY The Y position to draw the point
+     */
     private function drawPoint($gd, $posX, $posY)
     {
         if ($this->pointColor !== "transparent") {
@@ -302,10 +326,10 @@ class GraphStyleLinePoints
                 if ($this->pointBgcolor !== "transparent") {
                     imagefilledpolygon(
                         $gd,
-                        array($posX - $half - 2, $posY,
+                        [$posX - $half - 2, $posY,
                                         $posX, $posY - $half - 2,
                                         $posX + $half + 2, $posY,
-                                        $posX, $posY + $half + 2),
+                                        $posX, $posY + $half + 2],
                         4,
                         $pointBgcolor
                     );
@@ -313,10 +337,10 @@ class GraphStyleLinePoints
                 if ($this->pointColor !== "transparent") {
                     imagepolygon(
                         $gd,
-                        array($posX - $half - 2, $posY,
+                        [$posX - $half - 2, $posY,
                             $posX, $posY - $half - 2,
                             $posX + $half + 2, $posY,
-                            $posX, $posY + $half + 2),
+                            $posX, $posY + $half + 2],
                         4,
                         $pointColor
                     );
@@ -348,9 +372,9 @@ class GraphStyleLinePoints
                 if ($this->pointBgcolor !== "transparent") {
                     imagefilledpolygon(
                         $gd,
-                        array($posX - $half - 2, $posY + $half + 2,
+                        [$posX - $half - 2, $posY + $half + 2,
                                         $posX, $posY - $half - 2,
-                                        $posX + $half + 2, $posY + $half + 2),
+                                        $posX + $half + 2, $posY + $half + 2],
                         3,
                         $pointBgcolor
                     );
@@ -358,9 +382,9 @@ class GraphStyleLinePoints
                 if ($this->pointColor !== "transparent") {
                     imagepolygon(
                         $gd,
-                        array($posX - $half - 2, $posY + $half + 2,
+                        [$posX - $half - 2, $posY + $half + 2,
                                   $posX, $posY - $half - 2,
-                                  $posX + $half + 2, $posY + $half + 2),
+                                  $posX + $half + 2, $posY + $half + 2],
                         3,
                         $pointColor
                     );
@@ -374,11 +398,12 @@ class GraphStyleLinePoints
         }
     }
 
-    /** Draw a sample of the style for the legend
-      * @param resource $gd The resource to modify
-      * @param integer $x The central position of the sample in x
-      * @param integer $y The central position of the sample in y
-      */
+    /**
+     * Draw a sample of the style for the legend
+     * @param resource $gd The resource to modify
+     * @param integer $x The central position of the sample in x
+     * @param integer $y The central position of the sample in y
+     */
     public function sample($gd, $x, $y)
     {
         if ($this->lineColor !== "transparent") {
diff --git a/src/GraphStylePoints.php b/src/GraphStylePoints.php
index c9c3e5f..e3af914 100644
--- a/src/GraphStylePoints.php
+++ b/src/GraphStylePoints.php
@@ -1,21 +1,27 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphStylePoints : draw a graph with points */
+/**
+ * The graphStylePoints : draw a graph with points
+ */
 class GraphStylePoints extends GraphStyleLinePoints
 {
-    /** The line color : transparent
-      */
+    /**
+     * The line color : transparent
+     */
     protected $lineColor = "transparent";
 
-    /** Return the name of the style */
+    /**
+     * Return the name of the style
+     */
     public function name()
     {
         return "points";
diff --git a/src/GraphTitle.php b/src/GraphTitle.php
index 09c5922..18abc70 100644
--- a/src/GraphTitle.php
+++ b/src/GraphTitle.php
@@ -1,40 +1,49 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The graphTitle object */
+/**
+ * The graphTitle object
+ */
 class GraphTitle
 {
-    /** The title text
-      */
+    /**
+     * The title text
+     */
     private $text = null;
 
-    /** The TTF fontfile to use
-      */
+    /**
+     * The TTF fontfile to use
+     */
     private $fontfile = null;
 
-    /** The font size to use
-      */
+    /**
+     * The font size to use
+     */
     private $fontsize = 14;
 
-    /** The title color
-      */
+    /**
+     * The title color
+     */
     private $color = "black";
 
-    /** The padding arround the title (in px)
-      */
+    /**
+     * The padding arround the title (in px)
+     */
     private $padding = 10;
 
-    /** Set the text of the title if the parameter is provided.
-      * Get the text of the title if the parameter is not provided
-      * @param string|null $text The text of the title
-      */
+    /**
+     * Set the text of the title if the parameter is provided.
+     * Get the text of the title if the parameter is not provided
+     * @param string|null $text The text of the title
+     */
     public function text($text = null)
     {
         if ($text === null) {
@@ -50,10 +59,11 @@ class GraphTitle
         return $this;
     }
 
-    /** Set the fontfile of the title if the parameter is provided.
-      * Get the fontfile of the title if the parameter is not provided
-      * @param string|null $fontfile The fontfile of the title
-      */
+    /**
+     * Set the fontfile of the title if the parameter is provided.
+     * Get the fontfile of the title if the parameter is not provided
+     * @param string|null $fontfile The fontfile of the title
+     */
     public function fontfile($fontfile = null)
     {
         if ($fontfile === null) {
@@ -72,10 +82,11 @@ class GraphTitle
         return $this;
     }
 
-    /** Set the font size of the title if the parameter is provided.
-      * Get the font size of the title if the parameter is not provided
-      * @param integer|null $fontsize The font size of the title
-      */
+    /**
+     * Set the font size of the title if the parameter is provided.
+     * Get the font size of the title if the parameter is not provided
+     * @param integer|null $fontsize The font size of the title
+     */
     public function fontsize($fontsize = null)
     {
         if ($fontsize === null) {
@@ -91,10 +102,11 @@ class GraphTitle
         return $this;
     }
 
-    /** Set the color of the title if the parameter is provided.
-      * Get the color of the title if the parameter is not provided
-      * @param string|null $color The color of the title
-      */
+    /**
+     * Set the color of the title if the parameter is provided.
+     * Get the color of the title if the parameter is not provided
+     * @param string|null $color The color of the title
+     */
     public function color($color = null)
     {
         if ($color === null) {
@@ -102,7 +114,7 @@ class GraphTitle
         }
         if (
             ! is_string($color) ||
-            ! in_array($color, Color::colorList())
+            ! in_array($color, Color::colorList(), true)
         ) {
             throw new \Exception(dgettext(
                 "domframework",
@@ -113,10 +125,11 @@ class GraphTitle
         return $this;
     }
 
-    /** Set the padding of the title if the parameter is provided.
-      * Get the padding of the title if the parameter is not provided
-      * @param integer|null $padding The padding of the title
-      */
+    /**
+     * Set the padding of the title if the parameter is provided.
+     * Get the padding of the title if the parameter is not provided
+     * @param integer|null $padding The padding of the title
+     */
     public function padding($padding = null)
     {
         if ($padding === null) {
@@ -132,11 +145,12 @@ class GraphTitle
         return $this;
     }
 
-    /** Draw the title in the $gd resource provided
-      * @param resource $gd The resource to modify
-      * @param array $free The free space coordinates on the graphic
-      * @return array the new free coordinates array
-      */
+    /**
+     * Draw the title in the $gd resource provided
+     * @param resource $gd The resource to modify
+     * @param array $free The free space coordinates on the graphic
+     * @return array the new free coordinates array
+     */
     public function draw($gd, $free)
     {
         if ($this->text === null) {
@@ -161,7 +175,7 @@ class GraphTitle
             $this->fontfile,
             $this->text
         );
-        return array(intval($free[0]), intval($free[1] + $y + $this->padding),
-                  intval($free[2]), intval($free[3]));
+        return [intval($free[0]), intval($free[1] + $y + $this->padding),
+                  intval($free[2]), intval($free[3])];
     }
 }
diff --git a/src/Http.php b/src/Http.php
index 21a49ca..bdf94e9 100644
--- a/src/Http.php
+++ b/src/Http.php
@@ -1,33 +1,36 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** HTTP Helper : understand the best choices provided by browser, the HTTP
-  * codes
-  */
+/**
+ * HTTP Helper : understand the best choices provided by browser, the HTTP
+ * codes
+ */
 class Http
 {
-    /** Choose the best choice from user choices.
-      * Can be used for languages (HTTP_ACCEPT_LANGUAGE), type of pages
-      * (HTTP_ACCEPT)...
-      * Ex. fr, en-gb;q=0.8, en;q=0.7
-      * Ex. text/html,application/xhtml+xml,application/xml;q=0.9,* /*;q=0.8
-      * If available is empty, then return the best priority defined by user,
-      * and throw an exception if nothing is provided for by the user.
-      * If nothing match, return $default
-      * Defined in https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-      * @param string $uservar The parameter provided by the user
-      * @param array|null $available The list of available choices in the soft
-      * @param string|null $default The choice if nothing match
-      * @return string The prefered choice
-      */
-    public function bestChoice($uservar, $available = array(), $default = false)
+    /**
+     * Choose the best choice from user choices.
+     * Can be used for languages (HTTP_ACCEPT_LANGUAGE), type of pages
+     * (HTTP_ACCEPT)...
+     * Ex. fr, en-gb;q=0.8, en;q=0.7
+     * Ex. text/html,application/xhtml+xml,application/xml;q=0.9,* /*;q=0.8
+     * If available is empty, then return the best priority defined by user,
+     * and throw an exception if nothing is provided for by the user.
+     * If nothing match, return $default
+     * Defined in https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+     * @param string $uservar The parameter provided by the user
+     * @param array|null $available The list of available choices in the soft
+     * @param string|null $default The choice if nothing match
+     * @return string The prefered choice
+     */
+    public function bestChoice($uservar, $available = [], $default = false)
     {
         $uservar = str_replace(" ", "", $uservar);
         $userchoices = explode(",", $uservar);
@@ -40,7 +43,7 @@ class Http
 
         // If the priority is not set, must be used in priority
         // If the priority is set, use it if it is valid
-        $choicesPrio = array();
+        $choicesPrio = [];
         foreach ($userchoices as $choice) {
             @list($choice, $prio) = explode(";q=", $choice);
             if (trim($choice) === "") {
@@ -69,7 +72,8 @@ class Http
 
         // Look at the best existing solution
         foreach ($choicesPrio as $choice => $priority) {
-            if ($choice === "*/*") {
+            if ($choice === "
+ */*") {
                 return $default;
             }
             foreach ($available as $avail) {
@@ -88,9 +92,10 @@ class Http
         return $default;
     }
 
-    /** Return the associated text for a HTTP code
-      * @param integer $code The HTTP code to translate in text
-      */
+    /**
+     * Return the associated text for a HTTP code
+     * @param integer $code The HTTP code to translate in text
+     */
     public function codetext($code)
     {
         switch ($code) {
diff --git a/src/HttpConnection.php b/src/HttpConnection.php
index 73260ca..22b708f 100644
--- a/src/HttpConnection.php
+++ b/src/HttpConnection.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
diff --git a/src/Httpclient.php b/src/Httpclient.php
index d2ca070..3e4a038 100644
--- a/src/Httpclient.php
+++ b/src/Httpclient.php
@@ -1,134 +1,163 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This programe allow to get a HTTP page from a site, and examine the content.
-  * It will store the Cookies, allow to do the redirects, follow links and
-  * get form / input and send the values.
-  */
+/**
+ * This programe allow to get a HTTP page from a site, and examine the content.
+ * It will store the Cookies, allow to do the redirects, follow links and
+ * get form / input and send the values.
+ */
 class Httpclient
 {
     //////////////////////////
     ////    PROPERTIES    ////
     //////////////////////////
-    /** The debug depth. 0: Nothing is displayed, 1: Only URL are displayed,
-      * 2: headers only, 3: all the content
-      */
+    /**
+     * The debug depth. 0: Nothing is displayed, 1: Only URL are displayed,
+     * 2: headers only, 3: all the content
+     */
     private $debug = null;
 
-    /** The URL to use
-      */
+    /**
+     * The URL to use
+     */
     private $url = "";
 
-    /** The cookies
-      */
-    private $cookies = array();
+    /**
+     * The cookies
+     */
+    private $cookies = [];
 
-    /** Store the session cookies when analyzing the answer of the server
-      */
+    /**
+     * Store the session cookies when analyzing the answer of the server
+     */
     private $cookiesSession = true;
 
-    /** The headersReceived
-      */
-    private $headersReceived = array();
+    /**
+     * The headersReceived
+     */
+    private $headersReceived = [];
 
-    /** The headersSent to the server
-      */
-    private $headersSent = array();
+    /**
+     * The headersSent to the server
+     */
+    private $headersSent = [];
 
-    /** The Method used to communicate : GET, POST, HEAD, PUT, DELETE
-      */
+    /**
+     * The Method used to communicate : GET, POST, HEAD, PUT, DELETE
+     */
     private $method = "GET";
 
-    /** The TCP port used for connection
-      */
+    /**
+     * The TCP port used for connection
+     */
     private $port = null;
 
-    /** The TCPClient object
-      */
+    /**
+     * The TCPClient object
+     */
     private $tcpclient = null;
 
-    /** The SSL Options parameters (if set)
-      */
-    private $ssloptions = array();
+    /**
+     * The SSL Options parameters (if set)
+     */
+    private $ssloptions = [];
 
-    /** Authentication value
-      */
+    /**
+     * Authentication value
+     */
     private $authentication = "";
 
-    /** The maximum maxsize allowed
-      */
+    /**
+     * The maximum maxsize allowed
+     */
     private $maxsize;
 
-    /** The returned HTTP code from the server
-      */
+    /**
+     * The returned HTTP code from the server
+     */
     private $httpCode = null;
 
-    /** The body size staying to read
-      */
+    /**
+     * The body size staying to read
+     */
     private $bodySize = null;
 
-    /** The content method to get the content : chunked or Content-Length
-      */
+    /**
+     * The content method to get the content : chunked or Content-Length
+     */
     private $contentMethod = false;
 
-    /** Follow X redirects before abort
-      */
+    /**
+     * Follow X redirects before abort
+     */
     private $redirectMaxCount = 10;
 
-    /** The actual number of redirect
-      */
+    /**
+     * The actual number of redirect
+     */
     private $redirectCount = 0;
 
-    /** The form data to send
-      * Will be of type array ("field" => "value")
-      * If value is like "@/tmp/file", use the /tmp/file as content
-      */
-    private $formData = array();
+    /**
+     * The form data to send
+     * Will be of type array ("field" => "value")
+     * If value is like "@/tmp/file", use the /tmp/file as content
+     */
+    private $formData = [];
 
-    /** The raw data to send
-      */
+    /**
+     * The raw data to send
+     */
     private $rawData = "";
 
-    /** The timeout in second before expiring the connection
-      */
+    /**
+     * The timeout in second before expiring the connection
+     */
     private $timeout = 30;
 
-    /** Store the user agent. If it is empty, it will not be sent to the server
-      */
+    /**
+     * Store the user agent. If it is empty, it will not be sent to the server
+     */
     private $useragent = "HTTPClient";
 
-    /** The last valid page known. Used as referer
-      */
+    /**
+     * The last valid page known. Used as referer
+     */
     private $referer = "";
 
-    /** The accept type of data wanted by the client
-      */
+    /**
+     * The accept type of data wanted by the client
+     */
     private $accept = "text/html,application/xhtml+xml,application/xml;q=0.9," .
-    "*/*;q=0.8";
+    "
+ */*;q=0.8";
 
-    /** The accept language wanted by the client
-      */
+    /**
+     * The accept language wanted by the client
+     */
     private $acceptLanguage = "en-us,en;q=0.5";
 
-    /** The accept encoding wanted by the client
-      */
+    /**
+     * The accept encoding wanted by the client
+     */
     private $acceptEncoding = "gzip, deflate";
 
 
-    /** The constructor
-      */
+    /**
+     * The constructor
+     */
     public function __construct()
     {
         $maxsize = str_replace(
-            array('G', 'M', 'K'),
-            array('000000000', '000000', '000'),
+            ['G', 'M', 'K'],
+            ['000000000', '000000', '000'],
             ini_get('memory_limit')
         );
         $maxsize = intval($maxsize / 2);
@@ -143,9 +172,10 @@ class Httpclient
     /////////////////////////////////
     ////    GETTERS / SETTERS    ////
     /////////////////////////////////
-    /** Set / Get the url
-      * @param string|null $url Set / Get the url
-      */
+    /**
+     * Set / Get the url
+     * @param string|null $url Set / Get the url
+     */
     public function url($url = null)
     {
         if ($url === null) {
@@ -158,9 +188,10 @@ class Httpclient
         return $this;
     }
 
-    /** Set / Get the cookies stored
-      * @param array|null $cookies Set / Get the cookies
-      */
+    /**
+     * Set / Get the cookies stored
+     * @param array|null $cookies Set / Get the cookies
+     */
     public function cookies($cookies = null)
     {
         if ($cookies === null) {
@@ -173,9 +204,10 @@ class Httpclient
         return $this;
     }
 
-    /** Set / Get the method
-      * @param string|null $method Set / Get the method
-      */
+    /**
+     * Set / Get the method
+     * @param string|null $method Set / Get the method
+     */
     public function method($method = null)
     {
         if ($method === null) {
@@ -185,55 +217,61 @@ class Httpclient
             throw new \Exception("Invalid method to set : not an string", 406);
         }
         $method = strtoupper($method);
-        if (! in_array($method, array("GET", "POST", "PUT", "DELETE", "HEAD"))) {
+        if (! in_array($method, ["GET", "POST", "PUT", "DELETE", "HEAD"], true)) {
             throw new \Exception("Invalid method to set : not in list", 406);
         }
         $this->method = $method;
         return $this;
     }
 
-    /** Get the headersReceived after the page was get
-      */
+    /**
+     * Get the headersReceived after the page was get
+     */
     public function headersReceived()
     {
         return $this->headersReceived;
     }
 
-    /** Get the headers sent to the server after the page was get
-      */
+    /**
+     * Get the headers sent to the server after the page was get
+     */
     public function headersSent()
     {
         return $this->headersSent;
     }
 
-    /** Set the headers to initial value
-      */
+    /**
+     * Set the headers to initial value
+     */
     public function headersReset()
     {
-        $this->headersSent = array();
+        $this->headersSent = [];
         return $this;
     }
 
-    /** Add a new header to be sent to the server
-      * @param string $header The header to add/update
-      * @param string $value The value to save
-      */
+    /**
+     * Add a new header to be sent to the server
+     * @param string $header The header to add/update
+     * @param string $value The value to save
+     */
     public function headerAdd($header, $value)
     {
         $this->headersSent[$header] = $value;
         return $this;
     }
 
-    /** Get the port used for connection
-      */
+    /**
+     * Get the port used for connection
+     */
     public function port()
     {
         return $this->port;
     }
 
-    /** Set / Get the maximum maxsize allowed
-      * @param integer|null $maxsize The maxsize in bytes
-      */
+    /**
+     * Set / Get the maximum maxsize allowed
+     * @param integer|null $maxsize The maxsize in bytes
+     */
     public function maxsize($maxsize = null)
     {
         if ($maxsize === null) {
@@ -243,19 +281,21 @@ class Httpclient
         return $this;
     }
 
-    /** Get the HTTP Return code from connection
-      */
+    /**
+     * Get the HTTP Return code from connection
+     */
     public function httpCode()
     {
         return $this->httpCode;
     }
 
-    /** Set / Get the debug mode
-      * 0: Nothing is displayed, 1: Only URL are displayed,
-      * 2: headers only send and received, 3: all the content, but without sent
-      * files, 4: all the content
-      * @param boolean|null $debug The debug value to set or get
-      */
+    /**
+     * Set / Get the debug mode
+     * 0: Nothing is displayed, 1: Only URL are displayed,
+     * 2: headers only send and received, 3: all the content, but without sent
+     * files, 4: all the content
+     * @param boolean|null $debug The debug value to set or get
+     */
     public function debug($debug = null)
     {
         if ($debug === null) {
@@ -265,11 +305,12 @@ class Httpclient
         return $this;
     }
 
-    /** Set / Get the form Data
-      * Will be of type array ("field" => "value")
-      * If value is like "@/tmp/file", use the /tmp/file as content
-      * @param array|null $formData The data to send to the server
-      */
+    /**
+     * Set / Get the form Data
+     * Will be of type array ("field" => "value")
+     * If value is like "@/tmp/file", use the /tmp/file as content
+     * @param array|null $formData The data to send to the server
+     */
     public function formData($formData = null)
     {
         if ($formData === null) {
@@ -283,11 +324,12 @@ class Httpclient
         return $this;
     }
 
-    /** Set / Get the content Data
-      * The data is in raw format and will not be modified.
-      * Overwrite the eventually previous form data and rawData
-      * @param string|null $rawData The data to use
-      */
+    /**
+     * Set / Get the content Data
+     * The data is in raw format and will not be modified.
+     * Overwrite the eventually previous form data and rawData
+     * @param string|null $rawData The data to use
+     */
     public function rawData($rawData = null)
     {
         if ($rawData === null) {
@@ -297,14 +339,15 @@ class Httpclient
             throw new \Exception("Invalid raw data provided : not a string", 406);
         }
         $this->rawData = $rawData;
-        $this->formData = array();
+        $this->formData = [];
         return $this;
     }
 
-    /** Get / Set the Store of session cookies when analyzing the answer of the
-      * server
-      * @param boolean|null $cookiesSession Allow to store the session cookies
-      */
+    /**
+     * Get / Set the Store of session cookies when analyzing the answer of the
+     * server
+     * @param boolean|null $cookiesSession Allow to store the session cookies
+     */
     public function cookiesSession($cookiesSession = null)
     {
         if ($cookiesSession === null) {
@@ -314,10 +357,11 @@ class Httpclient
         return $this;
     }
 
-    /** Get / Set the maximum number of redirect to follow before aborting
-      * @param integer|null $redirectMaxCount The maximum number of redirect
-      * before exception
-      */
+    /**
+     * Get / Set the maximum number of redirect to follow before aborting
+     * @param integer|null $redirectMaxCount The maximum number of redirect
+     * before exception
+     */
     public function redirectMaxCount($redirectMaxCount = null)
     {
         if ($redirectMaxCount === null) {
@@ -327,9 +371,10 @@ class Httpclient
         return $this;
     }
 
-    /** Get / Set the actual number of redirect
-      * @param integer|null $redirectCount The actual number of redirect
-      */
+    /**
+     * Get / Set the actual number of redirect
+     * @param integer|null $redirectCount The actual number of redirect
+     */
     public function redirectCount($redirectCount = null)
     {
         if ($redirectCount === null) {
@@ -339,10 +384,11 @@ class Httpclient
         return $this;
     }
 
-    /** Get / Set the timeout in second before expiring the connection
-      * 30s by default
-      * @param integer|null $timeout The timeout value
-      */
+    /**
+     * Get / Set the timeout in second before expiring the connection
+     * 30s by default
+     * @param integer|null $timeout The timeout value
+     */
     public function timeout($timeout = null)
     {
         if ($timeout === null) {
@@ -352,10 +398,11 @@ class Httpclient
         return $this;
     }
 
-    /** Get / Set the useragent sent to the server. If it is empty, it will not be
-      * sent
-      * @param string|null $useragent The user agent to use
-      */
+    /**
+     * Get / Set the useragent sent to the server. If it is empty, it will not be
+     * sent
+     * @param string|null $useragent The user agent to use
+     */
     public function useragent($useragent = null)
     {
         if ($useragent === null) {
@@ -365,10 +412,11 @@ class Httpclient
         return $this;
     }
 
-    /** Get/Set the referer page
-      * @param string|null $referer The new referer that will be used on next
-      * request
-      */
+    /**
+     * Get/Set the referer page
+     * @param string|null $referer The new referer that will be used on next
+     * request
+     */
     public function referer($referer = null)
     {
         if ($referer === null) {
@@ -378,9 +426,10 @@ class Httpclient
         return $this;
     }
 
-    /** Get/Set the accept type of page wanted by the client
-      * @param string|null $accept The accept types with weight
-      */
+    /**
+     * Get/Set the accept type of page wanted by the client
+     * @param string|null $accept The accept types with weight
+     */
     public function accept($accept = null)
     {
         if ($accept === null) {
@@ -390,9 +439,10 @@ class Httpclient
         return $this;
     }
 
-    /** Get/Set the accept Language wanted by the client
-      * @param string|null $acceptLanguage The languages with weight
-      */
+    /**
+     * Get/Set the accept Language wanted by the client
+     * @param string|null $acceptLanguage The languages with weight
+     */
     public function acceptLanguage($acceptLanguage = null)
     {
         if ($acceptLanguage === null) {
@@ -402,9 +452,10 @@ class Httpclient
         return $this;
     }
 
-    /** Get/Set the accept Encoding wanted by the client
-      * @param string|null $acceptEncoding The encoding requested
-      */
+    /**
+     * Get/Set the accept Encoding wanted by the client
+     * @param string|null $acceptEncoding The encoding requested
+     */
     public function acceptEncoding($acceptEncoding = null)
     {
         if ($acceptEncoding === null) {
@@ -414,21 +465,23 @@ class Httpclient
         return $this;
     }
 
-    /** Set the authentication in Basic type
-      * @param string $login The login to use
-      * @param string $password The password to use
-      */
+    /**
+     * Set the authentication in Basic type
+     * @param string $login The login to use
+     * @param string $password The password to use
+     */
     public function authBasic($login, $password)
     {
         $this->authentication = "Basic " . base64_encode("$login:$password");
         return $this;
     }
 
-    /** Get/Set authentication
-      * To remove authentication, pass "" to $auth arg
-      * @param string|null $auth The authentication string to send
-      * @return value or $this
-      */
+    /**
+     * Get/Set authentication
+     * To remove authentication, pass "" to $auth arg
+     * @param string|null $auth The authentication string to send
+     * @return value or $this
+     */
     public function authentication($auth = null)
     {
         if ($auth === null) {
@@ -438,10 +491,11 @@ class Httpclient
         return $this;
     }
 
-    /** Get/Set the ssl options
-      * @param array|null $ssloptions The SSL Options to use
-      * @return $this
-      */
+    /**
+     * Get/Set the ssl options
+     * @param array|null $ssloptions The SSL Options to use
+     * @return $this
+     */
     public function ssloptions($ssloptions = null)
     {
         if ($ssloptions === null) {
@@ -451,15 +505,17 @@ class Httpclient
         return $this;
     }
 
-    /** Get meta data, like the timeout state, the crypto protocol and ciphers...
-      */
+    /**
+     * Get meta data, like the timeout state, the crypto protocol and ciphers...
+     */
     public function getMeta()
     {
         return $this->tcpclient->getMeta();
     }
 
-    /** Return the TCP infos of the connection
-      */
+    /**
+     * Return the TCP infos of the connection
+     */
     public function getInfo()
     {
         return $this->tcpclient->getInfo();
@@ -468,18 +524,19 @@ class Httpclient
     //////////////////////////////////
     ////    THE ACTIVE METHODS    ////
     //////////////////////////////////
-    /** Get the page
-      * Will fill the headersReceived, cookies and port properties.
-      * This will fill all the RAM if the page is too big. For big files, use
-      *    $httpclient->url ($url)
-      *               ->connect () ;
-      *    while ($content = $httpclient->read ()) {}
-      *    $httpclient->disconnect ();
-      * If no maxsize limit is set, limit the download to 8G
-      * @param string $url The URL to get
-      * @param array|null $ssloptions The SSL options (stream_context_set_option)
-      * @return the page body
-      */
+    /**
+     * Get the page
+     * Will fill the headersReceived, cookies and port properties.
+     * This will fill all the RAM if the page is too big. For big files, use
+     *    $httpclient->url ($url)
+     *               ->connect () ;
+     *    while ($content = $httpclient->read ()) {}
+     *    $httpclient->disconnect ();
+     * If no maxsize limit is set, limit the download to 8G
+     * @param string $url The URL to get
+     * @param array|null $ssloptions The SSL options (stream_context_set_option)
+     * @return the page body
+     */
     public function getPage($url, $ssloptions = null)
     {
         $this->method("GET");
@@ -488,18 +545,19 @@ class Httpclient
         return $this->getContent();
     }
 
-    /** Init the connection to URL
-      * Will fill the headersReceived, cookies and port properties.
-      * @param array|null $ssloptions The SSL options (stream_context_set_option)
-      * @return $this
-      */
+    /**
+     * Init the connection to URL
+     * Will fill the headersReceived, cookies and port properties.
+     * @param array|null $ssloptions The SSL options (stream_context_set_option)
+     * @return $this
+     */
     public function connect($ssloptions = null)
     {
         $this->log(2, "## URL Start $this->method $this->url");
         if ($ssloptions !== null) {
             $this->ssloptions = $ssloptions;
         }
-        $this->headersReceived = array();
+        $this->headersReceived = [];
         $this->bodySize = null;
         $this->httpCode = null;
         if ($this->url === "") {
@@ -683,7 +741,7 @@ class Httpclient
         }
 
         // Get the result header from the server
-        $headers = array();
+        $headers = [];
         while (($header = $this->tcpclient->read(4095)) !== "") {
             @list($key, $val) = explode(":", $header, 2);
             if ($val === null) {
@@ -691,7 +749,7 @@ class Httpclient
             } else {
                 if (key_exists($key, $headers)) {
                     if (! (is_array($headers[$key]))) {
-                        $headers[$key] = array($headers[$key]);
+                        $headers[$key] = [$headers[$key]];
                     }
                     $headers[$key][] = trim($val);
                 } else {
@@ -713,7 +771,7 @@ class Httpclient
         // Add the received cookies to property
         if (isset($headers["Set-Cookie"])) {
             if (! is_array($headers["Set-Cookie"])) {
-                $cookies = array($headers["Set-Cookie"]);
+                $cookies = [$headers["Set-Cookie"]];
             } else {
                 $cookies = $headers["Set-Cookie"];
             }
@@ -757,8 +815,9 @@ class Httpclient
         return $this;
     }
 
-    /** Get the content from the server and put it in memory
-      */
+    /**
+     * Get the content from the server and put it in memory
+     */
     public function getContent()
     {
         $url = $this->url;
@@ -823,12 +882,13 @@ class Httpclient
         return $content;
     }
 
-    /** Read max MAXSIZE bytes
-      * Return "" if all the file is received
-      * 3 methods are supported : Chunked mode, Content-Length defined and all
-      * until the connection will be closed by the server
-      * @param integer $maxsize The maxsize to get in this read
-      */
+    /**
+     * Read max MAXSIZE bytes
+     * Return "" if all the file is received
+     * 3 methods are supported : Chunked mode, Content-Length defined and all
+     * until the connection will be closed by the server
+     * @param integer $maxsize The maxsize to get in this read
+     */
     public function read($maxsize = 4096)
     {
         if ($this->tcpclient === null) {
@@ -870,17 +930,19 @@ class Httpclient
         return $content;
     }
 
-    /** Disconnect the connection
-      */
+    /**
+     * Disconnect the connection
+     */
     public function disconnect()
     {
         $this->tcpclient = null;
     }
 
-    /** Display the log message
-      * @param integer $priority The minimal priority to display the message
-      * @param mixed $message The message to display
-      */
+    /**
+     * Display the log message
+     * @param integer $priority The minimal priority to display the message
+     * @param mixed $message The message to display
+     */
     public function log($priority, $message)
     {
         if ($this->debug < $priority) {
@@ -902,9 +964,10 @@ class Httpclient
         }
     }
 
-    /** Return the base URL of the site
-      * @return the URL
-      */
+    /**
+     * Return the base URL of the site
+     * @return the URL
+     */
     public function baseURL()
     {
         if ($this->url === "") {
@@ -923,37 +986,39 @@ class Httpclient
     //////////////////////////////////
     ////    COOKIES MANAGEMENT    ////
     //////////////////////////////////
-    /** The cookies are stored in Netscape cookies.txt file :
-      The layout of Netscape's cookies.txt file is such that each line contains
-      one name-value pair. An example cookies.txt file may have an entry that
-      looks like this:
+    /**
+     * The cookies are stored in Netscape cookies.txt file :
+     * The layout of Netscape's cookies.txt file is such that each line contains
+     * one name-value pair. An example cookies.txt file may have an entry that
+     * looks like this:
+     *
+     * .netscape.com   TRUE   /   FALSE   946684799   NETSCAPE_ID   100103
+     *
+     * Each line represents a single piece of stored information. A tab is inserted
+     * between each of the fields.
+     *
+     * From left-to-right, here is what each field represents:
+     * domain     : The domain that created AND that can read the variable.
+     * flag       : A TRUE/FALSE value indicating if all machines within a given
+     * domain can access the variable. This value is set automatically
+     * by the browser, depending on the value you set for domain.
+     * path       : The path within the domain that the variable is valid for.
+     * secure     : A TRUE/FALSE value indicating if a secure connection with the
+     * domain is needed to access the variable.
+     * expiration : The UNIX time that the variable will expire on. UNIX time is
+     * defined as the number of seconds since Jan 1, 1970 00:00:00
+     * GMT.
+     * name       : The name of the variable.
+     *
+     * value      : The value of the variable.
+     */
 
-      .netscape.com   TRUE   /   FALSE   946684799   NETSCAPE_ID   100103
-
-      Each line represents a single piece of stored information. A tab is inserted
-      between each of the fields.
-
-      From left-to-right, here is what each field represents:
-      domain     : The domain that created AND that can read the variable.
-      flag       : A TRUE/FALSE value indicating if all machines within a given
-                   domain can access the variable. This value is set automatically
-                   by the browser, depending on the value you set for domain.
-      path       : The path within the domain that the variable is valid for.
-      secure     : A TRUE/FALSE value indicating if a secure connection with the
-                   domain is needed to access the variable.
-      expiration : The UNIX time that the variable will expire on. UNIX time is
-                   defined as the number of seconds since Jan 1, 1970 00:00:00
-                   GMT.
-      name       : The name of the variable.
-
-      value      : The value of the variable.
-    */
-
-    /** Add a cookie in the store
-      * If the cookie already exists, the old one is replaced by the new value
-      * @param string $domain The domain to use
-      * @param string $cookie The cookie content to store
-      */
+    /**
+     * Add a cookie in the store
+     * If the cookie already exists, the old one is replaced by the new value
+     * @param string $domain The domain to use
+     * @param string $cookie The cookie content to store
+     */
     public function cookieAdd($domain, $cookie)
     {
         // echo "COOKIE = $cookie\n";
@@ -1033,19 +1098,20 @@ class Httpclient
         }
     }
 
-    /** Check if some stored cookies must be send to the server, because they are
-      * in the same domain.
-      * @param string $url The URL requested
-      * @return array the cookies to add to the headers send to the server
-      */
+    /**
+     * Check if some stored cookies must be send to the server, because they are
+     * in the same domain.
+     * @param string $url The URL requested
+     * @return array the cookies to add to the headers send to the server
+     */
     public function cookieToSend($url)
     {
         $parseURL = parse_url($this->url);
         if ($parseURL === false) {
-            return array();
+            return [];
         }
         if (! key_exists("host", $parseURL)) {
-            return array();
+            return [];
         }
         if (! key_exists("path", $parseURL)) {
             $parseURL["path"] = "/";
@@ -1053,7 +1119,7 @@ class Httpclient
         if ($parseURL["path"][0] !== "/") {
             $parseURL["path"] = "/" . $parseURL["path"];
         }
-        $res = array();
+        $res = [];
         foreach ($this->cookies as $storedCookie) {
             $storedCookie = explode("\t", $storedCookie);
             if (
diff --git a/src/Httpserver.php b/src/Httpserver.php
index 4c46b72..4e161f9 100644
--- a/src/Httpserver.php
+++ b/src/Httpserver.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
@@ -17,18 +18,19 @@ namespace Domframework;
 class Httpserver
 {
     private $tcpserver;
-    private $listeners = array();
+    private $listeners = [];
     private $runningUser;
     private $runningGroup;
     private $logger;
     private $maxConnection = 500;
     private $timeout = 30;
 
-    /** Add a new listener. Must all be set before entering in loop
-      * @param string $ip The Listening IP Address
-      * @param integer $port the Listening port
-      * @param callable $callable The method called when a new request enter
-      */
+    /**
+     * Add a new listener. Must all be set before entering in loop
+     * @param string $ip The Listening IP Address
+     * @param integer $port the Listening port
+     * @param callable $callable The method called when a new request enter
+     */
     public function addListener($ip, $port, $callable)
     {
         $ipaddresses = new Ipaddresses();
diff --git a/src/Imap.php b/src/Imap.php
index 0272d48..da3ef0e 100644
--- a/src/Imap.php
+++ b/src/Imap.php
@@ -1,41 +1,53 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** IMAP connection abstraction
-    In the IMAP terminology, "mailbox" is a folder in the mailbox of the user */
+/**
+ * IMAP connection abstraction
+ * In the IMAP terminology, "mailbox" is a folder in the mailbox of the user
+ */
 class Imap
 {
-    /** The mailbox string */
+    /**
+     * The mailbox string
+     */
     private $mailbox = null;
-    /** The current folder in UTF-8 */
+    /**
+     * The current folder in UTF-8
+     */
     private $curDir = "INBOX";
-    /** The auto expunge feature, after deleting/moving an email */
+    /**
+     * The auto expunge feature, after deleting/moving an email
+     */
     public $autoexpunge = true;
 
-    /** Limit to one instance of the connection to the same database */
+    /**
+     * Limit to one instance of the connection to the same database
+     */
     // Based on an idea of http://tonylandis.com/php/php5-pdo-singleton-class/
-    private static $instance = array();
+    private static $instance = [];
 
-    /** The constructor
-      * The IMAP standard port is 143, but SSL tunnelled is 993
-      * @param string|null $imapserver The IMAP server to connect. Localhost is
-      * used if not defined
-      * @param integer|null $imapport The IMAP port to connect. 143 is used if not
-      * defined
-      * @param string|null $username The username to connect
-      * @param string|null $password The password to connect
-      * @param boolean|null $imapssl Use the SSL connection layer. Not used by
-      * default
-      * @param boolean|null $imapcertvalidate Check the certificates if using the
-      * SSL connection. True by default
-      */
+    /**
+     * The constructor
+     * The IMAP standard port is 143, but SSL tunnelled is 993
+     * @param string|null $imapserver The IMAP server to connect. Localhost is
+     * used if not defined
+     * @param integer|null $imapport The IMAP port to connect. 143 is used if not
+     * defined
+     * @param string|null $username The username to connect
+     * @param string|null $password The password to connect
+     * @param boolean|null $imapssl Use the SSL connection layer. Not used by
+     * default
+     * @param boolean|null $imapcertvalidate Check the certificates if using the
+     * SSL connection. True by default
+     */
     public function __construct(
         $imapserver = "localhost",
         $imapport = 143,
@@ -54,20 +66,21 @@ class Imap
         );
     }
 
-    /** The connect can be used when extends the imap class. The constructor can
-      * be override by the child class.
-      * The IMAP standard port is 143, but SSL tunnelled is 993
-      * @param string|null $imapserver The IMAP server to connect. Localhost is
-      * used if not defined
-      * @param integer|null $imapport The IMAP port to connect. 143 is used if not
-      * defined
-      * @param string|null $username The username to connect
-      * @param string|null $password The password to connect
-      * @param boolean|null $imapssl Use the SSL connection layer. Not used by
-      * default
-      * @param boolean|null $imapcertvalidate Check the certificates if using the
-      * SSL connection. True by default
-      */
+    /**
+     * The connect can be used when extends the imap class. The constructor can
+     * be override by the child class.
+     * The IMAP standard port is 143, but SSL tunnelled is 993
+     * @param string|null $imapserver The IMAP server to connect. Localhost is
+     * used if not defined
+     * @param integer|null $imapport The IMAP port to connect. 143 is used if not
+     * defined
+     * @param string|null $username The username to connect
+     * @param string|null $password The password to connect
+     * @param boolean|null $imapssl Use the SSL connection layer. Not used by
+     * default
+     * @param boolean|null $imapcertvalidate Check the certificates if using the
+     * SSL connection. True by default
+     */
     public function connect(
         $imapserver = "localhost",
         $imapport = 143,
@@ -122,10 +135,11 @@ class Imap
     ///////////////////
     ///   FOLDERS   ///
     ///////////////////
-    /** Return an array of the existing folders. The sub-folders are with slash
-      * separator
-      * The names of folders are converted in UTF-8
-      */
+    /**
+     * Return an array of the existing folders. The sub-folders are with slash
+     * separator
+     * The names of folders are converted in UTF-8
+     */
     public function foldersList()
     {
         if ($this->mailbox === null) {
@@ -136,9 +150,10 @@ class Imap
         return $list;
     }
 
-    /** Return an array with folder name in key and attributes in value. The
-      * attributes allow to see if there is new mails in folders
-      */
+    /**
+     * Return an array with folder name in key and attributes in value. The
+     * attributes allow to see if there is new mails in folders
+     */
     public function foldersListWithAttr()
     {
         if ($this->mailbox === null) {
@@ -149,7 +164,7 @@ class Imap
             $this->mailbox,
             "*"
         );
-        $res = array();
+        $res = [];
         foreach ($list as $val) {
             $dir = substr($val->name, strlen($this->mailbox));
             $dir = mb_convert_encoding($dir, "UTF8", "UTF7-IMAP");
@@ -161,16 +176,17 @@ class Imap
         return ($res);
     }
 
-    /** Change to provided folder
-      * The folder name must be in UTF-8. The folder must be absolute
-      * @param string $folder Change to the provided folder
-      */
+    /**
+     * Change to provided folder
+     * The folder name must be in UTF-8. The folder must be absolute
+     * @param string $folder Change to the provided folder
+     */
     public function changeFolder($folder)
     {
         if ($this->mailbox === null) {
             throw new \Exception("IMAP server not connected", 500);
         }
-        if (! in_array($folder, $this->foldersList())) {
+        if (! in_array($folder, $this->foldersList(), true)) {
             throw new \Exception("Folder not found", 404);
         }
         $folderUTF7 = mb_convert_encoding($folder, "UTF7-IMAP", "UTF-8");
@@ -186,8 +202,9 @@ class Imap
         return $rc;
     }
 
-    /** Return the current folder in UTF-8
-      */
+    /**
+     * Return the current folder in UTF-8
+     */
     public function getFolder()
     {
         if ($this->mailbox === null) {
@@ -196,15 +213,16 @@ class Imap
         return $this->curDir;
     }
 
-    /** Create a new folder, provided in UTF-8. The folder must be absolute
-      * @param string $folder Create the provided folder
-      */
+    /**
+     * Create a new folder, provided in UTF-8. The folder must be absolute
+     * @param string $folder Create the provided folder
+     */
     public function createFolder($folder)
     {
         if ($this->mailbox === null) {
             throw new \Exception("IMAP server not connected", 500);
         }
-        if (in_array($folder, $this->foldersList())) {
+        if (in_array($folder, $this->foldersList(), true)) {
             throw new \Exception("Folder already exists", 406);
         }
         $folderUTF7 = mb_convert_encoding($folder, "UTF7-IMAP", "UTF-8");
@@ -214,15 +232,16 @@ class Imap
         );
     }
 
-    /** Delete an existing folder provided in UTF-8. The folder must be absolute
-      * @param string $folder The folder to delete
-      */
+    /**
+     * Delete an existing folder provided in UTF-8. The folder must be absolute
+     * @param string $folder The folder to delete
+     */
     public function deleteFolder($folder)
     {
         if ($this->mailbox === null) {
             throw new \Exception("IMAP server not connected", 500);
         }
-        if (! in_array($folder, $this->foldersList())) {
+        if (! in_array($folder, $this->foldersList(), true)) {
             throw new \Exception("Folder not found", 404);
         }
         $folderUTF7 = mb_convert_encoding($folder, "UTF7-IMAP", "UTF-8");
@@ -232,9 +251,10 @@ class Imap
         );
     }
 
-    /** Return the list of the folders substcribed by the user. The folders are
-      * in UTF-8
-      */
+    /**
+     * Return the list of the folders substcribed by the user. The folders are
+     * in UTF-8
+     */
     public function getSubscribe()
     {
         if ($this->mailbox === null) {
@@ -245,7 +265,7 @@ class Imap
             $this->mailbox,
             "*"
         );
-        $res = array();
+        $res = [];
         foreach ($subs as $sub) {
             $res [] = str_replace(
                 $sub->delimiter,
@@ -260,10 +280,11 @@ class Imap
         return $res;
     }
 
-    /** Add a subscription for a folder. The folder must be in UTF-8
-      * @param string $folder Add the provided folder to the subscription file of
-      * the user
-      */
+    /**
+     * Add a subscription for a folder. The folder must be in UTF-8
+     * @param string $folder Add the provided folder to the subscription file of
+     * the user
+     */
     public function addSubscribe($folder)
     {
         if ($this->mailbox === null) {
@@ -276,10 +297,11 @@ class Imap
         );
     }
 
-    /** Remove a subscription for a folder. The folder must be in UTF-8
-      * @param string $folder Remove the provided folder to the subscription file
-      * of the user
-      */
+    /**
+     * Remove a subscription for a folder. The folder must be in UTF-8
+     * @param string $folder Remove the provided folder to the subscription file
+     * of the user
+     */
     public function delSubscribe($folder)
     {
         if ($this->mailbox === null) {
@@ -292,18 +314,19 @@ class Imap
         );
     }
 
-    /** Return the information concerning a folder. It return an object with the
-      * following properties :
-      *   Date     date of last change (current datetime)
-      *   Driver   driver
-      *   Mailbox  name of the mailbox
-      *   Nmsgs    number of messages
-      *   Recent   number of recent messages
-      *   Unread   number of unread messages
-      *   Deleted  number of deleted messages
-      *   Size     mailbox size
-      * @param string $folder The folder to get the informations
-      */
+    /**
+     * Return the information concerning a folder. It return an object with the
+     * following properties :
+     *   Date     date of last change (current datetime)
+     *   Driver   driver
+     *   Mailbox  name of the mailbox
+     *   Nmsgs    number of messages
+     *   Recent   number of recent messages
+     *   Unread   number of unread messages
+     *   Deleted  number of deleted messages
+     *   Size     mailbox size
+     * @param string $folder The folder to get the informations
+     */
     public function getFolderInfo($folder)
     {
         if ($this->mailbox === null) {
@@ -322,19 +345,20 @@ class Imap
     //////////////////////
     ///   LIST MAILS   ///
     //////////////////////
-    /** Return an array of mailHeaders order by $field and by order ASC or DESC
-      * @param array $mailHeaders The headers to sort
-      * @param string $field The field to examine
-      * @param boolean|null $orderAsc The order of sorting. Asc if not defined
-      */
+    /**
+     * Return an array of mailHeaders order by $field and by order ASC or DESC
+     * @param array $mailHeaders The headers to sort
+     * @param string $field The field to examine
+     * @param boolean|null $orderAsc The order of sorting. Asc if not defined
+     */
     public function imapSortMail($mailHeaders, $field, $orderAsc = true)
     {
         if ($this->mailbox === null) {
             throw new \Exception("IMAP server not connected", 500);
         }
         $this->changeFolder($this->curDir);
-        $sortList = array();
-        $sortInc = array();
+        $sortList = [];
+        $sortInc = [];
         foreach ($mailHeaders as $mail) {
             // Permit to have to mails with the same comparator field. Add an
             // increment at the end of field
@@ -350,17 +374,19 @@ class Imap
         return array_values($sortList);
     }
 
-    /** Fetch the headers for all messages in the current folder sorted by date
-      * Return an array of mail object containing information like the subject,
-      * the date, if the message is already read (recent), answered...
-      * (see http://www.php.net/manual/en/function.imap-fetch-overview.php)
-      * If the $from is negative, take the LAST $from mails
-      * If from is zero, it's value is override to 1
-      * For information, takes 0.4s to select 30 mails on 1552
-      * @param integer|null $from The selector of the mails. 1 if not defined
-      * @param integer|null $nbmails The number of mails returned by the method
-      * 30 if not defined
-      **/
+    /**
+     * Fetch the headers for all messages in the current folder sorted by date
+     * Return an array of mail object containing information like the subject,
+     * the date, if the message is already read (recent), answered...
+     * (see http://www.php.net/manual/en/function.imap-fetch-overview.php)
+     * If the $from is negative, take the LAST $from mails
+     * If from is zero, it's value is override to 1
+     * For information, takes 0.4s to select 30 mails on 1552
+     * @param integer|null $from The selector of the mails. 1 if not defined
+     * @param integer|null $nbmails The number of mails returned by the method
+     * 30 if not defined
+     *
+     */
     public function mailsDate($from = 1, $nbmails = 30)
     {
         if ($this->mailbox === null) {
@@ -372,7 +398,7 @@ class Imap
         }
         $MC = imap_check(self::$instance[$this->mailbox]);
         if ($MC->Nmsgs === 0) {
-            return array();
+            return [];
         }
         if ($nbmails > $MC->Nmsgs) {
             $nbmails = $MC->Nmsgs;
@@ -408,7 +434,7 @@ class Imap
                 $to = $MC->Nmsgs;
             }
         }
-        $headers = array();
+        $headers = [];
         // Adding the FT_UID options cost 1.1s
         $result = imap_fetch_overview(
             self::$instance[$this->mailbox],
@@ -420,9 +446,10 @@ class Imap
         return $result;
     }
 
-    /** Return all the mails numbers order by thread in an array.
-      * [] => array ("msgno"=>msgno, "depth"=>depth)
-      */
+    /**
+     * Return all the mails numbers order by thread in an array.
+     * [] => array ("msgno"=>msgno, "depth"=>depth)
+     */
     public function mailsThread()
     {
         if ($this->mailbox === null) {
@@ -432,7 +459,7 @@ class Imap
         $threads = @imap_thread(self::$instance[$this->mailbox]);
         // imap_errors() takes the errors and clear the error stack
         $errors = imap_errors();
-        $thread = array();
+        $thread = [];
         $depth = 0;
         foreach ($threads as $key => $val) {
             $tree = explode('.', $key);
@@ -441,7 +468,7 @@ class Imap
                 if ($val === 0) {
                     continue;
                 }
-                $thread[] = array("msgno" => $val, "depth" => $depth);
+                $thread[] = ["msgno" => $val, "depth" => $depth];
                 $depth++;
             } elseif ($tree[1] == 'branch' && $depth > 0) {
                 $depth--;
@@ -450,8 +477,9 @@ class Imap
         return $thread;
     }
 
-    /** Send back the number of mails in the mailbox
-      */
+    /**
+     * Send back the number of mails in the mailbox
+     */
     public function mailsNumber()
     {
         if ($this->mailbox === null) {
@@ -462,9 +490,10 @@ class Imap
         return $MC->Nmsgs;
     }
 
-    /** Return an array containing the msgno corresponding to the criteria
-      * @param string $criteria The criteria to use for the IMAP search
-      */
+    /**
+     * Return an array containing the msgno corresponding to the criteria
+     * @param string $criteria The criteria to use for the IMAP search
+     */
     public function mailsSearch($criteria)
     {
         if ($this->mailbox === null) {
@@ -474,12 +503,13 @@ class Imap
         return imap_search(self::$instance[$this->mailbox], $criteria);
     }
 
-    /** Move the mail provided in the $folder in UTF-8.
-      * If $msgno is an array, all the mails with the contain msgno are deleted
-      * Expunge automatically the current folder to remove the old emails
-      * @param integer|array $msgno The message number(s) to copy
-      * @param string $folder The destination folder of the move. Must exists
-      */
+    /**
+     * Move the mail provided in the $folder in UTF-8.
+     * If $msgno is an array, all the mails with the contain msgno are deleted
+     * Expunge automatically the current folder to remove the old emails
+     * @param integer|array $msgno The message number(s) to copy
+     * @param string $folder The destination folder of the move. Must exists
+     */
     public function mailMove($msgno, $folder)
     {
         if ($this->mailbox === null) {
@@ -500,11 +530,12 @@ class Imap
         return true;
     }
 
-    /** Copy the mail provided in the $folder in UTF-8.
-      * If $msgno is an array, all the mails with the contain msgno are copied
-      * @param integer|array $msgno The message number(s) to copy
-      * @param string $folder The destination folder of the copy. Must exists
-      */
+    /**
+     * Copy the mail provided in the $folder in UTF-8.
+     * If $msgno is an array, all the mails with the contain msgno are copied
+     * @param integer|array $msgno The message number(s) to copy
+     * @param string $folder The destination folder of the copy. Must exists
+     */
     public function mailCopy($msgno, $folder)
     {
         if ($this->mailbox === null) {
@@ -522,9 +553,10 @@ class Imap
         return true;
     }
 
-    /** Expunge the mailbox. If the autoexpunge is activated, it is normally not
-      * needed
-      */
+    /**
+     * Expunge the mailbox. If the autoexpunge is activated, it is normally not
+     * needed
+     */
     public function expunge()
     {
         if ($this->mailbox === null) {
@@ -537,9 +569,10 @@ class Imap
     /////////////////////////////
     ///   GET/SET/DEL EMAIL   ///
     /////////////////////////////
-    /** Get an existing email in the current folder in raw format
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Get an existing email in the current folder in raw format
+     * @param integer $msgno The message number to examine
+     */
     public function getEmailRaw($msgno)
     {
         if ($this->mailbox === null) {
@@ -558,9 +591,10 @@ class Imap
         return $content;
     }
 
-    /** Get the headers of the email (in raw format)
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Get the headers of the email (in raw format)
+     * @param integer $msgno The message number to examine
+     */
     public function getEmailHeadersRaw($msgno)
     {
         if ($this->mailbox === null) {
@@ -577,9 +611,10 @@ class Imap
         return $content;
     }
 
-    /** Get all the body (and attached files) of an email in raw format
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Get all the body (and attached files) of an email in raw format
+     * @param integer $msgno The message number to examine
+     */
     public function getEmailBodyRaw($msgno)
     {
         if ($this->mailbox === null) {
@@ -596,9 +631,10 @@ class Imap
         return $content;
     }
 
-    /** Return email structure of the body
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Return email structure of the body
+     * @param integer $msgno The message number to examine
+     */
     public function getStructure($msgno)
     {
         if ($this->mailbox === null) {
@@ -615,9 +651,10 @@ class Imap
         return $structure;
     }
 
-    /** Return the structure of the mail body with the associated content
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Return the structure of the mail body with the associated content
+     * @param integer $msgno The message number to examine
+     */
     public function getStructureWithContent($msgno)
     {
         if ($this->mailbox === null) {
@@ -637,7 +674,7 @@ class Imap
             if ($structure->encoding === 4) {
                 $content = quoted_printable_decode($content);
             } elseif ($structure->encoding === 3) {
-                $content = base64_decode($content);
+                $content = base64_decode($content, true);
             }
             foreach ($structure->parameters as $param) {
                 if ($param->attribute === "charset") {
@@ -658,7 +695,7 @@ class Imap
                     if ($struct2->encoding === 4) {
                         $content = quoted_printable_decode($content);
                     } elseif ($struct2->encoding === 3) {
-                        $content = base64_decode($content);
+                        $content = base64_decode($content, true);
                     }
                     foreach ($struct2->parameters as $param) {
                         if ($param->attribute === "charset") {
@@ -710,7 +747,7 @@ class Imap
                 if ($struct1->encoding === 4) {
                     $content = quoted_printable_decode($content);
                 } elseif ($struct1->encoding === 3) {
-                    $content = base64_decode($content);
+                    $content = base64_decode($content, true);
                 }
                 foreach ($struct1->parameters as $param) {
                     if ($param->attribute === "charset") {
@@ -757,13 +794,14 @@ class Imap
         return $structure;
     }
 
-    /** Return the content of a part of the mail body defined in the structure in
-      * an object, with the associated mimetype, the parameters like the charset
-      * if they are defined, the number of lines associated to this part in the
-      * mail and some other info
-      * @param integer $msgno The message number to examine
-      * @param integer $part The message part to get
-      */
+    /**
+     * Return the content of a part of the mail body defined in the structure in
+     * an object, with the associated mimetype, the parameters like the charset
+     * if they are defined, the number of lines associated to this part in the
+     * mail and some other info
+     * @param integer $msgno The message number to examine
+     * @param integer $part The message part to get
+     */
     public function getStructureContent($msgno, $part)
     {
         if ($this->mailbox === null) {
@@ -776,10 +814,11 @@ class Imap
         throw new \Exception("Part not found in the mail", 404);
     }
 
-    /** Return the part identifiers of the structure of the mail body. To be used
-      * in getStructureContent
-      * @param integer $msgno The message number to examine
-      */
+    /**
+     * Return the part identifiers of the structure of the mail body. To be used
+     * in getStructureContent
+     * @param integer $msgno The message number to examine
+     */
     public function getStructureParts($msgno)
     {
         if ($this->mailbox === null) {
@@ -787,17 +826,18 @@ class Imap
         }
         $structure = $this->getStructure($msgno);
         if (! isset($structure->parts)) {
-            return array();
+            return [];
         }
         return array_keys($structure->parts);
     }
 
-    /** Delete all the mailIDs (msgno) provided in an array or a single mail if
-      * $msgno is not an array
-      * DO NOT MOVE THE MAIL IN TRASH, DESTROY THE MAIL REALLY
-      * Expunge the mails at the end of the operation
-      * @param array|integer $msgno The message number(s) to remove
-      */
+    /**
+     * Delete all the mailIDs (msgno) provided in an array or a single mail if
+     * $msgno is not an array
+     * DO NOT MOVE THE MAIL IN TRASH, DESTROY THE MAIL REALLY
+     * Expunge the mails at the end of the operation
+     * @param array|integer $msgno The message number(s) to remove
+     */
     public function mailsDel($msgno)
     {
         if ($this->mailbox === null) {
@@ -818,11 +858,12 @@ class Imap
         return $rc;
     }
 
-    /** Add a new mail in the current folder. The content must be a string
-      * containing all the mail (header and body). If the content is invalid, the
-      * directory listing can provide erroneous data
-      * @param string $content the content of the mail to add
-      */
+    /**
+     * Add a new mail in the current folder. The content must be a string
+     * containing all the mail (header and body). If the content is invalid, the
+     * directory listing can provide erroneous data
+     * @param string $content the content of the mail to add
+     */
     public function mailAdd($content)
     {
         if ($this->mailbox === null) {
@@ -845,8 +886,9 @@ class Imap
     /////////////////
     ///   QUOTA   ///
     /////////////////
-    /** Return the quota used by the user in Mo
-      */
+    /**
+     * Return the quota used by the user in Mo
+     */
     public function getQuota()
     {
         if ($this->mailbox === null) {
@@ -855,7 +897,7 @@ class Imap
         $quota = @imap_get_quotaroot(self::$instance[$this->mailbox], "INBOX");
         imap_errors();
         if (! isset($quota["STORAGE"])) {
-            return array();
+            return [];
         }
 
         return array_map(
@@ -869,17 +911,18 @@ class Imap
     /////////////////
     ///   FLAGS   ///
     /////////////////
-    /** Set the flags of the msgno. If msgno is an array, the flags will be write
-      * on the list of mails. The others flags of the email are not modified.
-      * The flags must be an array containing :
-      * \Seen       Message has been read
-      * \Answered   Message has been answered
-      * \Flagged    Message is "flagged" for urgent/special attention
-      * \Deleted    Message is "deleted" for removal by later EXPUNGE
-      * \Draft      Message has not completed composition (marked as a draft).
-      * @param integer|array $msgno The messages number(s) to add the flags
-      * @param array $flags The flags to add
-      */
+    /**
+     * Set the flags of the msgno. If msgno is an array, the flags will be write
+     * on the list of mails. The others flags of the email are not modified.
+     * The flags must be an array containing :
+     * \Seen       Message has been read
+     * \Answered   Message has been answered
+     * \Flagged    Message is "flagged" for urgent/special attention
+     * \Deleted    Message is "deleted" for removal by later EXPUNGE
+     * \Draft      Message has not completed composition (marked as a draft).
+     * @param integer|array $msgno The messages number(s) to add the flags
+     * @param array $flags The flags to add
+     */
     public function setFlag($msgno, $flags)
     {
         if ($this->mailbox === null) {
@@ -901,18 +944,19 @@ class Imap
         return true;
     }
 
-    /** Unset the flags of the msgno. If msgno is an array, the flags will be
-      * write on the list of mails. The others flags of the email are not
-      * modified.
-      * The flags must be an array containing :
-      * \Seen       Message has been read
-      * \Answered   Message has been answered
-      * \Flagged    Message is "flagged" for urgent/special attention
-      * \Deleted    Message is "deleted" for removal by later EXPUNGE
-      * \Draft      Message has not completed composition (marked as a draft).
-      * @param integer|array $msgno The messages number(s) to remove the flags
-      * @param array $flags The flags to remove
-      */
+    /**
+     * Unset the flags of the msgno. If msgno is an array, the flags will be
+     * write on the list of mails. The others flags of the email are not
+     * modified.
+     * The flags must be an array containing :
+     * \Seen       Message has been read
+     * \Answered   Message has been answered
+     * \Flagged    Message is "flagged" for urgent/special attention
+     * \Deleted    Message is "deleted" for removal by later EXPUNGE
+     * \Draft      Message has not completed composition (marked as a draft).
+     * @param integer|array $msgno The messages number(s) to remove the flags
+     * @param array $flags The flags to remove
+     */
     public function unsetFlag($msgno, $flags)
     {
         if ($this->mailbox === null) {
@@ -934,11 +978,12 @@ class Imap
         return true;
     }
 
-    /** Mark mail(s) as read.
-      * If msgno is an array, a list of mails will be modified.
-      * If msgno is an integer, only one mail will be modified
-      * @param integer|array $msgno The messages number(s) to mark as read
-      */
+    /**
+     * Mark mail(s) as read.
+     * If msgno is an array, a list of mails will be modified.
+     * If msgno is an integer, only one mail will be modified
+     * @param integer|array $msgno The messages number(s) to mark as read
+     */
     public function markMailAsRead($msgno)
     {
         if ($this->mailbox === null) {
@@ -960,11 +1005,12 @@ class Imap
         return true;
     }
 
-    /** Mark mail(s) as unread.
-      * If msgno is an array, a list of mails will be modified.
-      * If msgno is an integer, only one mail will be modified
-      * @param integer|array $msgno The messages number(s) to mark as unread
-      */
+    /**
+     * Mark mail(s) as unread.
+     * If msgno is an array, a list of mails will be modified.
+     * If msgno is an integer, only one mail will be modified
+     * @param integer|array $msgno The messages number(s) to mark as unread
+     */
     public function markMailAsUnread($msgno)
     {
         if ($this->mailbox === null) {
diff --git a/src/Inifile.php b/src/Inifile.php
index 2d7b9d2..f5efdb0 100644
--- a/src/Inifile.php
+++ b/src/Inifile.php
@@ -1,24 +1,28 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage .ini files like in php.ini
-    Support the sections (or not) */
+/**
+ * Manage .ini files like in php.ini
+ * Support the sections (or not)
+ */
 class Inifile
 {
-    /** Return an array with the .ini file content
-      * If the sections are true, the sections are analyzed too
-      * This function is the same as parse_ini_file PHP internal
-      * @param string $file The ini file to read
-      * @param boolean|null $sections Manage the sections if true. False by
-      * default
-      */
+    /**
+     * Return an array with the .ini file content
+     * If the sections are true, the sections are analyzed too
+     * This function is the same as parse_ini_file PHP internal
+     * @param string $file The ini file to read
+     * @param boolean|null $sections Manage the sections if true. False by
+     * default
+     */
     public function getFile($file, $sections = false)
     {
         if (! file_exists($file)) {
@@ -36,13 +40,14 @@ class Inifile
         return $this->getString(file_get_contents($file, $sections));
     }
 
-    /** Return an array with the .ini string content
-      * If the sections are true, the sections are analyzed too
-      * This function is the same as parse_ini_string PHP internal
-      * @param string $string The ini string to read
-      * @param boolean|null $sections Manage the sections if true. False by
-      * default
-      */
+    /**
+     * Return an array with the .ini string content
+     * If the sections are true, the sections are analyzed too
+     * This function is the same as parse_ini_string PHP internal
+     * @param string $string The ini string to read
+     * @param boolean|null $sections Manage the sections if true. False by
+     * default
+     */
     public function getString($string, $sections = false)
     {
         $res = parse_ini_string($string, $sections);
@@ -74,12 +79,13 @@ class Inifile
         return $res;
     }
 
-    /** Return a string containing a .ini content from the provided array.
-      * If the sections are true, define the first child of the array as sections
-      * @param array $array The array read from a .ini file
-      * @param boolean|null $sections Manage the sections if true. False by
-      * default
-      */
+    /**
+     * Return a string containing a .ini content from the provided array.
+     * If the sections are true, define the first child of the array as sections
+     * @param array $array The array read from a .ini file
+     * @param boolean|null $sections Manage the sections if true. False by
+     * default
+     */
     public function setString($array, $sections = false)
     {
         if (! is_array($array)) {
@@ -160,14 +166,15 @@ class Inifile
         return $content;
     }
 
-    /** Save a file containing a .ini content from the provided array.
-      * Don't create the directory if it doesn't exists
-      * If the sections are true, define the first child of the array as sections
-      * @param string $file The .ini file to store
-      * @param array $array The array to store in file
-      * @param boolean|null $sections Manage the sections if true. False by
-      * default
-      */
+    /**
+     * Save a file containing a .ini content from the provided array.
+     * Don't create the directory if it doesn't exists
+     * If the sections are true, define the first child of the array as sections
+     * @param string $file The .ini file to store
+     * @param array $array The array to store in file
+     * @param boolean|null $sections Manage the sections if true. False by
+     * default
+     */
     public function setFile($file, $array, $sections = false)
     {
         $dir = basename($file);
diff --git a/src/Ipaddresses.php b/src/Ipaddresses.php
index a940866..572a06d 100644
--- a/src/Ipaddresses.php
+++ b/src/Ipaddresses.php
@@ -1,19 +1,23 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the IP addresses conversions */
+/**
+ * Manage the IP addresses conversions
+ */
 class Ipaddresses
 {
-    /** Return true if the provided IP address is valid (IPv4 or IPv6)
-      * @param string $ip The IP Address to validate
-      */
+    /**
+     * Return true if the provided IP address is valid (IPv4 or IPv6)
+     * @param string $ip The IP Address to validate
+     */
     public function validIPAddress($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -30,9 +34,10 @@ class Ipaddresses
         return $rc;
     }
 
-    /** Return true if the provided IP address is valid and is IPv4
-      * @param string $ip The IP Address to validate
-      */
+    /**
+     * Return true if the provided IP address is valid and is IPv4
+     * @param string $ip The IP Address to validate
+     */
     public function validIPv4Address($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -48,9 +53,10 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided IP address is valid and is IPv6
-      * @param string $ip The IP Address to validate
-      */
+    /**
+     * Return true if the provided IP address is valid and is IPv6
+     * @param string $ip The IP Address to validate
+     */
     public function validIPv6Address($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -66,10 +72,11 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided IP address is valid (IPv4 or IPv6) and the
-      * provided CIDR is valid too
-      * @param string $ip The IP Address to validate with a CIDR
-      */
+    /**
+     * Return true if the provided IP address is valid (IPv4 or IPv6) and the
+     * provided CIDR is valid too
+     * @param string $ip The IP Address to validate with a CIDR
+     */
     public function validIPAddressWithCIDR($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -86,10 +93,11 @@ class Ipaddresses
         return $rc;
     }
 
-    /** Return true if the provided IP address is valid and is IPv4 and the
-      * provided CIDR is valid too
-      * @param string $ip The IP Address to validate with a CIDR
-      */
+    /**
+     * Return true if the provided IP address is valid and is IPv4 and the
+     * provided CIDR is valid too
+     * @param string $ip The IP Address to validate with a CIDR
+     */
     public function validIPv4AddressWithCIDR($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -114,10 +122,11 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided IP address is valid and is IPv6 and the
-      * provided CIDR is valid too
-      * @param string $ip The IP Address to validate with a CIDR
-      */
+    /**
+     * Return true if the provided IP address is valid and is IPv6 and the
+     * provided CIDR is valid too
+     * @param string $ip The IP Address to validate with a CIDR
+     */
     public function validIPv6AddressWithCIDR($ip)
     {
         if (!is_string($ip) || $ip === "") {
@@ -142,11 +151,12 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided CIDR is valid. The CIDR can be valid in IPv4
-      * or IPv6
-      * @param integer $cidr The CIDR to test
-      * @return boolean The CIDR is valid
-      */
+    /**
+     * Return true if the provided CIDR is valid. The CIDR can be valid in IPv4
+     * or IPv6
+     * @param integer $cidr The CIDR to test
+     * @return boolean The CIDR is valid
+     */
     public function validCIDR($cidr)
     {
         if (! is_integer($cidr) && ! is_integer($cidr)) {
@@ -164,10 +174,11 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided CIDR is valid. The CIDR can be valid in IPv4.
-      * @param integer $cidr The CIDR to test
-      * @return boolean The CIDR is valid
-      */
+    /**
+     * Return true if the provided CIDR is valid. The CIDR can be valid in IPv4.
+     * @param integer $cidr The CIDR to test
+     * @return boolean The CIDR is valid
+     */
     public function validIPv4CIDR($cidr)
     {
         if (! is_integer($cidr) && ! is_string($cidr)) {
@@ -185,10 +196,11 @@ class Ipaddresses
         return true;
     }
 
-    /** Return true if the provided CIDR is valid. The CIDR can be valid in IPv6.
-      * @param integer $cidr The CIDR to test
-      * @return boolean The CIDR is valid
-      */
+    /**
+     * Return true if the provided CIDR is valid. The CIDR can be valid in IPv6.
+     * @param integer $cidr The CIDR to test
+     * @return boolean The CIDR is valid
+     */
     public function validIPv6CIDR($cidr)
     {
         if (! is_integer($cidr) && ! is_string($cidr)) {
@@ -206,13 +218,14 @@ class Ipaddresses
         return true;
     }
 
-    /** Return the IPv6 to compressed (or compact) form.
-      * Remove the 0 when they are placed on the begin of the nibble.
-      * Remove all the blocks only zero to convert them to :: (but only one time)
-      * Example: 2001:0660:530d:0201:0000:0000:0000:0124 => 2001:660:530d:201::124
-      * If an IPv4 is provided, return it without modification
-      * @param string $ip The IP to compress
-      */
+    /**
+     * Return the IPv6 to compressed (or compact) form.
+     * Remove the 0 when they are placed on the begin of the nibble.
+     * Remove all the blocks only zero to convert them to :: (but only one time)
+     * Example: 2001:0660:530d:0201:0000:0000:0000:0124 => 2001:660:530d:201::124
+     * If an IPv4 is provided, return it without modification
+     * @param string $ip The IP to compress
+     */
     public function compressIP($ip)
     {
         if (strpos($ip, ":") === false) {
@@ -229,7 +242,7 @@ class Ipaddresses
         }
         // Remove the 0 nibble if there is an other 0 nibble after
         $cleanLoop = false;
-        $ipCompArr = array();
+        $ipCompArr = [];
         foreach ($ipArr as $key => $val) {
             // echo "VAL=".var_export ($val, true).
             // ", cleanLoop=".var_export ($cleanLoop, true);
@@ -265,16 +278,17 @@ class Ipaddresses
         return $ipHex;
     }
 
-    /** Return the IPv6 uncompressed (all the fields exists). They are not filled
-      * by zeros
-      * If the provided IP is IPv4, there is no change applied
-      * Return False if the parameter is invalid
-      * Based on http://www.weberdev.com/get_example.php3?ExampleID=3921
-      * @param string $ip The IP address to uncompress
-      * Example : $ip="::" => return "0:0:0:0:0:0:0:0"
-      * Example : $ip = "::ffff:127.0.0.1",
-      *           return "0:0:0:0:0:0:ffff:7f00:1"
-      */
+    /**
+     * Return the IPv6 uncompressed (all the fields exists). They are not filled
+     * by zeros
+     * If the provided IP is IPv4, there is no change applied
+     * Return False if the parameter is invalid
+     * Based on http://www.weberdev.com/get_example.php3?ExampleID=3921
+     * @param string $ip The IP address to uncompress
+     * Example : $ip="::" => return "0:0:0:0:0:0:0:0"
+     * Example : $ip = "::ffff:127.0.0.1",
+     *           return "0:0:0:0:0:0:ffff:7f00:1"
+     */
     public function uncompressIPv6($ip)
     {
         if (
@@ -325,13 +339,14 @@ class Ipaddresses
         return $ip;
     }
 
-    /** Get an IPv6 address with the format
-      * x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x
-      * and return it with format
-      * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx
-      * Return false if the IP provided is not complete
-      * @param string $ipv6 The IPv6 to group
-      */
+    /**
+     * Get an IPv6 address with the format
+     * x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x
+     * and return it with format
+     * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx
+     * Return false if the IP provided is not complete
+     * @param string $ipv6 The IPv6 to group
+     */
     public function groupIPv6($ipv6)
     {
         if (! is_string($ipv6) || $ipv6 === "") {
@@ -357,15 +372,16 @@ class Ipaddresses
         return $new;
     }
 
-    /** Return the IP adddress with filling the fields with the missing zeros.
-      * Valid only on IPv6 (but don't change anything if the provided address is
-      * IPv4)
-      * @param string $ip The IP to complete
-      * @return string The address in nibbles
-      * Example : $ip = "::", return "0000:0000:0000:0000:0000:0000:0000:0000"
-      * Example : $ip = "::ffff:127.0.0.1",
-      *           return "0000:0000:0000:0000:0000:0000:ffff:7f00:0001"
-      */
+    /**
+     * Return the IP adddress with filling the fields with the missing zeros.
+     * Valid only on IPv6 (but don't change anything if the provided address is
+     * IPv4)
+     * @param string $ip The IP to complete
+     * @return string The address in nibbles
+     * Example : $ip = "::", return "0000:0000:0000:0000:0000:0000:0000:0000"
+     * Example : $ip = "::ffff:127.0.0.1",
+     *           return "0000:0000:0000:0000:0000:0000:ffff:7f00:0001"
+     */
     public function completeAddressWithZero($ip)
     {
         if (! is_string($ip) || $ip === "") {
@@ -378,7 +394,7 @@ class Ipaddresses
         if (substr_count($ip, ":") === 7) {
             // IPv6
             $ips = explode(":", $ip);
-            $ipnew = array();
+            $ipnew = [];
             foreach ($ips as $iptmp) {
                 $ipnew[] = sprintf("%04x", hexdec($iptmp));
             }
@@ -393,11 +409,12 @@ class Ipaddresses
         throw new \Exception(dgettext("domframework", "Invalid IP address"), 500);
     }
 
-    /** Return the provided CIDR in binary. Length must be in bytes.
-      * Return FALSE if the parameters are invalid
-      * @param integer $cidr The CIDR to convert
-      * @param integer $length The length to use
-      */
+    /**
+     * Return the provided CIDR in binary. Length must be in bytes.
+     * Return FALSE if the parameters are invalid
+     * @param integer $cidr The CIDR to convert
+     * @param integer $length The length to use
+     */
     public function cidrToBin($cidr, $length)
     {
         if (! is_numeric($cidr) || $cidr < 0 || $cidr > 128) {
@@ -417,14 +434,15 @@ class Ipaddresses
         return pack('H*', $this->str_base_convert($val, 2, 16));
     }
 
-    /** Base conversion with 128 bits support for IPv6
-      * Based on http://fr2.php.net/manual/en/function.base-convert.php#109660
-      * @param string $str The string to convert
-      * @param integer|null $frombase The base of the provided string (10 by
-      * default)
-      * @param integer|null $tobase The base of the returned string (36 by
-      * default)
-      */
+    /**
+     * Base conversion with 128 bits support for IPv6
+     * Based on http://fr2.php.net/manual/en/function.base-convert.php#109660
+     * @param string $str The string to convert
+     * @param integer|null $frombase The base of the provided string (10 by
+     * default)
+     * @param integer|null $tobase The base of the returned string (36 by
+     * default)
+     */
     public function str_base_convert($str, $frombase = 10, $tobase = 36)
     {
         $str = trim($str);
@@ -453,11 +471,12 @@ class Ipaddresses
         return $s;
     }
 
-    /** Reverse the provided IP address
-      * The IPv6 are returned in format :
-      * x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x
-      * @param string $ipReverse The IPv6 to reverse
-      */
+    /**
+     * Reverse the provided IP address
+     * The IPv6 are returned in format :
+     * x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x
+     * @param string $ipReverse The IPv6 to reverse
+     */
     public function reverseIPAddress($ipReverse)
     {
         if (!is_string($ipReverse) || $ipReverse === "") {
@@ -488,16 +507,17 @@ class Ipaddresses
         throw new \Exception(dgettext("domframework", "Invalid IP address"), 500);
     }
 
-    /** This function return the CIDR associated to the provided netmask
-      * Ex. Return 24 for a mask 255.255.255.0 in direct
-      * Ex. Return 24 for a mask 0.0.0.255 in wildcard
-      * Work only in IPv4
-      * Return FALSE if the provided mask is invalid (155.0.0.0 by example)
-      * Throw an exception if the provided IP is invalid
-      * @param string $netmask The mask to convert in CIDR
-      * @param boolean|null $maskdirect If true check a direct mask, if false
-      * check a wildcard mask
-      */
+    /**
+     * This function return the CIDR associated to the provided netmask
+     * Ex. Return 24 for a mask 255.255.255.0 in direct
+     * Ex. Return 24 for a mask 0.0.0.255 in wildcard
+     * Work only in IPv4
+     * Return FALSE if the provided mask is invalid (155.0.0.0 by example)
+     * Throw an exception if the provided IP is invalid
+     * @param string $netmask The mask to convert in CIDR
+     * @param boolean|null $maskdirect If true check a direct mask, if false
+     * check a wildcard mask
+     */
     public function netmask2cidr($netmask, $maskdirect = true)
     {
         $maskdirect = "" . ($maskdirect + 0);
@@ -527,14 +547,15 @@ class Ipaddresses
         return $res;
     }
 
-    /** This function return the netmask associated to a CIDR.
-      * Work only on IPv4 addresses (CIDR between 0 and 32)
-      * @param string $cidr The CIDR to convert in netmask
-      * @param boolean|null $maskdirect If true return a direct mask, if false
-      * return a wildcard mask
-      * @return the mask
-      * @return false if the CIDR is not between 0 and 32
-      */
+    /**
+     * This function return the netmask associated to a CIDR.
+     * Work only on IPv4 addresses (CIDR between 0 and 32)
+     * @param string $cidr The CIDR to convert in netmask
+     * @param boolean|null $maskdirect If true return a direct mask, if false
+     * return a wildcard mask
+     * @return the mask
+     * @return false if the CIDR is not between 0 and 32
+     */
     public function cidr2netmask($cidr, $maskdirect = true)
     {
         if ($cidr < 0 || $cidr > 32) {
@@ -561,13 +582,14 @@ class Ipaddresses
         return $res;
     }
 
-    /** This function return true if the provided address is in the provided
-      * network with the associated cidr
-      * @param string $ip The IPv4 or IPv6 to test
-      * @param string $network The IPv4 or IPv6 network base
-      * @param string $cidr The CIDR to apply
-      * @return boolean True if $ip is in $network/$cidr
-      */
+    /**
+     * This function return true if the provided address is in the provided
+     * network with the associated cidr
+     * @param string $ip The IPv4 or IPv6 to test
+     * @param string $network The IPv4 or IPv6 network base
+     * @param string $cidr The CIDR to apply
+     * @return boolean True if $ip is in $network/$cidr
+     */
     public function ipInNetwork($ip, $network, $cidr)
     {
         if ($this->validIPAddress($ip) === false) {
@@ -609,39 +631,42 @@ class Ipaddresses
             $this->networkFirstIP($network, $cidr));
     }
 
-    /** Get the first IP of a network.
-      * IPv4 and IPv6 compatible
-      * @param string $ip The IPv4 or IPv6 in the network
-      * @param string $cidr The CIDR to apply
-      * @return string the network base
-      * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.0"
-      */
+    /**
+     * Get the first IP of a network.
+     * IPv4 and IPv6 compatible
+     * @param string $ip The IPv4 or IPv6 in the network
+     * @param string $cidr The CIDR to apply
+     * @return string the network base
+     * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.0"
+     */
     public function networkFirstIP($ip, $cidr)
     {
         return $this->networkFirstLastIP($ip, $cidr, "0");
     }
 
-    /** Get the last IP of a network.
-      * IPv4 and IPv6 compatible
-      * @param string $ip The IPv4 or IPv6 in the network
-      * @param string $cidr The CIDR to apply
-      * @return string the network base
-      * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.255"
-      */
+    /**
+     * Get the last IP of a network.
+     * IPv4 and IPv6 compatible
+     * @param string $ip The IPv4 or IPv6 in the network
+     * @param string $cidr The CIDR to apply
+     * @return string the network base
+     * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.255"
+     */
     public function networkLastIP($ip, $cidr)
     {
         return $this->networkFirstLastIP($ip, $cidr, "1");
     }
 
-    /** Get the network first IP.
-      * IPv4 and IPv6 compatible
-      * @param string $ip The IPv4 or IPv6 in the network
-      * @param string $cidr The CIDR to apply
-      * @param string $map if "0", get the first address of the network,
-      * if "1" get the last address of the network
-      * @return string the network base
-      * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.0"
-      */
+    /**
+     * Get the network first IP.
+     * IPv4 and IPv6 compatible
+     * @param string $ip The IPv4 or IPv6 in the network
+     * @param string $cidr The CIDR to apply
+     * @param string $map if "0", get the first address of the network,
+     * if "1" get the last address of the network
+     * @return string the network base
+     * Example : $ip="192.168.1.2", $cidr=24 => return "192.168.1.0"
+     */
     private function networkFirstLastIP($ip, $cidr, $map)
     {
         if ($this->validIPAddress($ip) === false) {
diff --git a/src/Jwt.php b/src/Jwt.php
index 3ae1a19..9416224 100644
--- a/src/Jwt.php
+++ b/src/Jwt.php
@@ -1,44 +1,48 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to manage the JSON Web Tokens
-  * Based on https://tools.ietf.org/html/rfc7519
-  *
-  * Do not put confidential data in payload without encrypt it, as the result
-  * is only a Base64 format of JSON...
-  */
+/**
+ * Allow to manage the JSON Web Tokens
+ * Based on https://tools.ietf.org/html/rfc7519
+ *
+ * Do not put confidential data in payload without encrypt it, as the result
+ * is only a Base64 format of JSON...
+ */
 class Jwt
 {
     // PROPERTIES
-    /** List the allowed algorithms to sign the token
-      */
-    private $supportedAlgs = array(
-    'HS256' => array('hash_hmac', 'SHA256'),
-    'HS512' => array('hash_hmac', 'SHA512'),
-    'HS384' => array('hash_hmac', 'SHA384'),
-    );
+    /**
+     * List the allowed algorithms to sign the token
+     */
+    private $supportedAlgs = [
+    'HS256' => ['hash_hmac', 'SHA256'],
+    'HS512' => ['hash_hmac', 'SHA512'],
+    'HS384' => ['hash_hmac', 'SHA384'],
+    ];
 
-    /** Create the token based on payload, sign it with key, and optionally
-      * encrypt it with ckey
-      * Do not put confidential data in payload without encrypt it, as the result
-      * is only a Base64 format of JSON...
-      * @param array $payload The payload to store
-      * @param string $key The key to be used to sign the token
-      * @param string|null $alg The algorithm to use to sign the token (default
-      *   is HS256)
-      * Allowed algorithms : HS256, HS512, HS384
-      * @param string|null $ckey The cipher key to encrypt the payload
-      * @param string|null $cipherMethod The method to cipher the payload
-      * des-ede3-cbc by default
-      * @return string The Token
-      */
+    /**
+     * Create the token based on payload, sign it with key, and optionally
+     * encrypt it with ckey
+     * Do not put confidential data in payload without encrypt it, as the result
+     * is only a Base64 format of JSON...
+     * @param array $payload The payload to store
+     * @param string $key The key to be used to sign the token
+     * @param string|null $alg The algorithm to use to sign the token (default
+     *   is HS256)
+     * Allowed algorithms : HS256, HS512, HS384
+     * @param string|null $ckey The cipher key to encrypt the payload
+     * @param string|null $cipherMethod The method to cipher the payload
+     * des-ede3-cbc by default
+     * @return string The Token
+     */
     public function encode(
         $payload,
         $key,
@@ -52,8 +56,8 @@ class Jwt
                 "Invalid encode algorithm requested : not allowed"
             ), 500);
         }
-        $header = array("typ" => "JWT", "alg" => $alg);
-        $segments = array();
+        $header = ["typ" => "JWT", "alg" => $alg];
+        $segments = [];
         $segments[] = $this->urlsafeB64Encode($this->jsonEncode($header));
         $payload = $this->jsonEncode($payload);
         if ($ckey) {
@@ -67,18 +71,19 @@ class Jwt
         return implode('.', $segments);
     }
 
-    /** Decode the provide JWT and return an array of the payload
-      * @param string $jwt The token to examine
-      * @param string $key The key used to sign the message
-      * @param array|null $allowedAlg List of allowed algorithms. If null, all the
-      * algorithms defined in $this->supportedAlgs are allowed
-      * @param string|null $ckey The cipher key to decrypt the payload
-      * @param string|null $cipherMethod The method to cipher the payload
-      * des-ede3-cbc by default
-      * @return array the decoded payload
-      * @throw Exception if the key is not able to verify the token with the
-      * provided password
-      */
+    /**
+     * Decode the provide JWT and return an array of the payload
+     * @param string $jwt The token to examine
+     * @param string $key The key used to sign the message
+     * @param array|null $allowedAlg List of allowed algorithms. If null, all the
+     * algorithms defined in $this->supportedAlgs are allowed
+     * @param string|null $ckey The cipher key to decrypt the payload
+     * @param string|null $cipherMethod The method to cipher the payload
+     * des-ede3-cbc by default
+     * @return array the decoded payload
+     * @throw Exception if the key is not able to verify the token with the
+     * provided password
+     */
     public function decode(
         $jwt,
         $key,
@@ -135,7 +140,7 @@ class Jwt
                 "JWT with Empty algorithm"
             ), 403);
         }
-        if (! in_array($header->alg, $allowedAlg)) {
+        if (! in_array($header->alg, $allowedAlg, true)) {
             throw new \Exception(dgettext(
                 "domframework",
                 "JWT with Invalid algorithm"
@@ -169,14 +174,15 @@ class Jwt
         return $payload;
     }
 
-    /** Verify the provided token with the key and generate an return true if it
-      * can be verify
-      * @param string $input The text in Base64 to check
-      * @param string $sign The user provided signature in binary
-      * @param string $key The key to use to sign the input
-      * @param string $alg The algorithm to use to sign the input
-      * @return boolean Return true if the input signed is valid
-      */
+    /**
+     * Verify the provided token with the key and generate an return true if it
+     * can be verify
+     * @param string $input The text in Base64 to check
+     * @param string $sign The user provided signature in binary
+     * @param string $key The key to use to sign the input
+     * @param string $alg The algorithm to use to sign the input
+     * @return boolean Return true if the input signed is valid
+     */
     private function verify($input, $sign, $key, $alg)
     {
         $signature = $this->sign($input, $key, $alg);
@@ -197,20 +203,22 @@ class Jwt
         return $status === 0;
     }
 
-    /** Create a signing key
-      * @return string the signing key proposed
-      */
+    /**
+     * Create a signing key
+     * @return string the signing key proposed
+     */
     public function createKey()
     {
         return sha1(microtime(true));
     }
 
-    /** Sign the requested string with the provided key and based on the algorithm
-      * @param string $input The string to sign
-      * @param string $key The key to use
-      * @param string $alg The algorithm to use to sign
-      * @return string The signed string in binary
-      */
+    /**
+     * Sign the requested string with the provided key and based on the algorithm
+     * @param string $input The string to sign
+     * @param string $key The key to use
+     * @param string $alg The algorithm to use to sign
+     * @return string The signed string in binary
+     */
     private function sign($input, $key, $alg)
     {
         if (! key_exists($alg, $this->supportedAlgs)) {
@@ -231,21 +239,23 @@ class Jwt
         }
     }
 
-    /** Return the provided string in base64 without equal at the end
-      * To be URL compliant, the slash and plus are converted to underscore and
-      * dash
-      * @param string $str The string the convert in base64
-      * @return string The string converted in base64
-      */
+    /**
+     * Return the provided string in base64 without equal at the end
+     * To be URL compliant, the slash and plus are converted to underscore and
+     * dash
+     * @param string $str The string the convert in base64
+     * @return string The string converted in base64
+     */
     private function urlsafeB64Encode($str)
     {
         return rtrim(strtr(base64_encode($str), '+/', '-_'), "=");
     }
 
-    /** Return the provided base64 to string
-      * @param string $str The string the convert from base64
-      * @return string The string converted from base64
-      */
+    /**
+     * Return the provided base64 to string
+     * @param string $str The string the convert from base64
+     * @return string The string converted from base64
+     */
     private function urlsafeB64Decode($str)
     {
         $str = strtr($str, '-_', '+/');
@@ -262,13 +272,14 @@ class Jwt
             default:
                 return false;
         }
-        return base64_decode($str);
+        return base64_decode($str, true);
     }
 
-    /** Return the provided array to JSON string
-      * @param object $input The object to convert in JSON
-      * @return string The JSON string
-      */
+    /**
+     * Return the provided array to JSON string
+     * @param object $input The object to convert in JSON
+     * @return string The JSON string
+     */
     private function jsonEncode($input)
     {
         $json = json_encode($input);
@@ -281,11 +292,12 @@ class Jwt
         return $json;
     }
 
-    /** Decode the provided JSON string and return the result
-      * If null, there is a decode problem
-      * @param string $input The string to decode
-      * @return mixed The decoded string in object
-      */
+    /**
+     * Decode the provided JSON string and return the result
+     * If null, there is a decode problem
+     * @param string $input The string to decode
+     * @return mixed The decoded string in object
+     */
     private function jsonDecode($input)
     {
         return json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
diff --git a/src/Language.php b/src/Language.php
index 0b68f77..f1201c9 100644
--- a/src/Language.php
+++ b/src/Language.php
@@ -1,15 +1,17 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Language class : change the messages
-  */
+/**
+ * Language class : change the messages
+ */
 class Language
 {
     // Language.php
@@ -26,18 +28,21 @@ class Language
     // The languages are always in the format fr_FR (without the codeset)
 
 
-    /** Language cache directory */
+    /**
+     * Language cache directory
+     */
     public $cacheDir = "data/locale";
 
-    /** Choose the best language in the browser list and which is available in
-      * locale path
-      * @param string|null $repLocale Directory where are stored the translations
-      * @param string|null $languageCode The coding langugage of the soft
-      * @return string The choosed locale whithout charset (like fr_FR)
-      */
+    /**
+     * Choose the best language in the browser list and which is available in
+     * locale path
+     * @param string|null $repLocale Directory where are stored the translations
+     * @param string|null $languageCode The coding langugage of the soft
+     * @return string The choosed locale whithout charset (like fr_FR)
+     */
     public function languageSelection($repLocale = "./locale", $languageCode = "fr_FR")
     {
-        $arrAccept = array();
+        $arrAccept = [];
         if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
             // Analyse de HTTP_ACCEPT_LANGUAGE
             // HTTP_ACCEPT_LANGUAGE est de la forme : fr,en;q=0.7,en-us;q=0.3
@@ -128,12 +133,13 @@ class Language
         return ($languageCode);
     }
 
-    /** Return the language recorded in the Cookie. Check if this language is
-      * @param string $cookieName The cookie name
-      * @param string|null $repLocale The directory use to store the locale files
-      * allowed
-      * @return string The language allowed or FALSE
-      */
+    /**
+     * Return the language recorded in the Cookie. Check if this language is
+     * @param string $cookieName The cookie name
+     * @param string|null $repLocale The directory use to store the locale files
+     * allowed
+     * @return string The language allowed or FALSE
+     */
     public function languageCookie($cookieName, $repLocale = "./locale")
     {
         if (!isset($_COOKIE[$cookieName])) {
@@ -143,27 +149,29 @@ class Language
         if ($listeTranslations === false) {
             return false;
         }
-        if (in_array($_COOKIE[$cookieName], $listeTranslations)) {
+        if (in_array($_COOKIE[$cookieName], $listeTranslations, true)) {
             return $_COOKIE[$cookieName];
         }
         return false;
     }
 
-    /** Set the cookie with a TTL of one month
-      * @param string $cookieName The name of the cookie
-      * @param string $languageCode Language to store
-      * @param string $sitepath The site path
-      */
+    /**
+     * Set the cookie with a TTL of one month
+     * @param string $cookieName The name of the cookie
+     * @param string $languageCode Language to store
+     * @param string $sitepath The site path
+     */
     public function languageCookieSet($cookieName, $languageCode, $sitepath)
     {
         @setcookie($cookieName, $languageCode, time() + 60 * 60 * 24 * 30, $sitepath);
     }
 
-    /** Return an array with all the languages available in the $repLocale dir
-      * The languages are in the format 'en_US' without the codeset.
-      * @param string|null $repLocale The directory use to store the locale files
-      * Return FALSE if there is an error
-      */
+    /**
+     * Return an array with all the languages available in the $repLocale dir
+     * The languages are in the format 'en_US' without the codeset.
+     * @param string|null $repLocale The directory use to store the locale files
+     * Return FALSE if there is an error
+     */
     public function languageTraductionsList($repLocale = "./locale")
     {
         if (! is_dir($repLocale) || ! is_readable($repLocale)) {
@@ -183,10 +191,11 @@ class Language
         return $list;
     }
 
-    /** Return the full text of the category
-      * Return false if it doesn't exists
-      * @param string $category The category to analyze
-      */
+    /**
+     * Return the full text of the category
+     * Return false if it doesn't exists
+     * @param string $category The category to analyze
+     */
     private function languageCategoryText($category)
     {
         $categories[LC_ALL] = "LC_ALL";
@@ -202,14 +211,15 @@ class Language
         return $categories[$category];
     }
 
-    /** This function manage the cache of $package.mo files as Apache cache them
-      * It return the directory to use
-      * @param string $languageCode Language with format "fr_FR"
-      * @param string|null $package The package name of the soft ($package.mo
-      *                             file). "messages" by default
-      * @param string|null $category The folder name LC_MESSAGES by default
-      * @param string|null $repLocale The folder where all the locales are stored
-      */
+    /**
+     * This function manage the cache of $package.mo files as Apache cache them
+     * It return the directory to use
+     * @param string $languageCode Language with format "fr_FR"
+     * @param string|null $package The package name of the soft ($package.mo
+     *                             file). "messages" by default
+     * @param string|null $category The folder name LC_MESSAGES by default
+     * @param string|null $repLocale The folder where all the locales are stored
+     */
     public function languageCache(
         $languageCode,
         $package = "messages",
@@ -255,7 +265,8 @@ class Language
                 filemtime($moFile) > filemtime($link)
             ) {
                 // Do not remove immediately the old files : they can be used by Apache
-                $files = glob($this->cacheDir . "/*/" . $linkEnd);
+                $files = glob($this->cacheDir . "/
+ */" . $linkEnd);
                 foreach ($files as $file) {
                     unlink($file);
                     // Remove the empty dirs. If not empty, do not display an error
@@ -273,13 +284,14 @@ class Language
         return $moFile;
     }
 
-    /** Start the Gettext support with the cached file .mo provided as parameter
-      * @param string $moFile The .mo file
-      * @param string $languageCode The language code to use
-      * @param integer $category the LC_ type to use
-      * @param string|null $repLocale The locale directory. Use "./locale" if not
-      * provided
-      */
+    /**
+     * Start the Gettext support with the cached file .mo provided as parameter
+     * @param string $moFile The .mo file
+     * @param string $languageCode The language code to use
+     * @param integer $category the LC_ type to use
+     * @param string|null $repLocale The locale directory. Use "./locale" if not
+     * provided
+     */
     public function languageActivation(
         $moFile,
         $languageCode,
@@ -322,11 +334,13 @@ class Language
         return false;
     }
 
-    /** The complete stack of language selection
-        @param string $package The package name (package.(po|mo) files)
-        @param string $languageCookie The name of the cookie saved in the browser
-        @param string $forcedLanguage The name of a forced language
-        @return string The language with format fr_FR to be used */
+    /**
+     * The complete stack of language selection
+     * @param string $package The package name (package.(po|mo) files)
+     * @param string $languageCookie The name of the cookie saved in the browser
+     * @param string $forcedLanguage The name of a forced language
+     * @return string The language with format fr_FR to be used
+     */
     public function activeLanguage(
         $package,
         $languageCookie,
@@ -366,10 +380,12 @@ class Language
         return $languageCode;
     }
 
-    /** Return the language name from the language
-        Ex. : $languageCode=fr_FR, return France
-        @param string $languageCode Language with format "fr_FR"
-        @return string Then language name */
+    /**
+     * Return the language name from the language
+     * Ex. : $languageCode=fr_FR, return France
+     * @param string $languageCode Language with format "fr_FR"
+     * @return string Then language name
+     */
     public function languageName($languageCode)
     {
         switch ($languageCode) {
@@ -384,11 +400,12 @@ class Language
         }
     }
 
-    /** Return the language subtag for the language
-      * http://www.iana.org/assignments/language-subtag-registry/
-      * language-subtag-registry
-      * @param string $languageCode The language code to convert
-      */
+    /**
+     * Return the language subtag for the language
+     * http://www.iana.org/assignments/language-subtag-registry/
+     * language-subtag-registry
+     * @param string $languageCode The language code to convert
+     */
     public function languageSubTag($languageCode)
     {
         return str_replace("_", "-", $languageCode);
diff --git a/src/Lockfile.php b/src/Lockfile.php
index 8d0252f..2bcdad3 100644
--- a/src/Lockfile.php
+++ b/src/Lockfile.php
@@ -1,24 +1,32 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The lock management of files
-  */
+/**
+ * The lock management of files
+ */
 class Lockfile
 {
-    /** The Exclusive lock file */
+    /**
+     * The Exclusive lock file
+     */
     public $storagelock = "./data/lockfile.lock";
-    /** The Read-Only lock file */
+    /**
+     * The Read-Only lock file
+     */
     private $storagelockRO = false;
 
-    /** This function lock the storage file until all is written.
-        If an other processus want to lock, it hang until the lock is released */
+    /**
+     * This function lock the storage file until all is written.
+     * If an other processus want to lock, it hang until the lock is released
+     */
     public function lockRW()
     {
         if (!is_dir(dirname($this->storagelock))) {
@@ -79,8 +87,10 @@ class Lockfile
         return true;
     }
 
-    /** This function lock the storage in share mode (to read the file without
-        modification at the same time) */
+    /**
+     * This function lock the storage in share mode (to read the file without
+     * modification at the same time)
+     */
     public function lockRO()
     {
         if (!is_dir(dirname($this->storagelock))) {
@@ -116,7 +126,9 @@ class Lockfile
         $this->storagelockRO = $this->storagelock . "-" . $lockid;
     }
 
-    /** This function unlock RW the storage file */
+    /**
+     * This function unlock RW the storage file
+     */
     public function unlockRW()
     {
         if (file_exists($this->storagelock)) {
@@ -124,7 +136,9 @@ class Lockfile
         }
     }
 
-    /** This function unlock RO the storage file */
+    /**
+     * This function unlock RO the storage file
+     */
     public function unlockRO()
     {
         if ($this->storagelockRO !== false && file_exists($this->storagelockRO)) {
diff --git a/src/Logger.php b/src/Logger.php
index d1af83a..8fd58f9 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -1,16 +1,18 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The logger class permit to log the information from the soft
-  * It allow to debug too
-  */
+/**
+ * The logger class permit to log the information from the soft
+ * It allow to debug too
+ */
 class Logger
 {
     /* The logger class can be used with :
@@ -20,60 +22,81 @@ class Logger
        $d->logfile="/tmp/toto.log";
        $d->logwrite ("Super log default");
        $d->logwrite ("Super log DEBUG", $d::DEBUG);
-       $d->logwrite ("Super log NOTICE", $d::NOTICE); */
+       $d->logwrite ("Super log NOTICE", $d::NOTICE);
+ */
     // TODO : Add SQL support
-    /** The method to log.
-        Can be display, file, syslog, stderr, session
-        Can be merged with a pipe : "display|syslog|file" or put in array */
+    /**
+     * The method to log.
+     * Can be display, file, syslog, stderr, session
+     * Can be merged with a pipe : "display|syslog|file" or put in array
+     */
     public $logtype = "stderr";
-    /** For logtype=file, the filename to use */
+    /**
+     * For logtype=file, the filename to use
+     */
     public $logfile = false;
-    /** Timezone use to save the logs */
+    /**
+     * Timezone use to save the logs
+     */
     public $timezone = "UTC";
-    /** Minimum log level in the logs */
+    /**
+     * Minimum log level in the logs
+     */
     public $loglevelmin = LOG_NOTICE;
-    /** In Syslog mode, the facility to use
-      See http://fr2.php.net/manual/en/function.openlog.php for $syslogFacility */
+    /**
+     * In Syslog mode, the facility to use
+     * See http://fr2.php.net/manual/en/function.openlog.php for $syslogFacility
+     */
     public $syslogFacility = LOG_USER;
-    /** In Syslog, prefix the log by the text */
+    /**
+     * In Syslog, prefix the log by the text
+     */
     public $syslogPrefix = false;
-    /** Remove X entries of backtrace to see the right file generating the error
-      */
+    /**
+     * Remove X entries of backtrace to see the right file generating the error
+     */
     public $backTraceSkip = 1;
-    /** Display the backtrace in all the messages */
+    /**
+     * Display the backtrace in all the messages
+     */
     public $backtraceDisplay = false;
 
-    /** The priorities which can be used in the priorities
-    LOG_EMERG   system is unusable
-    LOG_ALERT   action must be taken immediately
-    LOG_CRIT    critical conditions
-    LOG_ERR     error conditions
-    LOG_WARNING warning conditions
-    LOG_NOTICE  normal, but significant, condition
-    LOG_INFO    informational message
-    LOG_DEBUG   debug-level message */
-    private $priorities = array(LOG_EMERG   => "EMERG",
+    /**
+     * The priorities which can be used in the priorities
+     * LOG_EMERG   system is unusable
+     * LOG_ALERT   action must be taken immediately
+     * LOG_CRIT    critical conditions
+     * LOG_ERR     error conditions
+     * LOG_WARNING warning conditions
+     * LOG_NOTICE  normal, but significant, condition
+     * LOG_INFO    informational message
+     * LOG_DEBUG   debug-level message
+     */
+    private $priorities = [LOG_EMERG   => "EMERG",
                                LOG_ALERT   => "ALERT",
                                LOG_CRIT    => "CRITICAL",
                                LOG_ERR     => "ERROR",
                                LOG_WARNING => "WARNING",
                                LOG_NOTICE  => "NOTICE",
                                LOG_INFO    => "INFO",
-                               LOG_DEBUG   => "DEBUG");
+                               LOG_DEBUG   => "DEBUG"];
 
-    /** Catch all the messages raised by the PHP, in trigger_error
-        Use the properties of the logger to save the logs */
+    /**
+     * Catch all the messages raised by the PHP, in trigger_error
+     * Use the properties of the logger to save the logs
+     */
     public function catchAll()
     {
-        set_error_handler(array(&$this, "errorHandler"));
+        set_error_handler([&$this, "errorHandler"]);
     }
 
-    /** The error handler to log
-      * @param integer $errno The error number to use
-      * @param string $errstr The error message to save
-      * @param string $errfile The file which generate the error
-      * @param integer $errline The line where the error is generated
-      */
+    /**
+     * The error handler to log
+     * @param integer $errno The error number to use
+     * @param string $errstr The error message to save
+     * @param string $errfile The file which generate the error
+     * @param integer $errline The line where the error is generated
+     */
     public function errorHandler($errno, $errstr, $errfile, $errline)
     {
         if (!(error_reporting() & $errno)) {
@@ -130,12 +153,14 @@ class Logger
         $this->log($priority, $errstr);
     }
 
-    /** Store a new message log in the log manager defined by $logtype
-        The message can be multiple types. An array will be stored in textual form
-        but it will accept only one depth.
-        The $message is not fixed, you can pass the number of parameters you want
-        @param integer|null $priority Priority to use
-        @param mixed ...$message Message to log */
+    /**
+     * Store a new message log in the log manager defined by $logtype
+     * The message can be multiple types. An array will be stored in textual form
+     * but it will accept only one depth.
+     * The $message is not fixed, you can pass the number of parameters you want
+     * @param integer|null $priority Priority to use
+     * @param mixed ...$message Message to log
+     */
     public function log($priority, $message)
     {
         if ($priority === null) {
@@ -251,26 +276,28 @@ class Logger
         } elseif (is_array($this->logtype)) {
             $logsType = $this->logtype;
         }
-        if (in_array("display", $logsType)) {
+        if (in_array("display", $logsType, true)) {
             $this->logdisplay($msg, $priority);
         }
-        if (in_array("stderr", $logsType)) {
+        if (in_array("stderr", $logsType, true)) {
             $this->logstderr($msg, $priority);
         }
-        if (in_array("file", $logsType)) {
+        if (in_array("file", $logsType, true)) {
             $this->logfile($msg, $priority);
         }
-        if (in_array("syslog", $logsType)) {
+        if (in_array("syslog", $logsType, true)) {
             $this->logsyslog($msg, $priority);
         }
-        if (in_array("session", $logsType)) {
+        if (in_array("session", $logsType, true)) {
             $this->logsession($msg, $priority);
         }
     }
 
-    /** Log $message on file
-        @param string $message Message to log
-        @param integer|null $priority Priority to use */
+    /**
+     * Log $message on file
+     * @param string $message Message to log
+     * @param integer|null $priority Priority to use
+     */
     private function logfile($message, $priority)
     {
         if ($this->logfile === false) {
@@ -303,9 +330,11 @@ class Logger
         file_put_contents($this->logfile, $message, FILE_APPEND | LOCK_EX);
     }
 
-    /** Log $message on screen with adding date. Add the HTML flags if not in CLI.
-        @param string $message Message to log
-        @param integer|null $priority Priority to use */
+    /**
+     * Log $message on screen with adding date. Add the HTML flags if not in CLI.
+     * @param string $message Message to log
+     * @param integer|null $priority Priority to use
+     */
     private function logdisplay($message, $priority)
     {
         if (php_sapi_name() !== "cli") {
@@ -324,9 +353,11 @@ class Logger
         echo "\n";
     }
 
-    /** Log $message on stderr with adding date. Add the HTML flags if not in CLI.
-        @param string $message Message to log
-        @param integer|null $priority Priority to use */
+    /**
+     * Log $message on stderr with adding date. Add the HTML flags if not in CLI.
+     * @param string $message Message to log
+     * @param integer|null $priority Priority to use
+     */
     private function logstderr($message, $priority)
     {
         ini_set("date.timezone", $this->timezone);
@@ -336,9 +367,11 @@ class Logger
         file_put_contents("php://stderr", "\n");
     }
 
-    /** Log $message on syslog
-        @param string $message Message to log
-        @param integer|null $priority Priority to use */
+    /**
+     * Log $message on syslog
+     * @param string $message Message to log
+     * @param integer|null $priority Priority to use
+     */
     private function logsyslog($message, $priority)
     {
         if (is_string($this->syslogFacility)) {
@@ -405,9 +438,11 @@ class Logger
         syslog($priority, $message);
     }
 
-    /** Log $message on session (for debug)
-        @param string $message Message to log
-        @param integer|null $priority Priority to use */
+    /**
+     * Log $message on session (for debug)
+     * @param string $message Message to log
+     * @param integer|null $priority Priority to use
+     */
     private function logsession($message, $priority)
     {
         if (! isset($_SESSION)) {
diff --git a/src/Macaddresses.php b/src/Macaddresses.php
index 60e74a6..c5890c0 100644
--- a/src/Macaddresses.php
+++ b/src/Macaddresses.php
@@ -1,34 +1,37 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage the MAC addresses
-  * Based on :
-  * https://www.stetsenko.net/2011/01/php-mac-address-validating-and-formatting/
-  * The MAC format can be :
-  *   - de:ad:be:af:aa:bb
-  *   - de-ad-be-af-aa-bb
-  *   - 0005.313B.9080
-  *   - 0005313B9080
-  */
+/**
+ * Manage the MAC addresses
+ * Based on :
+ * https://www.stetsenko.net/2011/01/php-mac-address-validating-and-formatting/
+ * The MAC format can be :
+ *   - de:ad:be:af:aa:bb
+ *   - de-ad-be-af-aa-bb
+ *   - 0005.313B.9080
+ *   - 0005313B9080
+ */
 class Macaddresses
 {
-    /** This method return true if the provided MAC address is valid
-      * return false if the mac is not valid
-      * The MAC format can be :
-      *   - de:ad:be:af:aa:bb
-      *   - de-ad-be-af-aa-bb
-      *   - 0005.313B.9080
-      *   - 0005313B9080
-      * @param string $mac The mac to check
-      * @return bool
-      */
+    /**
+     * This method return true if the provided MAC address is valid
+     * return false if the mac is not valid
+     * The MAC format can be :
+     *   - de:ad:be:af:aa:bb
+     *   - de-ad-be-af-aa-bb
+     *   - 0005.313B.9080
+     *   - 0005313B9080
+     * @param string $mac The mac to check
+     * @return bool
+     */
     public static function isMACAddress($mac)
     {
         if (! is_string($mac)) {
@@ -40,14 +43,15 @@ class Macaddresses
             preg_match("/^[a-fA-F0-9]{12}$/", $mac) === 1);
     }
 
-    /** Reform the mac address with the separator.
-      * The provided mac MUST be without separator (can be removed by
-      * removeSeparator method)
-      * @param string $mac The mac address to update, without separator
-      * @param string|null $separator The separator to use (: by default)
-      * @param integer|null $nbdigit The number of digit to use
-      * @return string The updated mac address with separators
-      */
+    /**
+     * Reform the mac address with the separator.
+     * The provided mac MUST be without separator (can be removed by
+     * removeSeparator method)
+     * @param string $mac The mac address to update, without separator
+     * @param string|null $separator The separator to use (: by default)
+     * @param integer|null $nbdigit The number of digit to use
+     * @return string The updated mac address with separators
+     */
     public static function addSeparator($mac, $separator = ':', $nbdigit = 2)
     {
         if (strspn($mac, "0132465789ABCDEFabcdef") !== strlen($mac)) {
@@ -59,14 +63,15 @@ class Macaddresses
         return join($separator, str_split($mac, $nbdigit));
     }
 
-    /** Remove all the separators from the provided MAC address
-      * @param string $mac the mac address to update
-      * @param array|null $separators The separators to remove
-      * @return string the updated mac address without separators
-      */
+    /**
+     * Remove all the separators from the provided MAC address
+     * @param string $mac the mac address to update
+     * @param array|null $separators The separators to remove
+     * @return string the updated mac address without separators
+     */
     public static function removeSeparator(
         $mac,
-        $separators = array(":", "-", ".")
+        $separators = [":", "-", "."]
     ) {
         return str_replace($separators, '', $mac);
     }
diff --git a/src/Mail.php b/src/Mail.php
index 753cb2f..121f810 100644
--- a/src/Mail.php
+++ b/src/Mail.php
@@ -1,42 +1,50 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The class to create a complete email. Can read an email from a content
-  */
+/**
+ * The class to create a complete email. Can read an email from a content
+ */
 class Mail
 {
-    /** The complete of the mail
-      */
+    /**
+     * The complete of the mail
+     */
     private $completeEmailEML = "";
 
-    /** Private the separator between the headers and the mail. Should be
-      * \r\n on a line, but special crafted mails may use something else
-      */
+    /**
+     * Private the separator between the headers and the mail. Should be
+     * \r\n on a line, but special crafted mails may use something else
+     */
     private $headerBodySeparator = "\r\n";
 
-    /** Sections definitions
-      * Will store the mails sections with the parameters :
-      * _parent string|null The parent identifier
-      * _boundary string|null The Boundary identifier
-      * _contentType string The simplified Content Type
-      * Content-Type string The complete Content-Type used in previous headers
-      * _partsIDchild array the parts ID linked to this section
-      */
-    private $sections = array();
+    /**
+     * Sections definitions
+     * Will store the mails sections with the parameters :
+     * _parent string|null The parent identifier
+     * _boundary string|null The Boundary identifier
+     * _contentType string The simplified Content Type
+     * Content-Type string The complete Content-Type used in previous headers
+     * _partsIDchild array the parts ID linked to this section
+     */
+    private $sections = [];
 
-    /** Counter for the recursion */
+    /**
+     * Counter for the recursion
+     */
     private $recurse;
 
-    /** Display the existing sections lighter than print_r, without the Carriage
-      * returns
-      */
+    /**
+     * Display the existing sections lighter than print_r, without the Carriage
+     * returns
+     */
     private function printSections()
     {
         foreach ($this->sections as $sectionID => $vals) {
@@ -64,10 +72,11 @@ class Mail
         }
     }
 
-    /** Add a new section
-      * @param array $param The parameters to store
-      * @return the sectionID
-      */
+    /**
+     * Add a new section
+     * @param array $param The parameters to store
+     * @return the sectionID
+     */
     private function sectionAdd($param)
     {
         $sectionID = md5(microtime(true) . rand());
@@ -75,35 +84,38 @@ class Mail
         return $sectionID;
     }
 
-    /** Add a new section with the default parameters
-      * @return array The sectionID stored with the default parameters
-      */
+    /**
+     * Add a new section with the default parameters
+     * @return array The sectionID stored with the default parameters
+     */
     private function sectionAddDefault()
     {
         return $this->sectionAdd(
-            array("_headerBodySeparator" => $this->headerBodySeparator,
+            ["_headerBodySeparator" => $this->headerBodySeparator,
                   "_headerCR" => "\r\n",
                   "_headersEML" => "",
-                  "_headersArray" => array(),
+                  "_headersArray" => [],
                   "_contentEML" => "",
-                  "_contentUTF" => "")
+                  "_contentUTF" => ""]
         );
     }
 
-    /** Del an existing section
-      * If there is one child, and the section was multiple, remove it and
-      * associate the child to a new section
-      * @param string $sectionID The section to delete
-      */
+    /**
+     * Del an existing section
+     * If there is one child, and the section was multiple, remove it and
+     * associate the child to a new section
+     * @param string $sectionID The section to delete
+     */
     private function sectionDel($sectionID)
     {
         // TODO !
     }
 
-    /** Add a newChild to an existing section at the end of the list
-      * @param string $sectionIDParent The parent modified by adding a child
-      * @param string $sectionIDchild The sectionID of the child to add
-      */
+    /**
+     * Add a newChild to an existing section at the end of the list
+     * @param string $sectionIDParent The parent modified by adding a child
+     * @param string $sectionIDchild The sectionID of the child to add
+     */
     private function sectionAddChild($sectionIDParent, $sectionIDchild)
     {
         if (! array_key_exists($sectionIDParent, $this->sections)) {
@@ -116,10 +128,11 @@ class Mail
         $this->sections[$sectionIDchild]["_parentID"] = $sectionIDParent;
     }
 
-    /** Add a newChild to an existing section at the beginning of the list
-      * @param string $sectionIDParent The parent modified by adding a child
-      * @param string $sectionIDchild The sectionID of the child to add
-      */
+    /**
+     * Add a newChild to an existing section at the beginning of the list
+     * @param string $sectionIDParent The parent modified by adding a child
+     * @param string $sectionIDchild The sectionID of the child to add
+     */
     private function sectionAddChildFirst($sectionIDParent, $sectionIDchild)
     {
         if (! array_key_exists($sectionIDParent, $this->sections)) {
@@ -135,10 +148,11 @@ class Mail
         $this->sections[$sectionIDchild]["_parentID"] = $sectionIDParent;
     }
 
-    /** Remove all the defined Childs in the section. Do not remove really the
-      * childs !
-      * @param string $sectionID the section to clean
-      */
+    /**
+     * Remove all the defined Childs in the section. Do not remove really the
+     * childs !
+     * @param string $sectionID the section to clean
+     */
     private function sectionDelChilds($sectionID)
     {
         if (! array_key_exists($sectionID, $this->sections)) {
@@ -150,10 +164,11 @@ class Mail
         unset($this->sections[$sectionID]["_partsIDchild"]);
     }
 
-    /** Update the content of an existing section
-      * @param string $sectionID The section to modify
-      * @param array $param The parameters to update
-      */
+    /**
+     * Update the content of an existing section
+     * @param string $sectionID The section to modify
+     * @param array $param The parameters to update
+     */
     private function sectionUpdate($sectionID, $param)
     {
         if (! array_key_exists($sectionID, $this->sections)) {
@@ -173,20 +188,22 @@ class Mail
         }
     }
 
-    /** Get the list of sections ID
-      * @return array the defined sectionsID
-      */
+    /**
+     * Get the list of sections ID
+     * @return array the defined sectionsID
+     */
     private function sectionList()
     {
         return array_keys($this->sections);
     }
 
-    /** Get the section ID List with parents ID
-      * @return array the defined sectionsID with the parent ID as value
-      */
+    /**
+     * Get the section ID List with parents ID
+     * @return array the defined sectionsID with the parent ID as value
+     */
     private function sectionListParent()
     {
-        $res = array();
+        $res = [];
         foreach ($this->sections as $sectionID => $content) {
             if (! array_key_exists("_parentID", $content)) {
                 $res[$sectionID] = "";
@@ -197,10 +214,11 @@ class Mail
         return $res;
     }
 
-    /** Return the content array of the section
-      * @param string $sectionID The section ID to get
-      * @return array The content of the section
-      */
+    /**
+     * Return the content array of the section
+     * @param string $sectionID The section ID to get
+     * @return array The content of the section
+     */
     private function sectionGet($sectionID)
     {
         if (! array_key_exists($sectionID, $this->sections)) {
@@ -212,9 +230,10 @@ class Mail
         return $this->sections[$sectionID];
     }
 
-    /** Get the section ID of the main part
-      * @return bool|string the section ID of the main part or FALSE if not found
-      */
+    /**
+     * Get the section ID of the main part
+     * @return bool|string the section ID of the main part or FALSE if not found
+     */
     public function sectionMainID()
     {
         foreach ($this->sectionListParent() as $sectionID => $parentID) {
@@ -225,9 +244,10 @@ class Mail
         return false;
     }
 
-    /** Refresh the _headersEML from the _headersArray
-      * @param string $sectionID the section to refresh
-      */
+    /**
+     * Refresh the _headersEML from the _headersArray
+     * @param string $sectionID the section to refresh
+     */
     private function sectionRefreshHeadersEML($sectionID)
     {
         $section = $this->sectionGet($sectionID);
@@ -240,13 +260,14 @@ class Mail
         $this->sections[$sectionID]["_headersEML"] = $headersEML;
     }
 
-    /** Read the complete mail to analyze
-      * Destroy all the previous definitions of mail
-      * @param string $content The complete mail to read
-      */
+    /**
+     * Read the complete mail to analyze
+     * Destroy all the previous definitions of mail
+     * @param string $content The complete mail to read
+     */
     public function readMail($content)
     {
-        $this->sections = array();
+        $this->sections = [];
         $this->completeEmailEML = $content;
         $partinfo = $this->parseMessagePart($content);
         if ($partinfo !== null) {
@@ -254,11 +275,12 @@ class Mail
         }
     }
 
-    /** Read the content of the mail and allow the content to be also multipart.
-      * Then the method is recursively called to generate the sections
-      * @param array $partinfo The partinfo from parseMessagePart to analyze
-      * @param string|null $sectionIDParent The parent sectionID to link with
-      */
+    /**
+     * Read the content of the mail and allow the content to be also multipart.
+     * Then the method is recursively called to generate the sections
+     * @param array $partinfo The partinfo from parseMessagePart to analyze
+     * @param string|null $sectionIDParent The parent sectionID to link with
+     */
     private function readMailContentRecurse($partinfo, $sectionIDParent = false)
     {
         if (
@@ -296,8 +318,8 @@ class Mail
             unset($boundaryArray);
             $this->sectionUpdate(
                 $sectionIDParent,
-                array("_boundary" => $boundary,
-                                   "_boundaryCR" => $boundaryCR)
+                ["_boundary" => $boundary,
+                                   "_boundaryCR" => $boundaryCR]
             );
             $parts = preg_split(
                 "#(--" . preg_quote($boundary) . "(--)?)([\r\n]+)#",
@@ -331,10 +353,11 @@ class Mail
         }
     }
 
-    /** Return the data for a part of the mail
-      * @param string $content The content of the mail to parse
-      * @return array The data content in the mail
-      */
+    /**
+     * Return the data for a part of the mail
+     * @param string $content The content of the mail to parse
+     * @return array The data content in the mail
+     */
     private function parseMessagePart($content)
     {
         // Get the HeaderBodySeparator
@@ -350,12 +373,12 @@ class Mail
         }
         if ($pos === false) {
             //throw new \Exception ("Can't find the header/body separator", 500);
-            return array("_contentEML" => $content);
+            return ["_contentEML" => $content];
         }
         // Get the headers
         $headersEML = ltrim(substr($content, 0, $pos +
                                               strlen($headerBodySeparator)));
-        $headersArray = array();
+        $headersArray = [];
         if ($headersEML !== "" && $headersEML !== "--") {
             $prev = "";
             $prevCR = "";
@@ -440,7 +463,7 @@ class Mail
         if ($charset !== false) {
             $contentUTF = iconv($charset, "utf-8", $contentUTF);
         }
-        $res = array("_headerBodySeparator" => $headerBodySeparator,
+        $res = ["_headerBodySeparator" => $headerBodySeparator,
                   "_headerCR" => $prevCR,
                   "_headersEML" => $headersEML,
                   "_headersArray" => $headersArray,
@@ -448,7 +471,7 @@ class Mail
                   "_contentType" => $contentTypeArray["Content-Type"],
                   "Content-Transfer-Encoding" => $contentTransferEncoding,
                   "_contentEML" => $contentEML,
-                  "_contentUTF" => $contentUTF);
+                  "_contentUTF" => $contentUTF];
         preg_match("#; name=['\"](.+)['\"]#", $contentType, $matches);
         if (array_key_exists(1, $matches)) {
             $res["_name"] = $matches[1];
@@ -463,8 +486,9 @@ class Mail
         return $res;
     }
 
-    /** The constuctor verify if the external libraries are available
-      */
+    /**
+     * The constuctor verify if the external libraries are available
+     */
     public function __construct()
     {
         if (! function_exists("finfo_buffer")) {
@@ -487,12 +511,13 @@ class Mail
         $this->addHeader("MIME-Version", "1.0");
     }
 
-    /** Define a HTML body. If the HTML body already exists, overwrite it
-      * If there is an text body, manage the boundary in alternative mode
-      * @param string $htmlContent in UTF-8
-      * @param string $charset to be stored in the mail
-      * @param string $encoding the encoding in the mail
-      */
+    /**
+     * Define a HTML body. If the HTML body already exists, overwrite it
+     * If there is an text body, manage the boundary in alternative mode
+     * @param string $htmlContent in UTF-8
+     * @param string $charset to be stored in the mail
+     * @param string $encoding the encoding in the mail
+     */
     public function setBodyHTML(
         $htmlContent,
         $charset = "utf-8",
@@ -569,10 +594,10 @@ class Mail
                 );
                 $this->sectionUpdate(
                     $multiID,
-                    array("_contentType" => "multipart/alternative",
+                    ["_contentType" => "multipart/alternative",
                     "_boundary" => $boundary,
                     "_boundaryCR" => "\r\n",
-                    )
+                    ]
                 );
 
                 // Add a HTML section in the multipart/alternative section after the
@@ -613,12 +638,13 @@ class Mail
         $this->createMailEML();
     }
 
-    /** Add a Text body. If the text body already exists, overwrite it
-      * If there is an HTML body, manage the boundary in alternative mode
-      * @param string $textContent in UTF-8
-      * @param string $charset to be stored in the mail
-      * @param string $encoding the encoding in the mail
-      */
+    /**
+     * Add a Text body. If the text body already exists, overwrite it
+     * If there is an HTML body, manage the boundary in alternative mode
+     * @param string $textContent in UTF-8
+     * @param string $charset to be stored in the mail
+     * @param string $encoding the encoding in the mail
+     */
     public function setBodyText(
         $textContent,
         $charset = "utf-8",
@@ -678,10 +704,10 @@ class Mail
                 );
                 $this->sectionUpdate(
                     $multiID,
-                    array("_contentType" => "multipart/alternative",
+                    ["_contentType" => "multipart/alternative",
                     "_boundary" => $boundary,
                     "_boundaryCR" => "\r\n",
-                    )
+                    ]
                 );
                 // Add a HTML section in the multipart/alternative section
                 $sectionIDtoChange = $this->sectionAddDefault();
@@ -720,12 +746,13 @@ class Mail
         $this->createMailEML();
     }
 
-    /** Return the HTML body if exists in UTF-8. If the body is not in UTF-8, it
-      * is converted
-      * Return false if it doesn't exists
-      * @return string|false The HTML body converted in UTF-8 or false if there is
-      *         no HTML part in the mail
-      */
+    /**
+     * Return the HTML body if exists in UTF-8. If the body is not in UTF-8, it
+     * is converted
+     * Return false if it doesn't exists
+     * @return string|false The HTML body converted in UTF-8 or false if there is
+     *         no HTML part in the mail
+     */
     public function getBodyHTML()
     {
         $sectionList = $this->sectionList();
@@ -750,12 +777,13 @@ class Mail
         return false;
     }
 
-    /** Get the text body if exists in UTF-8. If the body is not in UTF-8, it is
-      * converted
-      * Return false if it doesn't exists
-      * @return string|false The Text body converted in UTF-8 or false if there is
-      *         no Text part in the mail
-      */
+    /**
+     * Get the text body if exists in UTF-8. If the body is not in UTF-8, it is
+     * converted
+     * Return false if it doesn't exists
+     * @return string|false The Text body converted in UTF-8 or false if there is
+     *         no Text part in the mail
+     */
     public function getBodyText()
     {
         $sectionList = $this->sectionList();
@@ -780,13 +808,14 @@ class Mail
         return false;
     }
 
-    /** Move the sections where the parent is defined to $oldParentID to the
-      * $newParentID.
-      * Move the headers from the valid sections to the newParent, except the
-      * Content-XX lines
-      * @param string $newParentID The Parent which will be modified
-      * @param string|null $oldParentID The oldParent to look for
-      */
+    /**
+     * Move the sections where the parent is defined to $oldParentID to the
+     * $newParentID.
+     * Move the headers from the valid sections to the newParent, except the
+     * Content-XX lines
+     * @param string $newParentID The Parent which will be modified
+     * @param string|null $oldParentID The oldParent to look for
+     */
     private function moveChilds($newParentID, $oldParentID = false)
     {
         if ($newParentID === $oldParentID) {
@@ -805,7 +834,7 @@ class Mail
             ) {
                 $this->sections[$sectionID]["_parentID"] = $newParentID;
                 $this->sections[$newParentID]["_partsIDchild"][] = $sectionID;
-                $multipartHeaders = array();
+                $multipartHeaders = [];
                 $headersEML = "";
                 foreach ($section["_headersArray"] as $key => $val) {
                     $head = key($val);
@@ -846,16 +875,17 @@ class Mail
         }
     }
 
-    /** Add an attachment to the mail.
-      * The allowed encodings are "quoted-printable" or "base64"
-      * @param string $name The name of the file
-      * @param string $fileContent The content of the file in binary
-      * @param string|null $encoding The output encoding. Can be
-      *        base64/quoted-printable
-      * @param boolean|null $inline Store the file in inline mode
-      *        (multipart/related)
-      *        If false, store the file in attached mode (multipart/mixed)
-      */
+    /**
+     * Add an attachment to the mail.
+     * The allowed encodings are "quoted-printable" or "base64"
+     * @param string $name The name of the file
+     * @param string $fileContent The content of the file in binary
+     * @param string|null $encoding The output encoding. Can be
+     *        base64/quoted-printable
+     * @param boolean|null $inline Store the file in inline mode
+     *        (multipart/related)
+     *        If false, store the file in attached mode (multipart/mixed)
+     */
     public function addAttachment(
         $name,
         $fileContent,
@@ -897,10 +927,10 @@ class Mail
             );
             $this->sectionUpdate(
                 $sectionIDMixed,
-                array("_contentType" => $multipart,
+                ["_contentType" => $multipart,
                 "_boundary" => $boundary,
                 "_boundaryCR" => "\r\n",
-                )
+                ]
             );
         }
         if ($sectionIDMixed === "") {
@@ -974,26 +1004,28 @@ class Mail
         }
     }
 
-    /** Add an inline attachment to the mail.
-      * The allowed encodings are "quoted-printable" or "base64"
-      * Return the Content-ID needed to be used in HTML page like :
-      * <img src='cid:XXXXXXXXXX'/>
-      * @param string $name The name of the file
-      * @param string $fileContent The content of the file in binary
-      * @param string|null $encoding The output encoding. Can be
-      *        base64/quoted-printable
-      * @return string The content ID created
-      */
+    /**
+     * Add an inline attachment to the mail.
+     * The allowed encodings are "quoted-printable" or "base64"
+     * Return the Content-ID needed to be used in HTML page like :
+     * <img src='cid:XXXXXXXXXX'/>
+     * @param string $name The name of the file
+     * @param string $fileContent The content of the file in binary
+     * @param string|null $encoding The output encoding. Can be
+     *        base64/quoted-printable
+     * @return string The content ID created
+     */
     public function addAttachmentInline($name, $fileContent, $encoding = "base64")
     {
         return $this->addAttachment($name, $fileContent, $encoding, true);
     }
 
-    /** Get an attachment of the mail
-      * @param integer $number the number of attach to get starting to 0
-      * @param boolean|null $inline Return only the attachments Inline if true
-      * @return string the content of the attachment. Can be binary
-      */
+    /**
+     * Get an attachment of the mail
+     * @param integer $number the number of attach to get starting to 0
+     * @param boolean|null $inline Return only the attachments Inline if true
+     * @return string the content of the attachment. Can be binary
+     */
     public function getAttachment($number, $inline = false)
     {
         $attachmentIDs = $this->getAttachmentID($inline);
@@ -1011,11 +1043,12 @@ class Mail
         return $this->encodingDecode($part["_contentEML"], $encoding);
     }
 
-    /** Get the attachment details
-      * @param integer $number the number of attach to get starting to 0
-      * @param boolean|null $inline Return only the attachments Inline if true
-      * @return array containing the information of the attachment
-      */
+    /**
+     * Get the attachment details
+     * @param integer $number the number of attach to get starting to 0
+     * @param boolean|null $inline Return only the attachments Inline if true
+     * @return array containing the information of the attachment
+     */
     public function getAttachmentDetails($number, $inline = false)
     {
         $attachmentIDs = $this->getAttachmentID($inline);
@@ -1043,14 +1076,15 @@ class Mail
         return $res;
     }
 
-    /** Return the list of the sectionID containing a attachment. Contains the
-      * inline attachments too.
-      * @param boolean $inline Return only the sections Inline if true
-      * @return array The sectionIDs
-      */
+    /**
+     * Return the list of the sectionID containing a attachment. Contains the
+     * inline attachments too.
+     * @param boolean $inline Return only the sections Inline if true
+     * @return array The sectionIDs
+     */
     private function getAttachmentID($inline = false)
     {
-        $res = array();
+        $res = [];
         foreach ($this->sections as $sectionID => $section) {
             if (! key_exists("_headersArray", $section)) {
                 continue;
@@ -1084,10 +1118,11 @@ class Mail
         return $res;
     }
 
-    /** Add a To: header. If it already exists, add a new recipient
-      * @param string $toMail The mail to add
-      * @param string|null $toName The name of the recipient
-      */
+    /**
+     * Add a To: header. If it already exists, add a new recipient
+     * @param string $toMail The mail to add
+     * @param string|null $toName The name of the recipient
+     */
     public function addTo($toMail, $toName = "")
     {
         if (
@@ -1113,18 +1148,20 @@ class Mail
         }
     }
 
-    /** Get the To Header as it is written in the mail
-      * @return string The To Header defined in the mail
-      */
+    /**
+     * Get the To Header as it is written in the mail
+     * @return string The To Header defined in the mail
+     */
     public function getTo()
     {
         return $this->getHeader("To");
     }
 
-    /** Add a From: header. If it already exists, overwrite the existing one
-      * @param string $fromMail The from Mail to define
-      * @param string|null $fromName The from Name to define
-      */
+    /**
+     * Add a From: header. If it already exists, overwrite the existing one
+     * @param string $fromMail The from Mail to define
+     * @param string|null $fromName The from Name to define
+     */
     public function setFrom($fromMail, $fromName = "")
     {
         if (
@@ -1144,29 +1181,32 @@ class Mail
         $this->setHeader("From", "$fromName<$fromMail>");
     }
 
-    /** Return the From header as it is written in the mail
-      * @return string The From Header defined in the mail
-      */
+    /**
+     * Return the From header as it is written in the mail
+     * @return string The From Header defined in the mail
+     */
     public function getFrom()
     {
         return $this->getHeader("From");
     }
 
-    /** Return the From header converted to array with mail and name keys
-      * @return array The From details
-      */
+    /**
+     * Return the From header converted to array with mail and name keys
+     * @return array The From details
+     */
     public function getFromArray()
     {
         $from = $this->getHeader("From");
-        $res = array();
+        $res = [];
         $from = $this->decodeHeaders("From", $from);
         $from = $this->convertPeopleToArray($from);
         return reset($from);
     }
 
-    /** Set the subject
-      * @param string $subject In UTF8
-      */
+    /**
+     * Set the subject
+     * @param string $subject In UTF8
+     */
     public function setSubject($subject)
     {
         $this->setHeader(
@@ -1179,37 +1219,41 @@ class Mail
         );
     }
 
-    /** Set the Date
-      * @param string $date In RFC 2822 format
-      */
+    /**
+     * Set the Date
+     * @param string $date In RFC 2822 format
+     */
     public function setDate($date)
     {
         // TODO : Check if the date format is valid
         $this->setHeader("Date", $date);
     }
 
-    /** Set the Date
-      * @param string $timestamp In Timestamp format
-      */
+    /**
+     * Set the Date
+     * @param string $timestamp In Timestamp format
+     */
     public function setDateTimestamp($timestamp)
     {
         // TODO : Check if the timestamp is valid
         $this->setHeader("Date", date("r", $timestamp));
     }
 
-    /** Get the Date header if defined.
-      * Return false if not defined
-      * @return string|bool The date Header if defined or false if not defined
-      */
+    /**
+     * Get the Date header if defined.
+     * Return false if not defined
+     * @return string|bool The date Header if defined or false if not defined
+     */
     public function getDate()
     {
         return $this->getHeader("Date");
     }
 
-    /** Return the Date header (if defined) in timestamp
-      * Return false if not defined
-      * @return integer|bool The date Header if defined or false if not defined
-      */
+    /**
+     * Return the Date header (if defined) in timestamp
+     * Return false if not defined
+     * @return integer|bool The date Header if defined or false if not defined
+     */
     public function getDateTimestamp()
     {
         $datetimestamp = false;
@@ -1232,11 +1276,12 @@ class Mail
         return $dateTimestamp;
     }
 
-    /** Set a generic header
-      * @param string $header The name of the Header (without colon)
-      * @param string $value The value the store. The format must be correct !
-      * @param string|null $sectionID The section to modify. If null, use the main
-      */
+    /**
+     * Set a generic header
+     * @param string $header The name of the Header (without colon)
+     * @param string $value The value the store. The format must be correct !
+     * @param string|null $sectionID The section to modify. If null, use the main
+     */
     public function setHeader($header, $value, $sectionID = null)
     {
         if (
@@ -1281,11 +1326,12 @@ class Mail
         $this->createMailEML();
     }
 
-    /** Add a generic header
-      * @param string $header The name of the Header (without colon)
-      * @param string $value The value the store. The format must be correct !
-      * @param string|null $sectionID The section to modify. If null, use the main
-      */
+    /**
+     * Add a generic header
+     * @param string $header The name of the Header (without colon)
+     * @param string $value The value the store. The format must be correct !
+     * @param string|null $sectionID The section to modify. If null, use the main
+     */
     public function addHeader($header, $value, $sectionID = null)
     {
         if (
@@ -1326,7 +1372,7 @@ class Mail
             }
             array_unshift(
                 $this->sections[$sectionMainID]["_headersArray"],
-                array($header => $value)
+                [$header => $value]
             );
             $this->sections[$sectionMainID]["_headersEML"] = "$header: $value" .
             $this->sections[$sectionMainID]["_headersEML"];
@@ -1339,10 +1385,11 @@ class Mail
         $this->createMailEML();
     }
 
-    /** Delete a specific header
-      * @param string $header The header to remove
-      * @param string|null $sectionID The section to modify. If null, use the main
-      */
+    /**
+     * Delete a specific header
+     * @param string $header The header to remove
+     * @param string|null $sectionID The section to modify. If null, use the main
+     */
     public function delHeader($header, $sectionID = null)
     {
         if ($sectionID === null) {
@@ -1381,11 +1428,12 @@ class Mail
         $this->createMailEML();
     }
 
-    /** Get all the headers, in the order in EML. The format is
-      * [] => array ("header" => "value")
-      * @param array|null $headers The headers to examine
-      * @return array
-      */
+    /**
+     * Get all the headers, in the order in EML. The format is
+     * [] => array ("header" => "value")
+     * @param array|null $headers The headers to examine
+     * @return array
+     */
     public function getHeaders($headers = null)
     {
         $sectionMainID = $this->sectionMainID();
@@ -1393,19 +1441,20 @@ class Mail
             $sectionMainID === false ||
             ! key_exists("_headersArray", $this->sections[$sectionMainID])
         ) {
-            $headers = array();
+            $headers = [];
         } else {
             $headers = $this->sections[$sectionMainID]["_headersArray"];
         }
         return $headers;
     }
 
-    /** Get a generic header
-      * If there is multiple headers with the same name, return the first
-      * @param string $header The header to get
-      * @param array|null $headers Optional headers to examine
-      * @return string|bool the literal value or false if it doesn't exist
-      */
+    /**
+     * Get a generic header
+     * If there is multiple headers with the same name, return the first
+     * @param string $header The header to get
+     * @param array|null $headers Optional headers to examine
+     * @return string|bool the literal value or false if it doesn't exist
+     */
     public function getHeader($header, $headers = null)
     {
         $headers = $this->getHeaders($headers);
@@ -1419,12 +1468,13 @@ class Mail
         return false;
     }
 
-    /** Get a generic header with removing the carriage return
-      * If there is multiple headers with the same name, return the first
-      * @param string $header The header to get
-      * @param array $headers The _headersArray array
-      * @return string|bool the literal value or false if it doesn't exist
-      */
+    /**
+     * Get a generic header with removing the carriage return
+     * If there is multiple headers with the same name, return the first
+     * @param string $header The header to get
+     * @param array $headers The _headersArray array
+     * @return string|bool the literal value or false if it doesn't exist
+     */
     public function getHeaderValue($header, $headers = null)
     {
         $headers = $this->getHeaders($headers);
@@ -1442,8 +1492,9 @@ class Mail
         return false;
     }
 
-    /** Create the complete mail structure
-      */
+    /**
+     * Create the complete mail structure
+     */
     public function createMailEML()
     {
         $complete = "";
@@ -1463,9 +1514,10 @@ class Mail
         $this->completeEmailEML = $complete;
     }
 
-    /** Recursive email EML creation for childs
-      * @param array $parent The parent array
-      */
+    /**
+     * Recursive email EML creation for childs
+     * @param array $parent The parent array
+     */
     private function createMailEMLSub($parent)
     {
         $this->recurse++;
@@ -1499,9 +1551,10 @@ class Mail
         return $complete;
     }
 
-    /** Return the complete mail
-      * @return string The complete mail
-      */
+    /**
+     * Return the complete mail
+     * @return string The complete mail
+     */
     public function getMail()
     {
         if (trim($this->getBodyHTML()) === "No HTML provided by inline file added") {
@@ -1511,11 +1564,12 @@ class Mail
         return $this->completeEmailEML;
     }
 
-    /** Return an array with the details of the mail :
-      * the number of attachments, the from, to, subject in UTF-8, if there is
-      * a text and/or html body
-      * @return array The details of the mail
-      */
+    /**
+     * Return an array with the details of the mail :
+     * the number of attachments, the from, to, subject in UTF-8, if there is
+     * a text and/or html body
+     * @return array The details of the mail
+     */
     public function getDetails()
     {
         $bodyTextExists = false;
@@ -1538,8 +1592,8 @@ class Mail
         }
         unset($sectionID);
         unset($section);
-        $attachmentDetails = array();
-        $attachmentInlineDetails = array();
+        $attachmentDetails = [];
+        $attachmentInlineDetails = [];
         for ($i = 0; $i < $attachmentNb; $i++) {
             $attachmentDetails[$i] = $this->getAttachmentDetails($i);
         }
@@ -1566,9 +1620,10 @@ class Mail
         return get_defined_vars();
     }
 
-    /** Create a boundary
-      * @return string the textual boundary
-      */
+    /**
+     * Create a boundary
+     * @return string the textual boundary
+     */
     private function getBoundary()
     {
         $data = openssl_random_pseudo_bytes(16);
@@ -1580,9 +1635,10 @@ class Mail
         );
     }
 
-    /** Create a messageID
-      * @return string the textual MessageID
-      */
+    /**
+     * Create a messageID
+     * @return string the textual MessageID
+     */
     public function provideMessageID()
     {
         $data = openssl_random_pseudo_bytes(16);
@@ -1595,13 +1651,14 @@ class Mail
             php_uname('n') . ">";
     }
 
-    /** Convert the content to correct encoding.
-      * The allowed encodings are "quoted-printable" or "base64" or "flowed"
-      * Cut the long lines to 76 chars with the correct separator
-      * @param string $content The content to encode
-      * @param string $encoding The encoding to use
-      * @return string the content encoded by $encoding
-      */
+    /**
+     * Convert the content to correct encoding.
+     * The allowed encodings are "quoted-printable" or "base64" or "flowed"
+     * Cut the long lines to 76 chars with the correct separator
+     * @param string $content The content to encode
+     * @param string $encoding The encoding to use
+     * @return string the content encoded by $encoding
+     */
     private function encodingEncode($content, $encoding)
     {
         if ($encoding === "quoted-printable") {
@@ -1622,18 +1679,19 @@ class Mail
         ), 500);
     }
 
-    /** Decode the content with correct encoding.
-      * The allowed encodings are "quoted-printable" or "base64" or "8bit"
-      * @param string $content The content to decode
-      * @param string $encoding The encoding to use
-      * @return the content decoded by $encoding
-      */
+    /**
+     * Decode the content with correct encoding.
+     * The allowed encodings are "quoted-printable" or "base64" or "8bit"
+     * @param string $content The content to decode
+     * @param string $encoding The encoding to use
+     * @return the content decoded by $encoding
+     */
     private function encodingDecode($content, $encoding)
     {
         if ($encoding === "quoted-printable") {
             return quoted_printable_decode($content);
         } elseif ($encoding === "base64") {
-            return base64_decode($content);
+            return base64_decode($content, true);
         } elseif ($encoding === "8bit" || $encoding === "7bit" || $encoding === false) {
             return $content;
         }
@@ -1646,18 +1704,19 @@ class Mail
         ), 500);
     }
 
-    /** Encode a string to be compliant with MIME (used in headers)
-      * @param string $header The header to be used. Will not be returned, but the
-      *        length of the result will be adapted to it
-      * @param string $content The content to encode
-      * @param string $encoding The encoding to use.
-      * The allowed encodings are "quoted-printable" or "base64"
-      * @return string the content encoded by $encoding
-      */
+    /**
+     * Encode a string to be compliant with MIME (used in headers)
+     * @param string $header The header to be used. Will not be returned, but the
+     *        length of the result will be adapted to it
+     * @param string $content The content to encode
+     * @param string $encoding The encoding to use.
+     * The allowed encodings are "quoted-printable" or "base64"
+     * @return string the content encoded by $encoding
+     */
     private function encodeHeaders($header, $content, $encoding)
     {
-        $prefs = array("input-charset" => "utf-8",
-                    "output-charset" => "utf-8");
+        $prefs = ["input-charset" => "utf-8",
+                    "output-charset" => "utf-8"];
         if ($encoding === "quoted-printable") {
             $prefs["scheme"] = "Q";
         } elseif ($encoding === "base64") {
@@ -1674,11 +1733,12 @@ class Mail
         );
     }
 
-    /** Convert the header to text
-      * @param string $header The header to decode
-      * @param string $content The content of the header to decode
-      * @return string the header converted
-      */
+    /**
+     * Convert the header to text
+     * @param string $header The header to decode
+     * @param string $content The content of the header to decode
+     * @return string the header converted
+     */
     private function decodeHeaders($header, $content)
     {
         return substr(
@@ -1687,19 +1747,20 @@ class Mail
         );
     }
 
-    /** Encode a header string not starting on first column. The number of chars
-      * need to be skipped is passed as argument. The function will correctely
-      * managethe associated carriage returns
-      * @param string $content The content to encode
-      * @param string $encoding The The encoding to use.
-      * The allowed encodings are "quoted-printable" or "base64"
-      * @param integer $blanks Initial blanks to be added on string
-      * @return string the content encoded by $encoding
-      */
+    /**
+     * Encode a header string not starting on first column. The number of chars
+     * need to be skipped is passed as argument. The function will correctely
+     * managethe associated carriage returns
+     * @param string $content The content to encode
+     * @param string $encoding The The encoding to use.
+     * The allowed encodings are "quoted-printable" or "base64"
+     * @param integer $blanks Initial blanks to be added on string
+     * @return string the content encoded by $encoding
+     */
     private function encodeHeaderStringWithPosition($content, $encoding, $blanks)
     {
-        $prefs = array("input-charset" => "utf-8",
-                    "output-charset" => "utf-8");
+        $prefs = ["input-charset" => "utf-8",
+                    "output-charset" => "utf-8"];
         if ($encoding === "quoted-printable") {
             $prefs["scheme"] = "Q";
         } elseif ($encoding === "base64") {
@@ -1720,17 +1781,18 @@ class Mail
         );
     }
 
-    /** Convert a From/To string to array. Manage multiple recipients
-      * Ex. : toto toto <toto@toto.com>, titi <titi@titi.com>
-      *      array (array ("name"=>"toto toto", "mail"=>"toto@toto.com"),
-      *             array ("name"=>"titi", "mail"=>"titi@titi.com"))
-      * @param string $data The From/To field content
-      * @return array The array with the converted data
-      */
+    /**
+     * Convert a From/To string to array. Manage multiple recipients
+     * Ex. : toto toto <toto@toto.com>, titi <titi@titi.com>
+     *      array (array ("name"=>"toto toto", "mail"=>"toto@toto.com"),
+     *             array ("name"=>"titi", "mail"=>"titi@titi.com"))
+     * @param string $data The From/To field content
+     * @return array The array with the converted data
+     */
     public function convertPeopleToArray($data)
     {
         $elements = explode(",", $data);
-        $res = array();
+        $res = [];
         foreach ($elements as $element) {
             @list($name, $mail) = explode("<", $element);
             if ($mail === null) {
@@ -1740,21 +1802,22 @@ class Mail
                 $name = trim($name);
                 $mail = substr(trim($mail), 0, -1);
             }
-            $array = array("name" => $name, "mail" => $mail);
+            $array = ["name" => $name, "mail" => $mail];
             $res[] = $array;
         }
         return $res;
     }
 
-    /** Analyze the Content-Type line and return an array with the values
-      * @param string $contentType The content Type to analyze
-      * @return array The analyzed Content-Type
-      */
+    /**
+     * Analyze the Content-Type line and return an array with the values
+     * @param string $contentType The content Type to analyze
+     * @return array The analyzed Content-Type
+     */
     public function contentTypeAnalyze($contentType)
     {
         $contentType = preg_replace("#[\r\n]+[ \t]+#", " ", $contentType);
         $elements = explode(";", $contentType);
-        $res = array();
+        $res = [];
         foreach ($elements as $elem) {
             @list($key, $val) = explode("=", $elem, 2);
             if ($val === null) {
diff --git a/src/Markdown.php b/src/Markdown.php
index 234d602..6ec7299 100644
--- a/src/Markdown.php
+++ b/src/Markdown.php
@@ -1,35 +1,42 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Convert the Markdown text to html format
-  */
+/**
+ * Convert the Markdown text to html format
+ */
 class Markdown
 {
-    /** To debug the markdown analyzer, activate the option */
+    /**
+     * To debug the markdown analyzer, activate the option
+     */
     public $debug = false;
 
-    /** The list of the HTML elements used by block */
-    private $blockid = array("<h1>", "<h2>", "<h3>", "<h4>", "<h5>", "<h6>",
-                            "<hr/>");
+    /**
+     * The list of the HTML elements used by block
+     */
+    private $blockid = ["<h1>", "<h2>", "<h3>", "<h4>", "<h5>", "<h6>",
+                            "<hr/>"];
 
-    /** Convert the markdown text to html
-      * @param string $markdown The markdown to convert
-      */
+    /**
+     * Convert the markdown text to html
+     * @param string $markdown The markdown to convert
+     */
     public function html($markdown)
     {
         $markdown = rtrim($markdown);
         $markdown = htmlentities($markdown);
 
         // Here are the regexp on multilines
-        $search = array();
-        $replace = array();
+        $search = [];
+        $replace = [];
         // Titles with underline (SeText)
         // Titre1
         // ======
@@ -56,9 +63,10 @@ class Markdown
         return $html;
     }
 
-    /** Search and replace in the paragraph on one line
-      * @param string $line The line to analyze
-      */
+    /**
+     * Search and replace in the paragraph on one line
+     * @param string $line The line to analyze
+     */
     private function searchReplace($line)
     {
         if ($this->debug) {
@@ -68,7 +76,7 @@ class Markdown
         // Quotes : &quot;
         $res = $line;
         // Manage the <hr/> separators
-        $search = array("***", "---", "___", "* * *", "- - -", "_ _ _");
+        $search = ["***", "---", "___", "* * *", "- - -", "_ _ _"];
         foreach ($search as $key => $pattern) {
             $start = 0;
             while (1) {
@@ -92,8 +100,8 @@ class Markdown
         }
 
         // Manage the emphasis and code correctely with the backslash
-        $search = array();
-        $replace = array();
+        $search = [];
+        $replace = [];
         $search[] = "__";
         $replace[] = "<strong>\\1</strong>";
         $search[] = "_";
@@ -144,8 +152,8 @@ class Markdown
         }
 
         // Manage the others cases
-        $search = array();
-        $replace = array();
+        $search = [];
+        $replace = [];
         // Titles short
         // == TITRE1
         $search[] = '~^([^\\\\]|^)(==+ (.+)( ==+)?)$~Um';
@@ -214,16 +222,18 @@ class Markdown
         echo "$key => $s\n";
           $res =  preg_replace ($s, $replace[$key], $res);
         echo "$res\n";
-        }*/
+        }
+ */
         $res =  preg_replace($search, $replace, $res);
         return $res;
     }
 
-    /** Return HTML code corresponding to the code block
-      * @param array $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      */
+    /**
+     * Return HTML code corresponding to the code block
+     * @param array $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     */
     private function typeCode($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -250,11 +260,12 @@ class Markdown
         return "<pre><code>$content</code></pre>\n";
     }
 
-    /** Return HTML code corresponding to the OL block
-      * @param array $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      */
+    /**
+     * Return HTML code corresponding to the OL block
+     * @param array $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     */
     private function typeOL($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -267,11 +278,12 @@ class Markdown
         return $content;
     }
 
-    /** Return HTML code corresponding to the UL block
-      * @param array $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      */
+    /**
+     * Return HTML code corresponding to the UL block
+     * @param array $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     */
     private function typeUL($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -284,12 +296,13 @@ class Markdown
         return $content;
     }
 
-    /** Return the HTML code corresponding to the OL/UL block
-      * @param array  $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      * @param string $type The block type : "ul" or "ol"
-      */
+    /**
+     * Return the HTML code corresponding to the OL/UL block
+     * @param array  $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     * @param string $type The block type : "ul" or "ol"
+     */
     private function typeOLUL($text, $depth, &$pos, $type)
     {
         if ($this->debug) {
@@ -359,13 +372,14 @@ class Markdown
         return "<$type>\n$content" . str_repeat(" ", $depth) . "</$type>\n";
     }
 
-    /** Return HTML code corresponding to the NONE block
-      * The NONE type exists only on empty strings. Just skip the current and
-      * empty line, and return an empty string
-      * @param string $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of the current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      */
+    /**
+     * Return HTML code corresponding to the NONE block
+     * The NONE type exists only on empty strings. Just skip the current and
+     * empty line, and return an empty string
+     * @param string $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of the current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     */
     private function typeNONE($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -375,11 +389,12 @@ class Markdown
         return "";
     }
 
-    /** Return HTML code corresponding to the P block
-      * @param array $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      */
+    /**
+     * Return HTML code corresponding to the P block
+     * @param array $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     */
     private function typeP($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -412,12 +427,13 @@ class Markdown
         return "<p>$content</p>\n";
     }
 
-    /** Detect the type of the text and call the appropriate function *
-      * @param array $text The Markdown text to translate split by \n
-      * @param integer $depth The depth of current bloc (in number of space)
-      * @param integer &$pos The start line number of the bloc
-      * @return the HTML code
-      */
+    /**
+     * Detect the type of the text and call the appropriate function *
+     * @param array $text The Markdown text to translate split by \n
+     * @param integer $depth The depth of current bloc (in number of space)
+     * @param integer &$pos The start line number of the bloc
+     * @return the HTML code
+     */
     private function detectBlock($text, $depth, &$pos)
     {
         if ($this->debug) {
@@ -463,10 +479,11 @@ class Markdown
         return $content;
     }
 
-    /** Return the Type of object in the provided line
-      * p, ul, ol, code
-      * @param string $line The line to get the type
-      */
+    /**
+     * Return the Type of object in the provided line
+     * p, ul, ol, code
+     * @param string $line The line to get the type
+     */
     private function lineType($line)
     {
         if (! isset($line[0])) {
@@ -484,10 +501,11 @@ class Markdown
         return "p";
     }
 
-    /** Return the depth of the provided line
-      * @param string $line Line to analyze
-      * @return the depth of the line
-      */
+    /**
+     * Return the depth of the provided line
+     * @param string $line Line to analyze
+     * @return the depth of the line
+     */
     private function depth($line)
     {
         return strspn($line, " ");
diff --git a/src/Module.php b/src/Module.php
index 451355c..61d7fe7 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -1,32 +1,36 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Module management
-  */
+/**
+ * Module management
+ */
 class Module
 {
-    /** The modules are not allowed if $toplevel=0
-      * The modules can be in a module directory if $toplevel=1
-      * The modules can be in the parent directory if $toplevel=2
-      * The modules can be in the local directory if $toplevel=4
-      * The values can be added to allow multiple possibilities
-      */
+    /**
+     * The modules are not allowed if $toplevel=0
+     * The modules can be in a module directory if $toplevel=1
+     * The modules can be in the parent directory if $toplevel=2
+     * The modules can be in the local directory if $toplevel=4
+     * The values can be added to allow multiple possibilities
+     */
     public $toplevel = 0;
 
-    /** List all the available (enable or disable) modules
-      * @return array The list of the available modules names with the path
-      */
+    /**
+     * List all the available (enable or disable) modules
+     * @return array The list of the available modules names with the path
+     */
     public function listAvailable()
     {
-        $list = array();
-        $tmp = array();
+        $list = [];
+        $tmp = [];
         if ($this->toplevel % 2 >= 1) {
             $tmp = array_merge($tmp, glob("modules/*"));
         }
@@ -80,16 +84,17 @@ class Module
         return $list;
     }
 
-    /** List all the enable modules coming from the configuration and available
-      * in the system
-      * @param array $confModules the list of the available modules coming from
-      * the configuration. Can have some non available modules.
-      * @return array the list of the available modules names with the path
-      */
+    /**
+     * List all the enable modules coming from the configuration and available
+     * in the system
+     * @param array $confModules the list of the available modules coming from
+     * the configuration. Can have some non available modules.
+     * @return array the list of the available modules names with the path
+     */
     public function listEnable($confModules)
     {
         $listAvailable = $this->listAvailable();
-        $list = array();
+        $list = [];
         foreach ($confModules as $module) {
             if (array_key_exists($module, $listAvailable)) {
                 $list[$module] = $listAvailable[$module];
@@ -99,12 +104,13 @@ class Module
         return $list;
     }
 
-    /** Return the name of the module translated in the provided language
-      * The module name must be defined in the translation under the "modulename"
-      * item
-      * @param string $modulepath The module path
-      * @param string $lang The lang to use
-      */
+    /**
+     * Return the name of the module translated in the provided language
+     * The module name must be defined in the translation under the "modulename"
+     * item
+     * @param string $modulepath The module path
+     * @param string $lang The lang to use
+     */
     public function translateName($modulepath, $lang)
     {
         // TODO : Do really the function ! With the language selection, and
diff --git a/src/Output.php b/src/Output.php
index 1079f46..da85eca 100644
--- a/src/Output.php
+++ b/src/Output.php
@@ -1,19 +1,23 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Class used to display data
-  */
+/**
+ * Class used to display data
+ */
 class Output
 {
-    /** Class used to display data
-        @param mixed $data The data to be displayed */
+    /**
+     * Class used to display data
+     * @param mixed $data The data to be displayed
+     */
     public function out($data)
     {
         throw new \Exception("No type of output selected");
diff --git a/src/Outputcsv.php b/src/Outputcsv.php
index 924cc3c..30da495 100644
--- a/src/Outputcsv.php
+++ b/src/Outputcsv.php
@@ -1,18 +1,22 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in CSV the data provided
-  */
+/**
+ * Display in CSV the data provided
+ */
 class Outputcsv extends Output
 {
-    /** Don't allow to output in CSV if the functions are not available in PHP */
+    /**
+     * Don't allow to output in CSV if the functions are not available in PHP
+     */
     public function __construct()
     {
         if (!function_exists("fputcsv")) {
@@ -20,12 +24,14 @@ class Outputcsv extends Output
         }
     }
 
-    /** Display in CSV the data provided
-        @param mixed $data The data to be displayed */
+    /**
+     * Display in CSV the data provided
+     * @param mixed $data The data to be displayed
+     */
     public function out($data)
     {
         if (!is_array($data)) {
-            $data = array($data);
+            $data = [$data];
         }
         @header("Cache-Control: no-store, no-cache, must-revalidate");
         @header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
@@ -36,7 +42,7 @@ class Outputcsv extends Output
         // TODO : return $csv
         $out = fopen('php://output', 'w');
         if (! is_array($data[0])) {
-            $data = array($data);
+            $data = [$data];
         }
         foreach ($data as $vals) {
             fputcsv($out, $vals);
diff --git a/src/Outputdl.php b/src/Outputdl.php
index 7fe9282..0ef6a06 100644
--- a/src/Outputdl.php
+++ b/src/Outputdl.php
@@ -1,39 +1,46 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow a program to download a specific file from the filesystem,
-  * without using too much memory. In also allow to manage the resuming of a
-  * paused transfert by getting the range of download.
-  */
+/**
+ * This class allow a program to download a specific file from the filesystem,
+ * without using too much memory. In also allow to manage the resuming of a
+ * paused transfert by getting the range of download.
+ */
 class Outputdl
 {
-    /** Allow or deny the resuming of the HTTP transferts
-      */
+    /**
+     * Allow or deny the resuming of the HTTP transferts
+     */
     private $resumeAllow = true;
 
-    /** The base dir used as root
-      */
+    /**
+     * The base dir used as root
+     */
     private $base = "/";
 
-    /** Store the headers to allow the unit tests to get them
-      */
-    private $headers = array();
+    /**
+     * Store the headers to allow the unit tests to get them
+     */
+    private $headers = [];
 
-    /** Headers sent
-      */
+    /**
+     * Headers sent
+     */
     private $headersSent = false;
 
-    /** Get/Set Allow/Deny the resuming of transferts
-      * @param boolean|null $resumeAllow True : resume OK, false : resume forbid
-      * @return $this|boolean
-      */
+    /**
+     * Get/Set Allow/Deny the resuming of transferts
+     * @param boolean|null $resumeAllow True : resume OK, false : resume forbid
+     * @return $this|boolean
+     */
     public function resumeAllow($resumeAllow = null)
     {
         if ($resumeAllow === null) {
@@ -43,14 +50,15 @@ class Outputdl
         return $this;
     }
 
-    /** Get/Set Base of filesystem
-      * The base directory is use to secure the download. A user can not request
-      * a file outside the base. Example : if the base is /var/lib/files, the
-      * user can not request /etc/passwd file (out of scope). If not defined,
-      * all the filesystem is allowed
-      * @param string|null $base The filesystem base
-      * @return $this|string
-      */
+    /**
+     * Get/Set Base of filesystem
+     * The base directory is use to secure the download. A user can not request
+     * a file outside the base. Example : if the base is /var/lib/files, the
+     * user can not request /etc/passwd file (out of scope). If not defined,
+     * all the filesystem is allowed
+     * @param string|null $base The filesystem base
+     * @return $this|string
+     */
     public function base($base = null)
     {
         if ($base === null) {
@@ -60,19 +68,21 @@ class Outputdl
         return $this;
     }
 
-    /** Get headers from headers list
-      * The headers can be tested too
-      * @return array
-      */
+    /**
+     * Get headers from headers list
+     * The headers can be tested too
+     * @return array
+     */
     public function headers()
     {
         return $this->headers;
     }
 
-    /** Add a new header and send it if possible
-      * @param string $header The header to send
-      * @return $this
-      */
+    /**
+     * Add a new header and send it if possible
+     * @param string $header The header to send
+     * @return $this
+     */
     private function header($header)
     {
         if (! headers_sent()) {
@@ -82,12 +92,13 @@ class Outputdl
         return $this;
     }
 
-    /** Download a file with management of Partial Download (like resume)
-      * Manage the HTTP headers to allow to resume the download if it is allowed
-      * Do not go throw the renderer, exit at end of transfert
-      * @param string $path The path to download
-      * @param string|null $filename The filename to send to the browser
-      */
+    /**
+     * Download a file with management of Partial Download (like resume)
+     * Manage the HTTP headers to allow to resume the download if it is allowed
+     * Do not go throw the renderer, exit at end of transfert
+     * @param string $path The path to download
+     * @param string|null $filename The filename to send to the browser
+     */
     public function downloadFile($path, $filename = null)
     {
         if (!file_exists($path)) {
@@ -209,11 +220,12 @@ class Outputdl
         return;
     }
 
-    /** Download the file. Do not go through the renderer
-      * @param string $path The path to download
-      * @param integer $start The start range
-      * @param integer $stop The stop range
-      */
+    /**
+     * Download the file. Do not go through the renderer
+     * @param string $path The path to download
+     * @param integer $start The start range
+     * @param integer $stop The stop range
+     */
     private function downloadFileRange($path, $start, $stop)
     {
         $file = realpath($path);
diff --git a/src/Outputhtml.php b/src/Outputhtml.php
index f060983..8fd28cf 100644
--- a/src/Outputhtml.php
+++ b/src/Outputhtml.php
@@ -1,40 +1,43 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in HTML the data provided, with the layout support
-  */
+/**
+ * Display in HTML the data provided, with the layout support
+ */
 class Outputhtml extends Output
 {
-    /** Data is printed by viewClass->viewmethod, in the middle of $layout
-      * title is put in the title of the HTML page
-      * $replacement modify the result (it can do title too :
-      * array ("{title}"=>"title to display")
-      * @param mixed $data Data to display on the page
-      * @param string|null $title Title to put on head of page
-      * @param string|null $viewClass Class in views to use to display
-      * @param string|null $viewMethod Method in the class in views
-      * @param string|null $layout Layout file in views
-      * @param array|null $replacement Replace the {key}=>value
-      * @param array|null $variable PHP variables send to the view and to layout
-      *                   (can be processed by foreach, if...)
-      * @param string|null $module The module name to use if needed
-      * @return mixed Exit from PHP at the end of HTML display
-      */
+    /**
+     * Data is printed by viewClass->viewmethod, in the middle of $layout
+     * title is put in the title of the HTML page
+     * $replacement modify the result (it can do title too :
+     * array ("{title}"=>"title to display")
+     * @param mixed $data Data to display on the page
+     * @param string|null $title Title to put on head of page
+     * @param string|null $viewClass Class in views to use to display
+     * @param string|null $viewMethod Method in the class in views
+     * @param string|null $layout Layout file in views
+     * @param array|null $replacement Replace the {key}=>value
+     * @param array|null $variable PHP variables send to the view and to layout
+     *                   (can be processed by foreach, if...)
+     * @param string|null $module The module name to use if needed
+     * @return mixed Exit from PHP at the end of HTML display
+     */
     public function out(
         $data,
         $title = false,
         $viewClass = false,
         $viewMethod = false,
         $layout = false,
-        $replacement = array(),
-        $variable = array(),
+        $replacement = [],
+        $variable = [],
         $module = ""
     ) {
         @header("Cache-Control: no-store, no-cache, must-revalidate");
@@ -154,9 +157,10 @@ EOT;
               }
               echo "</pre>";
               exit;
-            }*/
+            }
+ */
         foreach (
-            array("script" => "src", "link" => "href", "img" => "src") as $key => $val
+            ["script" => "src", "link" => "href", "img" => "src"] as $key => $val
         ) {
             $files = $dom->getElementsByTagName($key);
             foreach ($files as $id => $file) {
@@ -199,11 +203,13 @@ EOT;
         }
     }
 
-    /** Get the layout and provide it the variables. The variables will be push in
-      * global to the layout (they can be used like $XX)
-      * @param string $layout the layout file to load
-      * @param array $variables The variables array to push to the layout
-      * @return string the Layout with variables interpreted */
+    /**
+     * Get the layout and provide it the variables. The variables will be push in
+     * global to the layout (they can be used like $XX)
+     * @param string $layout the layout file to load
+     * @param array $variables The variables array to push to the layout
+     * @return string the Layout with variables interpreted
+     */
     private function layoutVariables($layout, $variables)
     {
         // The layout can be a external layout file or the HTML page itself.
diff --git a/src/Outputjson.php b/src/Outputjson.php
index 78aa433..356532a 100644
--- a/src/Outputjson.php
+++ b/src/Outputjson.php
@@ -1,19 +1,23 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in JSON the data provided
-  * The data must NOT be binary !
-  */
+/**
+ * Display in JSON the data provided
+ * The data must NOT be binary !
+ */
 class Outputjson extends Output
 {
-    /** Don't allow to output in JSON if the functions are not available in PHP */
+    /**
+     * Don't allow to output in JSON if the functions are not available in PHP
+     */
     public function __construct()
     {
         if (!function_exists("json_encode")) {
@@ -22,8 +26,10 @@ class Outputjson extends Output
         }
     }
 
-    /** Display in JSOn the data provided
-        @param mixed $data The data to be displayed */
+    /**
+     * Display in JSOn the data provided
+     * @param mixed $data The data to be displayed
+     */
     public function out($data)
     {
         @header("Cache-Control: no-store, no-cache, must-revalidate");
diff --git a/src/Outputrest.php b/src/Outputrest.php
index f53836d..6ea8107 100644
--- a/src/Outputrest.php
+++ b/src/Outputrest.php
@@ -1,41 +1,44 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in REST the data provided.
-  * Allow all the output types : JSON, XML, TXT...
-  */
+/**
+ * Display in REST the data provided.
+ * Allow all the output types : JSON, XML, TXT...
+ */
 class Outputrest extends Output
 {
-    /** Data is printed by viewClass->viewmethod, in the middle of $layout
-      * title is put in the title of the HTML page
-      * $replacement modify the result (it can do title too :
-      * array ("{title}"=>"title to display")
-      * @param mixed $data Data to display on the page
-      * @param string|null $title Title to put on head of page
-      * @param string|null $viewClass Class in views to use to display
-      * @param string|null $viewMethod Method in the class in views
-      * @param string|null $layout Layout file in views
-      * @param array|null $replacement Replace the {key}=>value
-      * @param array|null $variable PHP variables send to the view and to layout
-      *                   (can be processed by foreach, if...)
-      * @param string|null $module The module name to use if needed
-      * @return mixed Exit from PHP at the end of HTML display
-      */
+    /**
+     * Data is printed by viewClass->viewmethod, in the middle of $layout
+     * title is put in the title of the HTML page
+     * $replacement modify the result (it can do title too :
+     * array ("{title}"=>"title to display")
+     * @param mixed $data Data to display on the page
+     * @param string|null $title Title to put on head of page
+     * @param string|null $viewClass Class in views to use to display
+     * @param string|null $viewMethod Method in the class in views
+     * @param string|null $layout Layout file in views
+     * @param array|null $replacement Replace the {key}=>value
+     * @param array|null $variable PHP variables send to the view and to layout
+     *                   (can be processed by foreach, if...)
+     * @param string|null $module The module name to use if needed
+     * @return mixed Exit from PHP at the end of HTML display
+     */
     public function out(
         $data,
         $title = false,
         $viewClass = false,
         $viewMethod = false,
         $layout = false,
-        $replacement = array(),
-        $variable = array(),
+        $replacement = [],
+        $variable = [],
         $module = ""
     ) {
         $code = http_response_code();
diff --git a/src/Outputtxt.php b/src/Outputtxt.php
index 70a5ea5..ddc2fc9 100644
--- a/src/Outputtxt.php
+++ b/src/Outputtxt.php
@@ -1,22 +1,28 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in Text the data provided
-  */
+/**
+ * Display in Text the data provided
+ */
 class Outputtxt extends Output
 {
-    /** Display an array on table format (TRUE) or tree format (FALSE) */
+    /**
+     * Display an array on table format (TRUE) or tree format (FALSE)
+     */
     public $table = true;
 
-    /** Display in Text the data provided
-        @param mixed $data The data to be displayed */
+    /**
+     * Display in Text the data provided
+     * @param mixed $data The data to be displayed
+     */
     public function out($data)
     {
         @header("Cache-Control: no-store, no-cache, must-revalidate");
@@ -37,7 +43,7 @@ class Outputtxt extends Output
             if ($this->table === true) {
                 // TABLE FORMAT
                 // Look at sizes of each field
-                $sizes = array();
+                $sizes = [];
                 foreach ($data as $line) {
                     if (! is_array($line)) {
                         // 1 dimension array : force in tree format
diff --git a/src/Outputxml.php b/src/Outputxml.php
index 0ed9c6c..b037827 100644
--- a/src/Outputxml.php
+++ b/src/Outputxml.php
@@ -1,19 +1,23 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display in XML the data provided
-  */
+/**
+ * Display in XML the data provided
+ */
 class Outputxml extends Output
 {
-    /** Display in XML the data provided
-        @param mixed $data The data to be displayed */
+    /**
+     * Display in XML the data provided
+     * @param mixed $data The data to be displayed
+     */
     public function out($data)
     {
         @header("Cache-Control: no-store, no-cache, must-revalidate");
@@ -30,7 +34,7 @@ class Outputxml extends Output
             $xml = new \SimpleXMLElement("<?xml version=\"1.0\"?><root></root>");
             // function call to convert array to xml
             if (!is_array($data)) {
-                $data = array($data);
+                $data = [$data];
             }
             $this->array_to_xml($data, $xml);
             //saving generated xml file
@@ -41,9 +45,11 @@ class Outputxml extends Output
         }
     }
 
-    /** function defination to convert array to xml
-        @param mixed $data The data to be converted
-        @param string &$xml The actual state of the XML file */
+    /**
+     * function defination to convert array to xml
+     * @param mixed $data The data to be converted
+     * @param string &$xml The actual state of the XML file
+     */
     private function array_to_xml($data, &$xml)
     {
         foreach ($data as $key => $value) {
diff --git a/src/Password.php b/src/Password.php
index 46d562f..f36b065 100644
--- a/src/Password.php
+++ b/src/Password.php
@@ -1,58 +1,62 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** A class to manage the password hashing, password generation
-  */
+/**
+ * A class to manage the password hashing, password generation
+ */
 class Password
 {
     ////////////////////
     //   PROPERTIES   //
     ////////////////////
-    /** List all the allowed hashing methods, sort from weak to strong encryption
-      */
-    private $methods = array(
-    "MYSQL" => array(
-      "hash" => "", "size" => "", "pre" => "", "post" => ""),
-    "CRYPT_STD_DES" => array(
-      "hash" => CRYPT_STD_DES, "size" => 2, "pre" => "", "post" => "" ),
-    "CRYPT_EXT_DES" => array(
-      "hash" => CRYPT_EXT_DES, "size" => 9, "pre" => "", "post" => "" ),
-    "CRYPT_MD5" => array(
-      "hash" => CRYPT_MD5, "size" => 12, "pre" => "$1$", "post" => "$" ),
-    "CRYPT_BLOWFISH" => array(
+    /**
+     * List all the allowed hashing methods, sort from weak to strong encryption
+     */
+    private $methods = [
+    "MYSQL" => [
+      "hash" => "", "size" => "", "pre" => "", "post" => ""],
+    "CRYPT_STD_DES" => [
+      "hash" => CRYPT_STD_DES, "size" => 2, "pre" => "", "post" => "" ],
+    "CRYPT_EXT_DES" => [
+      "hash" => CRYPT_EXT_DES, "size" => 9, "pre" => "", "post" => "" ],
+    "CRYPT_MD5" => [
+      "hash" => CRYPT_MD5, "size" => 12, "pre" => "$1$", "post" => "$" ],
+    "CRYPT_BLOWFISH" => [
       "hash" => CRYPT_BLOWFISH, "size" => 16, "pre" => "$2y$11$",
-      "post" => "$" ),
-    "CRYPT_SHA256" => array(
+      "post" => "$" ],
+    "CRYPT_SHA256" => [
       "hash" => CRYPT_SHA256, "size" => 16, "pre" => "$5\$rounds=5000$",
-      "post" => "$" ),
-    "CRYPT_SHA512" => array(
+      "post" => "$" ],
+    "CRYPT_SHA512" => [
       "hash" => CRYPT_SHA512, "size" => 16, "pre" => "$6\$rounds=5000$",
-      "post" => "$" ),
-    "PASSWORD_BCRYPT" => array(
-      "hash" => PASSWORD_BCRYPT, "size" => "", "pre" => "", "post" => ""),
-    "PASSWORD_ARGON2I" => array(
-      "hash" => PASSWORD_ARGON2I, "size" => "", "pre" => "", "post" => ""),
-    "PASSWORD_ARGON2ID" => array(
-      "hash" => PASSWORD_ARGON2ID, "size" => "", "pre" => "", "post" => ""),
-    );
+      "post" => "$" ],
+    "PASSWORD_BCRYPT" => [
+      "hash" => PASSWORD_BCRYPT, "size" => "", "pre" => "", "post" => ""],
+    "PASSWORD_ARGON2I" => [
+      "hash" => PASSWORD_ARGON2I, "size" => "", "pre" => "", "post" => ""],
+    "PASSWORD_ARGON2ID" => [
+      "hash" => PASSWORD_ARGON2ID, "size" => "", "pre" => "", "post" => ""],
+    ];
 
     /////////////////
     //   METHODS   //
     /////////////////
-    /** List all the allowed password encrytion methods, sorted from weak to
-      * strong encryption
-      * @return array ("PASSWORD_ARGON2ID" => PASSWORD_ARGON2ID);
-      */
+    /**
+     * List all the allowed password encrytion methods, sorted from weak to
+     * strong encryption
+     * @return array ("PASSWORD_ARGON2ID" => PASSWORD_ARGON2ID);
+     */
     public function listMethods()
     {
-        $res = array();
+        $res = [];
         foreach ($this->methods as $key => $params) {
             if ($key !== "MYSQL" && (! defined($key) || $params["hash"] === 0)) {
                 continue;
@@ -68,9 +72,10 @@ class Password
         return $res;
     }
 
-    /** Create a salt, based on openssl_random_pseudo_bytes function
-      * @return string a string salt
-      */
+    /**
+     * Create a salt, based on openssl_random_pseudo_bytes function
+     * @return string a string salt
+     */
     public function salt()
     {
         if (function_exists("openssl_random_pseudo_bytes")) {
@@ -87,12 +92,13 @@ class Password
         return $salt;
     }
 
-    /** Crypt the provided password with the wanted crypt method
-      * @param string $password The password to crypt
-      * @param string|null $method The method to use. If null, use the strongest
-      * one available
-      * @return string The hashed password
-      */
+    /**
+     * Crypt the provided password with the wanted crypt method
+     * @param string $password The password to crypt
+     * @param string|null $method The method to use. If null, use the strongest
+     * one available
+     * @return string The hashed password
+     */
     public function cryptPassword($password, $method = null)
     {
         if (! is_string($password) && ! is_integer($password)) {
@@ -132,21 +138,23 @@ class Password
         ), $method), 500);
     }
 
-    /** Crypt the password with the best algorithm available
-      * @param string $password The password to crypt
-      * @return string The hashed password
-      */
+    /**
+     * Crypt the password with the best algorithm available
+     * @param string $password The password to crypt
+     * @return string The hashed password
+     */
     public static function cryptPasswd($password)
     {
         $passwd = new Password();
         return $passwd->cryptPassword($password);
     }
 
-    /** Check if the clear password is valid against the hashed one
-      * @param string $clear The clear password
-      * @param string $hashed The hashed password
-      * @return boolean true if the password correspond to the hash
-      */
+    /**
+     * Check if the clear password is valid against the hashed one
+     * @param string $clear The clear password
+     * @param string $hashed The hashed password
+     * @return boolean true if the password correspond to the hash
+     */
     public static function checkPassword($clear, $hashed)
     {
         if (! is_string($clear)) {
@@ -172,12 +180,13 @@ class Password
         return false;
     }
 
-    /** Create a random password with $nbChars chars, ASCII chars (with special
-      * chars).
-      * A maximum of 20% for special chars in the size
-      * @param integer|null $nbChars The number of chars (12 by default)
-      * @return string The random password
-      */
+    /**
+     * Create a random password with $nbChars chars, ASCII chars (with special
+     * chars).
+     * A maximum of 20% for special chars in the size
+     * @param integer|null $nbChars The number of chars (12 by default)
+     * @return string The random password
+     */
     public static function generateASCII($nbChars = 12)
     {
         if (! is_int($nbChars) || $nbChars < 1) {
@@ -193,7 +202,7 @@ class Password
                 "Password : generateASCII : Can't generate more than 72 chars"
             ));
         }
-        $password = array();
+        $password = [];
         $chars = array_merge(range(97, 122), range(65, 90), range(48, 57));
         $special = range(33, 47);
         $rand1 = array_rand($chars, floor($nbChars * 0.80));
@@ -208,11 +217,12 @@ class Password
         return implode($password);
     }
 
-    /** Create a random password with $nbChars chars, Alphanumericals chars
-      * (without special chars)
-      * @param integer|null $nbChars The number of chars (12 by default)
-      * @return string The random password
-      */
+    /**
+     * Create a random password with $nbChars chars, Alphanumericals chars
+     * (without special chars)
+     * @param integer|null $nbChars The number of chars (12 by default)
+     * @return string The random password
+     */
     public static function generateAlphanum($nbChars = 12)
     {
         if (! is_int($nbChars) || $nbChars < 1) {
@@ -228,7 +238,7 @@ class Password
                 "Password : generateASCII : Can't generate more than 72 chars"
             ));
         }
-        $password = array();
+        $password = [];
         $chars = array_merge(range(97, 122), range(65, 90), range(48, 57));
         $rand1 = array_rand($chars, $nbChars);
         foreach ($rand1 as $chr) {
@@ -238,11 +248,12 @@ class Password
         return implode($password);
     }
 
-    /** Create a random password with $nbChars chars, Alphabeticals chars
-      * (without special chars, neither numbers)
-      * @param integer|null $nbChars The number of chars (12 by default)
-      * @return string The random password
-      */
+    /**
+     * Create a random password with $nbChars chars, Alphabeticals chars
+     * (without special chars, neither numbers)
+     * @param integer|null $nbChars The number of chars (12 by default)
+     * @return string The random password
+     */
     public static function generateAlphabetical($nbChars = 12)
     {
         if (! is_int($nbChars) || $nbChars < 1) {
@@ -258,7 +269,7 @@ class Password
                 "Password : generateASCII : Can't generate more than 72 chars"
             ));
         }
-        $password = array();
+        $password = [];
         $chars = array_merge(range(97, 122), range(65, 90));
         $rand1 = array_rand($chars, $nbChars);
         foreach ($rand1 as $chr) {
diff --git a/src/Queue.php b/src/Queue.php
index 9b4e523..3d45ba0 100644
--- a/src/Queue.php
+++ b/src/Queue.php
@@ -1,92 +1,103 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage a queue in multiple storages
-  * A process can add entries to the end of a queue
-  * A process can get all the entries in a queue
-  * A process can clear all the entries in a queue
-  * A process can get the first entry in the queue (FIFO), with optional
-  * removing of the entry
-  * A process can get the last entry in the queue (LIFO), with optional
-  * removing of the entry
-  * A process can get X entries starting at position Y
-  */
+/**
+ * Manage a queue in multiple storages
+ * A process can add entries to the end of a queue
+ * A process can get all the entries in a queue
+ * A process can clear all the entries in a queue
+ * A process can get the first entry in the queue (FIFO), with optional
+ * removing of the entry
+ * A process can get the last entry in the queue (LIFO), with optional
+ * removing of the entry
+ * A process can get X entries starting at position Y
+ */
 class Queue
 {
-    /** The queue connected object
-      */
+    /**
+     * The queue connected object
+     */
     private $queue = null;
 
-    /** Connect to the queue
-      * @param string $dsn The DSN to connect to queue
-      * @return $this;
-      */
+    /**
+     * Connect to the queue
+     * @param string $dsn The DSN to connect to queue
+     * @return $this;
+     */
     public function connect($dsn)
     {
         return $this;
     }
 
-    /** Add a new entry to the end of the queue
-      * @param mixed $entry The entry to add
-      * @return $this;
-      */
+    /**
+     * Add a new entry to the end of the queue
+     * @param mixed $entry The entry to add
+     * @return $this;
+     */
     public function add($entry)
     {
         return $this;
     }
 
-    /** Get all the entries of the queue
-      * @return array
-      */
+    /**
+     * Get all the entries of the queue
+     * @return array
+     */
     public function getAll()
     {
     }
 
-    /** Get the number of entries in the queue
-      */
+    /**
+     * Get the number of entries in the queue
+     */
     public function count()
     {
     }
 
-    /** Clear all the entries of the queue
-      * @return $this;
-      */
+    /**
+     * Clear all the entries of the queue
+     * @return $this;
+     */
     public function clear()
     {
         return $this;
     }
 
-    /** Get the first entry in the queue with optional removing of the entry
-      * @param boolean|null $delete If true, delete the read entry
-      * @return mixed Return null if there is no entry, or the first entry in the
-      * queue (FIFO)
-      */
+    /**
+     * Get the first entry in the queue with optional removing of the entry
+     * @param boolean|null $delete If true, delete the read entry
+     * @return mixed Return null if there is no entry, or the first entry in the
+     * queue (FIFO)
+     */
     public function getFirst($delete = false)
     {
     }
 
-    /** Get the last entry in the queue with optional removing of the entry
-      * @param boolean|null $delete If true, delete the read entry
-      * @return mixed Return null if there is no entry, or the last entry in the
-      * queue (LIFO)
-      */
+    /**
+     * Get the last entry in the queue with optional removing of the entry
+     * @param boolean|null $delete If true, delete the read entry
+     * @return mixed Return null if there is no entry, or the last entry in the
+     * queue (LIFO)
+     */
     public function getLast($delete = false)
     {
     }
 
-    /** Get X entries starting at position Y
-      * @param integer $start the starting position
-      * @param integer $number The number of entries to get
-      * @param boolean|null $delete If true, delete the read entries
-      * @return array An array of mixed entries
-      */
+    /**
+     * Get X entries starting at position Y
+     * @param integer $start the starting position
+     * @param integer $number The number of entries to get
+     * @param boolean|null $delete If true, delete the read entries
+     * @return array An array of mixed entries
+     */
     public function getRange($start, $number, $delete = false)
     {
     }
diff --git a/src/Queuefile.php b/src/Queuefile.php
index 1d1c8d5..bf2bb41 100644
--- a/src/Queuefile.php
+++ b/src/Queuefile.php
@@ -1,33 +1,37 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Manage a queue in file
-  * A process can add entries to the end of a queue
-  * A process can get all the entries in a queue
-  * A process can clear all the entries in a queue
-  * A process can get the first entry in the queue (FIFO), with optional
-  * removing of the entry
-  * A process can get the last entry in the queue (LIFO), with optional
-  * removing of the entry
-  * A process can get X entries starting at position Y
-  */
+/**
+ * Manage a queue in file
+ * A process can add entries to the end of a queue
+ * A process can get all the entries in a queue
+ * A process can clear all the entries in a queue
+ * A process can get the first entry in the queue (FIFO), with optional
+ * removing of the entry
+ * A process can get the last entry in the queue (LIFO), with optional
+ * removing of the entry
+ * A process can get X entries starting at position Y
+ */
 class Queuefile extends Queue
 {
-    /** The queue connected object
-      */
+    /**
+     * The queue connected object
+     */
     private $queue = null;
 
-    /** Connect to the queue. Create it if not exists
-      * @param string $dsn The DSN to connect to queue
-      * @return $this;
-      */
+    /**
+     * Connect to the queue. Create it if not exists
+     * @param string $dsn The DSN to connect to queue
+     * @return $this;
+     */
     public function connect($dsn)
     {
         // The DSN format must be file:///tmp/queuefile.txt
@@ -46,10 +50,11 @@ class Queuefile extends Queue
         return $this;
     }
 
-    /** Add a new entry to the end of the queue
-      * @param mixed $entry The entry to add
-      * @return $this;
-      */
+    /**
+     * Add a new entry to the end of the queue
+     * @param mixed $entry The entry to add
+     * @return $this;
+     */
     public function add($entry)
     {
         $file = new File();
@@ -63,10 +68,11 @@ class Queuefile extends Queue
         return $this;
     }
 
-    /** Get all the entries of the queue
-      * @param boolean|null $delete If true, delete the read entry
-      * @return array
-      */
+    /**
+     * Get all the entries of the queue
+     * @param boolean|null $delete If true, delete the read entry
+     * @return array
+     */
     public function getAll($delete = false)
     {
         $file = new File();
@@ -89,8 +95,9 @@ class Queuefile extends Queue
         return $entries;
     }
 
-    /** Get the number of entries in the queue
-      */
+    /**
+     * Get the number of entries in the queue
+     */
     public function count()
     {
         $file = new File();
@@ -101,9 +108,10 @@ class Queuefile extends Queue
         return $count;
     }
 
-    /** Clear all the entries of the queue
-      * @return $this;
-      */
+    /**
+     * Clear all the entries of the queue
+     * @return $this;
+     */
     public function clear()
     {
         $file = new File();
@@ -113,11 +121,12 @@ class Queuefile extends Queue
         return $this;
     }
 
-    /** Get the first entry in the queue with optional removing of the entry
-      * @param boolean|null $delete If true, delete the read entry
-      * @return mixed Return null if there is no entry, or the first entry in the
-      * queue (FIFO)
-      */
+    /**
+     * Get the first entry in the queue with optional removing of the entry
+     * @param boolean|null $delete If true, delete the read entry
+     * @return mixed Return null if there is no entry, or the first entry in the
+     * queue (FIFO)
+     */
     public function getFirst($delete = false)
     {
         $file = new File();
@@ -146,11 +155,12 @@ class Queuefile extends Queue
         return $res;
     }
 
-    /** Get the last entry in the queue with optional removing of the entry
-      * @param boolean|null $delete If true, delete the read entry
-      * @return mixed Return null if there is no entry, or the last entry in the
-      * queue (LIFO)
-      */
+    /**
+     * Get the last entry in the queue with optional removing of the entry
+     * @param boolean|null $delete If true, delete the read entry
+     * @return mixed Return null if there is no entry, or the last entry in the
+     * queue (LIFO)
+     */
     public function getLast($delete = false)
     {
         $file = new File();
@@ -179,13 +189,14 @@ class Queuefile extends Queue
         return $res;
     }
 
-    /** Get X entries starting at position Y
-      * @param integer $start the starting position (the entries start at position
-      * zero)
-      * @param integer $number The number of entries to get
-      * @param boolean|null $delete If true, delete the read entries
-      * @return array An array of mixed entries
-      */
+    /**
+     * Get X entries starting at position Y
+     * @param integer $start the starting position (the entries start at position
+     * zero)
+     * @param integer $number The number of entries to get
+     * @param boolean|null $delete If true, delete the read entries
+     * @return array An array of mixed entries
+     */
     public function getRange($start, $number, $delete = false)
     {
         $file = new File();
@@ -198,7 +209,7 @@ class Queuefile extends Queue
         $entries = explode("\n", $content);
         // Explode return always one empty entry at end. Remove it
         array_pop($entries);
-        $res = array();
+        $res = [];
         if (count($entries) > 0) {
             for ($i = $start; $i < $start + $number; $i++) {
                 if (! key_exists($i, $entries)) {
diff --git a/src/Ratelimit.php b/src/Ratelimit.php
index b7c9606..f59414e 100644
--- a/src/Ratelimit.php
+++ b/src/Ratelimit.php
@@ -1,27 +1,34 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The rate limit abstract class
-  */
+/**
+ * The rate limit abstract class
+ */
 class Ratelimit
 {
-    /** The maximum number of entries by specified unit time */
+    /**
+     * The maximum number of entries by specified unit time
+     */
     public $maxEntries = 10;
-    /** The unit time in seconds */
+    /**
+     * The unit time in seconds
+     */
     public $unittime = 60;
 
-    /** The function set a rate-limit
-      * @param string $name The rate-limit object to set
-      * @return bool true if the rate-limit is not overloaded
-      *              false if the rate-limit is overloaded
-      */
+    /**
+     * The function set a rate-limit
+     * @param string $name The rate-limit object to set
+     * @return bool true if the rate-limit is not overloaded
+     *              false if the rate-limit is overloaded
+     */
     public function set($name)
     {
         throw new \Exception(
@@ -33,10 +40,11 @@ class Ratelimit
         );
     }
 
-    /** The function delete a rate-limit
-      * @param string $name The rate-limit object to del
-      * @return bool
-      */
+    /**
+     * The function delete a rate-limit
+     * @param string $name The rate-limit object to del
+     * @return bool
+     */
     public function del($name)
     {
         throw new \Exception(
@@ -48,9 +56,10 @@ class Ratelimit
         );
     }
 
-    /** The function clean the storage
-      * @return bool
-      */
+    /**
+     * The function clean the storage
+     * @return bool
+     */
     public function clean()
     {
         throw new \Exception(
diff --git a/src/Ratelimitfile.php b/src/Ratelimitfile.php
index 84188e0..7468a2d 100644
--- a/src/Ratelimitfile.php
+++ b/src/Ratelimitfile.php
@@ -1,27 +1,34 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The rate limit with file storage
-  */
+/**
+ * The rate limit with file storage
+ */
 class Ratelimitfile extends Ratelimit
 {
-    /** The storage directory */
+    /**
+     * The storage directory
+     */
     public $storageDir = "data/ratelimit/";
-    /** Debug the ratelimiting process to screen */
+    /**
+     * Debug the ratelimiting process to screen
+     */
     public $debug = false;
 
-    /** The function set a rate-limit
-      * @param string $name The rate-limit object to set
-      * @return bool true if the rate-limit is not overloaded
-      *              false if the rate-limit is overloaded
-      */
+    /**
+     * The function set a rate-limit
+     * @param string $name The rate-limit object to set
+     * @return bool true if the rate-limit is not overloaded
+     *              false if the rate-limit is overloaded
+     */
     public function set($name)
     {
         $this->storageOK();
@@ -75,10 +82,11 @@ class Ratelimitfile extends Ratelimit
         return true;
     }
 
-    /** The function delete a rate-limit
-      * @param string $name The rate-limit object to del
-      * @return bool
-      */
+    /**
+     * The function delete a rate-limit
+     * @param string $name The rate-limit object to del
+     * @return bool
+     */
     public function del($name)
     {
         $this->storageOK();
@@ -93,9 +101,10 @@ class Ratelimitfile extends Ratelimit
         return true;
     }
 
-    /** The function clean the storage with expired entries
-      * @return bool
-      */
+    /**
+     * The function clean the storage with expired entries
+     * @return bool
+     */
     public function clean()
     {
         $this->storageOK();
@@ -112,8 +121,9 @@ class Ratelimitfile extends Ratelimit
         return true;
     }
 
-    /** Check the storageDir state
-      */
+    /**
+     * Check the storageDir state
+     */
     private function storageOK()
     {
         if (file_exists($this->storageDir)) {
diff --git a/src/Renderer.php b/src/Renderer.php
index 03ae12e..c941838 100644
--- a/src/Renderer.php
+++ b/src/Renderer.php
@@ -1,36 +1,56 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Display the data in HTML with a FLASH method to display the errors
-  */
+/**
+ * Display the data in HTML with a FLASH method to display the errors
+ */
 class Renderer
 {
-    /** The result in construction */
+    /**
+     * The result in construction
+     */
     public $result = null;
-    /** The output type */
+    /**
+     * The output type
+     */
     public $output = null;
-    /** Title by default : space to be compatible with HTML5 */
+    /**
+     * Title by default : space to be compatible with HTML5
+     */
     public $title = " ";
-    /** Filename of class containing the presentation layer */
+    /**
+     * Filename of class containing the presentation layer
+     */
     public $viewClass = false;
-    /** Method apply to class object to display the $result */
+    /**
+     * Method apply to class object to display the $result
+     */
     public $viewMethod = false;
-    /** Filename in views containing the HTML layout. Without .html at the end */
+    /**
+     * Filename in views containing the HTML layout. Without .html at the end
+     */
     public $layout = false;
-    /** Array to search/replace */
-    public $replacement = array();
-    /** Array to variable definition */
-    public $variable = array();
+    /**
+     * Array to search/replace
+     */
+    public $replacement = [];
+    /**
+     * Array to variable definition
+     */
+    public $variable = [];
 
-    /** Display the $this->result result in the output model defined by
-        $this->output */
+    /**
+     * Display the $this->result result in the output model defined by
+     * $this->output
+     */
     public function run()
     {
         // If the output is not defined in domframework, it will not be loaded but
@@ -39,20 +59,22 @@ class Renderer
         $class = __NAMESPACE__ . "\\Output$this->output";
         $obj = new $class();
         $res = call_user_func_array(
-            array($obj, "out"),
-            array($this->result, $this->title,
+            [$obj, "out"],
+            [$this->result, $this->title,
                     $this->viewClass, $this->viewMethod, $this->layout,
-                    $this->replacement, $this->variable)
+                    $this->replacement, $this->variable]
         );
         echo $res;
     }
 
-    /** Add a flash message to the user, on the next HTML page.
-        In CLI, display the message immediately.
-        Message must be translated before sending to the function
-        @param integer|string $priority Priority 1:success, 2:info, 3:warning,
-               4:error or textual : SUCCESS, INFO, WARNING, ERROR
-        @param string $message Message to display */
+    /**
+     * Add a flash message to the user, on the next HTML page.
+     * In CLI, display the message immediately.
+     * Message must be translated before sending to the function
+     * @param integer|string $priority Priority 1:success, 2:info, 3:warning,
+     * 4:error or textual : SUCCESS, INFO, WARNING, ERROR
+     * @param string $message Message to display
+     */
     public static function flash($priority, $message)
     {
         if (php_sapi_name() === "cli") {
@@ -83,19 +105,19 @@ class Renderer
             switch ($priority) {
                 case 1:
                 case "SUCCESS":
-                    $_SESSION["renderer"]["flash"][] = array(1, $message);
+                    $_SESSION["renderer"]["flash"][] = [1, $message];
                     break;
                 case 2:
                 case "INFO":
-                    $_SESSION["renderer"]["flash"][] = array(2, $message);
+                    $_SESSION["renderer"]["flash"][] = [2, $message];
                     break;
                 case 3:
                 case "WARNING":
-                    $_SESSION["renderer"]["flash"][] = array(3, $message);
+                    $_SESSION["renderer"]["flash"][] = [3, $message];
                     break;
                 case 4:
                 case "ERROR":
-                    $_SESSION["renderer"]["flash"][] = array(4, $message);
+                    $_SESSION["renderer"]["flash"][] = [4, $message];
                     break;
                 default:
                     throw new \Exception("Unknown flash priority '$priority'", 500);
@@ -103,20 +125,21 @@ class Renderer
         }
     }
 
-    /** Display the HTML page with the alert box if needed
-      * @param string $viewclass The view class to use to create the output
-      * @param string $viewmethod The view method to use to create the output
-      * @param mixed $data The data to display.
-      * @param array|null $replacement Replace some values by some others in the
-      * created HTML page
-      * @param string|null $layoutfile The layout page to use as base
-      * @param object|null $route A previous defined "route" object
-      */
+    /**
+     * Display the HTML page with the alert box if needed
+     * @param string $viewclass The view class to use to create the output
+     * @param string $viewmethod The view method to use to create the output
+     * @param mixed $data The data to display.
+     * @param array|null $replacement Replace some values by some others in the
+     * created HTML page
+     * @param string|null $layoutfile The layout page to use as base
+     * @param object|null $route A previous defined "route" object
+     */
     public static function html(
         $viewclass,
         $viewmethod,
         $data,
-        $replacement = array(),
+        $replacement = [],
         $layoutfile = "views/layout.html",
         $route = null
     ) {
@@ -163,9 +186,9 @@ class Renderer
         $html = new Outputhtml();
         $replacement = array_merge(
             $replacement,
-            array("{baseurl}" => $route->baseURL(),
+            ["{baseurl}" => $route->baseURL(),
                                 "{baseurlresource}" => $route->baseURLresource(),
-                                "{flash}" => $dataflash)
+                                "{flash}" => $dataflash]
         );
 
         echo $html->out(
diff --git a/src/Rest.php b/src/Rest.php
index 37f43fb..e5429c0 100644
--- a/src/Rest.php
+++ b/src/Rest.php
@@ -1,34 +1,39 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to manage the REST protocol by using the users output types
-  */
+/**
+ * Allow to manage the REST protocol by using the users output types
+ */
 class Rest
 {
-    /** Allowed types by default
-      */
-    public $allowedtypes = array("json", "xml", "txt", "csv");
+    /**
+     * Allowed types by default
+     */
+    public $allowedtypes = ["json", "xml", "txt", "csv"];
 
-    /** Converted types
-      */
-    private $convert = array(
+    /**
+     * Converted types
+     */
+    private $convert = [
     "application/json" => "json",
     "application/xml"  => "xml",
     "text/plain"       => "txt",
     "text/csv"         => "csv",
-    );
+    ];
 
-    /** This method allow to choose the type of plugin to use on output
-      * Based on the HTTP_ACCEPT parameter provided by the user
-      * @return string like "json", "xml", "txt", "csv"
-      */
+    /**
+     * This method allow to choose the type of plugin to use on output
+     * Based on the HTTP_ACCEPT parameter provided by the user
+     * @return string like "json", "xml", "txt", "csv"
+     */
     public function chooseType()
     {
         $type = reset($this->allowedtypes);
@@ -36,7 +41,7 @@ class Rest
             // Must work with the complete definition to match, and by the name of
             // the output plugin at the end
             $convert = array_intersect($this->convert, $this->allowedtypes);
-            $type = array_search(reset($this->allowedtypes), $this->convert);
+            $type = array_search(reset($this->allowedtypes), $this->convert, true);
             $http = new Http();
             $type = $http->bestChoice(
                 $_SERVER["HTTP_ACCEPT"],
@@ -48,12 +53,13 @@ class Rest
         return $type;
     }
 
-    /** Display the message (which can be a string, an array, an integer...)
-      * into the type asked by the client if it is allowed.
-      * By default, the JSON type is used
-      * @param string $message Message to be displayed by the output type
-      * @param integer|null $code HTTP code to use
-      */
+    /**
+     * Display the message (which can be a string, an array, an integer...)
+     * into the type asked by the client if it is allowed.
+     * By default, the JSON type is used
+     * @param string $message Message to be displayed by the output type
+     * @param integer|null $code HTTP code to use
+     */
     public function display($message, $code = 200)
     {
         $http = new Http();
diff --git a/src/Robotstxt.php b/src/Robotstxt.php
index 432705a..9685325 100644
--- a/src/Robotstxt.php
+++ b/src/Robotstxt.php
@@ -1,64 +1,74 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class analyze the provided robots.txt file content and allow to
-  * get the configured data for DomSearch.
-  * It allow to examine an URL against the robots.txt file and return if the URL
-  * is allowed to be used or not
-  * The definition of the format of robots.txt file is available here :
-  *   https://www.rfc-editor.org/rfc/rfc9309.txt
-  *   http://www.robotstxt.org/norobots-rfc.txt
-  *   https://en.wikipedia.org/wiki/Robots_exclusion_standard
-  */
+/**
+ * This class analyze the provided robots.txt file content and allow to
+ * get the configured data for DomSearch.
+ * It allow to examine an URL against the robots.txt file and return if the URL
+ * is allowed to be used or not
+ * The definition of the format of robots.txt file is available here :
+ *   https://www.rfc-editor.org/rfc/rfc9309.txt
+ *   http://www.robotstxt.org/norobots-rfc.txt
+ *   https://en.wikipedia.org/wiki/Robots_exclusion_standard
+ */
 class Robotstxt
 {
     //    PROPERTIES
-    /** The allowed urls
-      */
-    private $allow = array();
+    /**
+     * The allowed urls
+     */
+    private $allow = [];
 
-    /** The disallow urls
-      */
-    private $disallow = array();
+    /**
+     * The disallow urls
+     */
+    private $disallow = [];
 
-    /** The sitemaps URL defined in the file
-      */
-    private $sitemaps = array();
+    /**
+     * The sitemaps URL defined in the file
+     */
+    private $sitemaps = [];
 
-    /** The crawldelay defined in the file
-      */
+    /**
+     * The crawldelay defined in the file
+     */
     private $crawldelay = null;
 
-    /** The host can be specified as default website
-      */
+    /**
+     * The host can be specified as default website
+     */
     private $host = null;
 
-    /** The rule number matching the URLAllow rule
-      */
+    /**
+     * The rule number matching the URLAllow rule
+     */
     private $matchRule = null;
 
-    /** List the errors read on the file content. The key is the line where the
-      * default is set
-      */
-    private $errors = array();
+    /**
+     * List the errors read on the file content. The key is the line where the
+     * default is set
+     */
+    private $errors = [];
 
     //    METHODS
-    /** Get the robots.txt file content and do the analyze
-      * @param string $content The robots.txt file content to analyze
-      * @param string $crawlerName The crawler name to use in analyze
-      * @return $this
-      */
+    /**
+     * Get the robots.txt file content and do the analyze
+     * @param string $content The robots.txt file content to analyze
+     * @param string $crawlerName The crawler name to use in analyze
+     * @return $this
+     */
     public function __construct($content, $crawlerName)
     {
         if (trim($content) === "") {
-            $this->allow = array("/");
+            $this->allow = ["/"];
             return $this;
         }
         // Look if the User-agent is available for the defined crawlerName.
@@ -71,7 +81,7 @@ class Robotstxt
         }
         if (empty($keys)) {
             // No User-agent with crawlerName nor * : accept all
-            $this->allow = array("/");
+            $this->allow = ["/"];
             return $this;
         }
 
@@ -158,19 +168,20 @@ class Robotstxt
             }
         }
         if (
-            ! in_array("/", $this->disallow) &&
-            ! in_array("/", $this->allow)
+            ! in_array("/", $this->disallow, true) &&
+            ! in_array("/", $this->allow, true)
         ) {
             $this->allow[] = "/";
         }
         return $this;
     }
 
-    /** Return true if the provided URL can be used against the robots.txt
-      * definition or FALSE if it is not the case
-      * @param string $url The URL to check
-      * @return boolean The result of the test
-      */
+    /**
+     * Return true if the provided URL can be used against the robots.txt
+     * definition or FALSE if it is not the case
+     * @param string $url The URL to check
+     * @return boolean The result of the test
+     */
     public function URLAllow($url)
     {
         $parse = parse_url($url);
@@ -226,69 +237,77 @@ class Robotstxt
     }
 
     //    GETTERS
-    /** Return the lines where an error occured
-      * The key of the array is the line number with the default
-      * @return array The errors
-      */
+    /**
+     * Return the lines where an error occured
+     * The key of the array is the line number with the default
+     * @return array The errors
+     */
     public function errors()
     {
         return $this->errors;
     }
 
-    /** Return the allowed urls
-      * @return array $allow The array of allow rules
-      */
+    /**
+     * Return the allowed urls
+     * @return array $allow The array of allow rules
+     */
     public function allow()
     {
         return $this->allow;
     }
 
-    /** Return the disallowed urls
-      * @return array $disallow The array of disallow rules
-      */
+    /**
+     * Return the disallowed urls
+     * @return array $disallow The array of disallow rules
+     */
     public function disallow()
     {
         return $this->disallow;
     }
 
-    /** Return the sitemaps url
-      * @return array $sitemap The array of sitemaps URL
-      */
+    /**
+     * Return the sitemaps url
+     * @return array $sitemap The array of sitemaps URL
+     */
     public function sitemaps()
     {
         return $this->sitemaps;
     }
 
-    /** Return the crawldelay
-      * @return integer $crawldelay The crawlDelay defined in robots.txt
-      */
+    /**
+     * Return the crawldelay
+     * @return integer $crawldelay The crawlDelay defined in robots.txt
+     */
     public function crawldelay()
     {
         return $this->crawldelay;
     }
 
-    /** Return the host
-      * @return string $host The Host string defined in robots.txt
-      */
+    /**
+     * Return the host
+     * @return string $host The Host string defined in robots.txt
+     */
     public function host()
     {
         return $this->host;
     }
 
-    /** Return the matchRule
-      * @return string $matchRule The matchRule matching the URLAllow test
-      */
+    /**
+     * Return the matchRule
+     * @return string $matchRule The matchRule matching the URLAllow test
+     */
     public function matchRule()
     {
         return $this->matchRule;
     }
 
     //    PRIVATE METHODS
-    /** Get a line from robots.txt file and return the associated value.
-      * Manage the evntual comments on the line
-      * @param string $line the complete line from robots.txt file
-      * @return string the value recorded on line
-      */
+    /**
+     * Get a line from robots.txt file and return the associated value.
+     * Manage the evntual comments on the line
+     * @param string $line the complete line from robots.txt file
+     * @return string the value recorded on line
+     */
     private function getValueFromLine($line)
     {
         preg_match_all("#^(?P<field>\S+):\s*(?P<value>\S*)\s*" .
diff --git a/src/Route.php b/src/Route.php
index 3eb28d7..60d6890 100644
--- a/src/Route.php
+++ b/src/Route.php
@@ -1,81 +1,124 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The routing module, base of the DomFramework
-  */
+/**
+ * The routing module, base of the DomFramework
+ */
 class Route
 {
-    /** The baseURL of the site */
+    /**
+     * The baseURL of the site
+     */
     private $baseURL = "";
-    /** The baseURL of the module in the site */
+    /**
+     * The baseURL of the module in the site
+     */
     private $baseURLmodule = "";
-    /** The method used to ask the page */
+    /**
+     * The method used to ask the page
+     */
     public $method = "";
-    /** The module name */
+    /**
+     * The module name
+     */
     public $module = null;
-    /** The debug mode :
-      * 0:NoDebug, 1:routing, 2:more debug (developpement)*/
+    /**
+     * The debug mode :
+     * 0:NoDebug, 1:routing, 2:more debug (developpement)
+     */
     public $debug = 0;
     //public $defaultOutput = "html"; // Default renderer : html
 
-    /** Allow slashes in the url when matching the regex */
+    /**
+     * Allow slashes in the url when matching the regex
+     */
     public $allowSlashes = true;
-    /** Provide the the class catch errors in routing.
-      * Must be provided in an array(class, method); */
+    /**
+     * Provide the the class catch errors in routing.
+     * Must be provided in an array(class, method);
+     */
     public $errors = null;
-    /** Preroute used in modules */
+    /**
+     * Preroute used in modules
+     */
     public $preroute = "";
-    /** Authentication URL used if a 401 error is raised. If none is defined,
-      * just display a "Unauthorized" message */
+    /**
+     * Authentication URL used if a 401 error is raised. If none is defined,
+     * just display a "Unauthorized" message
+     */
     public $authenticationURL = null;
 
-    /** Ratelimit the errors in route.php to not allow the hackers to brute force
-      * the backend. The objct can be put to null to disable the feature */
+    /**
+     * Ratelimit the errors in route.php to not allow the hackers to brute force
+     * the backend. The objct can be put to null to disable the feature
+     */
     public $ratelimiter = null;
 
     ///   MAPPING   ///
-    /** The matching route comparison
-      */
+    /**
+     * The matching route comparison
+     */
     public $mapRoute = null;
 
     ///   RENDERER PART   ///
-    /** Output type to no previous catched renderer (allow : json, xml, txt html)
-      */
+    /**
+     * Output type to no previous catched renderer (allow : json, xml, txt html)
+     */
     public $output = "html";
-    /** Title by default : space to be compatible with HTML5 */
+    /**
+     * Title by default : space to be compatible with HTML5
+     */
     public $title = " ";
-    /** Filename of class containing the presentation layer */
+    /**
+     * Filename of class containing the presentation layer
+     */
     public $viewClass = false;
-    /** Method apply to class object to display the $result */
+    /**
+     * Method apply to class object to display the $result
+     */
     public $viewMethod = false;
-    /** Classname containing the error layer */
+    /**
+     * Classname containing the error layer
+     */
     public $viewErrorClass = null;
-    /** Method apply to class object to display the error */
+    /**
+     * Method apply to class object to display the error
+     */
     public $viewErrorMethod = null;
-    /** Filename in views containing the HTML layout. Without .html at the end */
+    /**
+     * Filename in views containing the HTML layout. Without .html at the end
+     */
     public $layout = false;
-    /** Array to search/replace */
-    public $replacement = array();
-    /** Array to variable definition */
-    public $variable = array();
+    /**
+     * Array to search/replace
+     */
+    public $replacement = [];
+    /**
+     * Array to variable definition
+     */
+    public $variable = [];
 
-    /** The route constructor : initialize the parameters */
+    /**
+     * The route constructor : initialize the parameters
+     */
     public function __construct()
     {
         $this->ratelimiter = new Ratelimitfile();
     }
 
-    /** Get / Set the debug level
-      * @param integer|null $val The value to set. If null, will return the actual
-      * value
-      */
+    /**
+     * Get / Set the debug level
+     * @param integer|null $val The value to set. If null, will return the actual
+     * value
+     */
     public function debug($val = null)
     {
         if ($val === null) {
@@ -84,12 +127,13 @@ class Route
         $this->debug = intval($val);
     }
 
-    /** Return the baseURL of the site
-      * Always finish with a slash
-      * @param string|null $module The module name (if thereis one)
-      * @param boolean|null $absolute Return the baseURL in absolute
-      * @return string The URL base
-      */
+    /**
+     * Return the baseURL of the site
+     * Always finish with a slash
+     * @param string|null $module The module name (if thereis one)
+     * @param boolean|null $absolute Return the baseURL in absolute
+     * @return string The URL base
+     */
     public function baseURL($module = false, $absolute = false)
     {
         if ($this->module === null) {
@@ -163,7 +207,7 @@ class Route
                                          $this->baseURL;
             if ($this->baseURL === "")
               $this->baseURL = "./";
-            */
+ */
         }
         $this->baseURLmodule = $this->baseURL;
         // Only != NOT !== (cause : $this->module can be converted in string "0")
@@ -177,12 +221,13 @@ class Route
         return $this->baseURL;
     }
 
-    /** Return the baseURL for a resource (add a index.php?url= if there is no
-      * mod_rewrite support. Used to link to modules in the HTML page.
-      * The baseURL is the real base of the project, which is different when not
-      * using the mod_rewrite. They are equal when using the mod_rewrite
-      * @return string The baseURL for the resource
-      */
+    /**
+     * Return the baseURL for a resource (add a index.php?url= if there is no
+     * mod_rewrite support. Used to link to modules in the HTML page.
+     * The baseURL is the real base of the project, which is different when not
+     * using the mod_rewrite. They are equal when using the mod_rewrite
+     * @return string The baseURL for the resource
+     */
     public function baseURLresource()
     {
         if ($this->baseURL === "") {
@@ -197,10 +242,11 @@ class Route
         return $this->baseURL;
     }
 
-    /** Return the baseURL of the module
-      * Always finish with a slash
-      * @return string The baseURL for the module
-      */
+    /**
+     * Return the baseURL of the module
+     * Always finish with a slash
+     * @return string The baseURL for the module
+     */
     public function baseURLmodule()
     {
         if ($this->baseURLmodule !== "") {
@@ -210,17 +256,20 @@ class Route
         return $this->baseURLmodule;
     }
 
-    /** Define the base URL of the site
-      * @param string $baseURL The base URL of the site */
+    /**
+     * Define the base URL of the site
+     * @param string $baseURL The base URL of the site
+     */
     public function baseURLset($baseURL)
     {
         $this->baseURL = $baseURL;
     }
 
-    /** Return the complete URL used to see this page
-      * @param boolean|null $absolute Return the absolute URL
-      * @return string the complete URL used to see this page
-      */
+    /**
+     * Return the complete URL used to see this page
+     * @param boolean|null $absolute Return the absolute URL
+     * @return string the complete URL used to see this page
+     */
     public function requestURL($absolute = false)
     {
         $url = "";
@@ -269,17 +318,18 @@ class Route
         return $url;
     }
 
-    /** Do all the routing with redirections
-      * $destURL can be absolute or relative.
-      * - absolute : "/main" redirect to "baseURL/mail"
-      * - relative : "main" redirect to "./main"
-      * If module is set, the site is modular and a directory is named with module
-      * name
-      * @param string $destURL Do a redirection of the HTTP page
-      * @param string|null $module The module name
-      * @param boolean|null $permanent Permanent redirect (false by default)
-      * @return mixed mixed Exit of the PHP after doing the redirection
-      */
+    /**
+     * Do all the routing with redirections
+     * $destURL can be absolute or relative.
+     * - absolute : "/main" redirect to "baseURL/mail"
+     * - relative : "main" redirect to "./main"
+     * If module is set, the site is modular and a directory is named with module
+     * name
+     * @param string $destURL Do a redirection of the HTTP page
+     * @param string|null $module The module name
+     * @param boolean|null $permanent Permanent redirect (false by default)
+     * @return mixed mixed Exit of the PHP after doing the redirection
+     */
     public function redirect($destURL, $module = "", $permanent = false)
     {
         if (php_sapi_name() === "cli") {
@@ -345,10 +395,12 @@ class Route
         exit;
     }
 
-    /** Return the HTTP method used to connect to the page
-      * Can be override by a _METHOD parameter provided in POST
-      * @return string the method used to connect
-      * @throws an exception in case of error */
+    /**
+     * Return the HTTP method used to connect to the page
+     * Can be override by a _METHOD parameter provided in POST
+     * @return string the method used to connect
+     * @throws an exception in case of error
+     */
     public function method()
     {
         if (
@@ -383,23 +435,25 @@ class Route
         return "";
     }
 
-    /** Return the mached route search
-      */
+    /**
+     * Return the mached route search
+     */
     public function mapRoute()
     {
         return $this->mapRoute;
     }
 
-    /** If the URL is corresponding with $url, and the method is GET, then the
-      * function is called.
-      * Ex. : $route->get ('/hello/{name}', function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * If the URL is corresponding with $url, and the method is GET, then the
+     * function is called.
+     * Ex. : $route->get ('/hello/{name}', function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function get($route, $function)
     {
         $route = $this->preroute . $route;
@@ -416,16 +470,17 @@ class Route
         return $this->map($route, $function);
     }
 
-    /** If the URL is corresponding with $url, and the method is POST, then the
-      * function is called.
-      * Ex. : $route->post ('/hello/{name}', function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * If the URL is corresponding with $url, and the method is POST, then the
+     * function is called.
+     * Ex. : $route->post ('/hello/{name}', function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function post($route, $function)
     {
         $route = $this->preroute . $route;
@@ -442,16 +497,17 @@ class Route
         return $this->map($route, $function);
     }
 
-    /** If the URL is corresponding with $url, and the method is PUT, then the
-      * function is called.
-      * Ex. : $route->put ('/hello/{name}', function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * If the URL is corresponding with $url, and the method is PUT, then the
+     * function is called.
+     * Ex. : $route->put ('/hello/{name}', function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function put($route, $function)
     {
         $route = $this->preroute . $route;
@@ -468,16 +524,17 @@ class Route
         return $this->map($route, $function);
     }
 
-    /** If the URL is corresponding with $url, and the method is DELETE, then the
-      * function is called.
-      * Ex. : $route->delete ('/hello/{name}', function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * If the URL is corresponding with $url, and the method is DELETE, then the
+     * function is called.
+     * Ex. : $route->delete ('/hello/{name}', function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function delete($route, $function)
     {
         $route = $this->preroute . $route;
@@ -494,16 +551,17 @@ class Route
         return $this->map($route, $function);
     }
 
-    /** If the URL is corresponding with $url, and the method is OPTIONS, then the
-      * function is called.
-      * Ex. : $route->options ('/hello/{name}', function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * If the URL is corresponding with $url, and the method is OPTIONS, then the
+     * function is called.
+     * Ex. : $route->options ('/hello/{name}', function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function options($route, $function)
     {
         $route = $this->preroute . $route;
@@ -520,18 +578,19 @@ class Route
         return $this->map($route, $function);
     }
 
-    /** Allow multiple methods to execute the function if the route is
-      * corresponding to the URL.
-      * Ex. : $route->multi("get,post,put,delete,options", '/hello/{name}',
-      *                   function ($name) {
-      *         echo "Hello, $name";
-      *       });
-      * @param string $methods The allowed methods, separated by commas (,)
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * Allow multiple methods to execute the function if the route is
+     * corresponding to the URL.
+     * Ex. : $route->multi("get,post,put,delete,options", '/hello/{name}',
+     *                   function ($name) {
+     *         echo "Hello, $name";
+     *       });
+     * @param string $methods The allowed methods, separated by commas (,)
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function multi($methods, $route, $function)
     {
         foreach (explode(",", $methods) as $method) {
@@ -540,13 +599,14 @@ class Route
         return $this;
     }
 
-    /** Do the mapping between the url and the route : call the function if
-      * thereis a match
-      * @param string $route Route to check with the URL
-      * @param callable $function Function to be executed if the route match
-      * @return self Exit of the PHP after displaying the page if match, or return the
-      * route object to chain it whith the next test
-      */
+    /**
+     * Do the mapping between the url and the route : call the function if
+     * thereis a match
+     * @param string $route Route to check with the URL
+     * @param callable $function Function to be executed if the route match
+     * @return self Exit of the PHP after displaying the page if match, or return the
+     * route object to chain it whith the next test
+     */
     public function map($route, $function)
     {
         $url = str_replace("index.php?url=", "", $this->requestURL());
@@ -601,7 +661,7 @@ class Route
                 echo "==> FOUND REGEX !<tt><br/>\n";
             }
             $this->mapRoute = $route;
-            $params = array();
+            $params = [];
             $reflect = new \ReflectionFunction($function);
             foreach ($reflect->getParameters() as $key => $val) {
                 if (isset($matches[$val->name])) {
@@ -639,10 +699,11 @@ class Route
         return $this;
     }
 
-    /** Print an error page. If a custom page exists, use it
-      * @param object $e Exception to print
-      * @return bool true after the error is displayed
-      */
+    /**
+     * Print an error page. If a custom page exists, use it
+     * @param object $e Exception to print
+     * @return bool true after the error is displayed
+     */
     public function error($e)
     {
         $ipClient = null;
@@ -728,25 +789,26 @@ class Route
         $renderer->layout = $this->layout;
         $renderer->replacement = array_merge(
             $this->replacement,
-            array("{exceptionCode}" => $getCode,
+            ["{exceptionCode}" => $getCode,
                                    "{exceptionText}" => $http->codetext($getCode),
                                    "{baseurl}" => $this->baseURL(),
-                                   "{baseurlmodule}" => $this->baseURLmodule())
+                                   "{baseurlmodule}" => $this->baseURLmodule()]
         );
         $renderer->variable = array_merge(
             $this->variable,
-            array("exceptionCode" => $getCode,
+            ["exceptionCode" => $getCode,
                                  "exceptionText" => $http->codetext($getCode),
                                  "baseurl" => $this->baseURL(),
-                                 "baseurlmodule" => $this->baseURLmodule())
+                                 "baseurlmodule" => $this->baseURLmodule()]
         );
         $renderer->run();
         return true;
     }
 
-    /** Return the last valid get page to return
-      * @return string The last valid page URL or "" if not set
-      */
+    /**
+     * Return the last valid get page to return
+     * @return string The last valid page URL or "" if not set
+     */
     public function lastValidGetPage()
     {
         if (isset($_SESSION["domframework"]["route"]["lastGet"])) {
@@ -755,10 +817,11 @@ class Route
         return "";
     }
 
-    /** Redirect to last valid get page if defined
-      * @return mixed Exit from PHP after redirect or null if the last valid page is not
-      * defined
-      */
+    /**
+     * Redirect to last valid get page if defined
+     * @return mixed Exit from PHP after redirect or null if the last valid page is not
+     * defined
+     */
     public function lastValidGetPageRedirect()
     {
         $lastValidGetPage = $this->lastValidGetPage();
diff --git a/src/RouteSQL.php b/src/RouteSQL.php
index c85706c..9de8f01 100644
--- a/src/RouteSQL.php
+++ b/src/RouteSQL.php
@@ -1,108 +1,175 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Automatic Routing for SQL database
-  * Allow to do CRUD on data with only one line in index.php
-  */
+/**
+ * Automatic Routing for SQL database
+ * Allow to do CRUD on data with only one line in index.php
+ */
 class RouteSQL
 {
-    /** Activate the debug */
+    /**
+     * Activate the debug
+     */
     public $debug = 0;
-    /** Display the Actions column in list of entries */
+    /**
+     * Display the Actions column in list of entries
+     */
     public $displayActions = true;
-    /** Do a confirmation in javascript before deleting entry */
+    /**
+     * Do a confirmation in javascript before deleting entry
+     */
     public $deleteConfirm = true;
-    /** Push the actions buttons at end of line */
+    /**
+     * Push the actions buttons at end of line
+     */
     public $actionsAtEnd = false;
-    /** The Text to Delete */
+    /**
+     * The Text to Delete
+     */
     public $textDelete = "";
-    /** The Text to Edit */
+    /**
+     * The Text to Edit
+     */
     public $textEdit = "";
-    /** enable internal CSS */
+    /**
+     * enable internal CSS
+     */
     public $enableInternalCSS = true;
-    /** Definition of the position in top bar at left
-        Allowed : addNew numberEntryByDisplay search information paginator */
-    public $topBarLeft = array("addNew", "numberEntryByDisplay");
-    /** Definition of the position in top bar at right
-        Allowed : addNew numberEntryByDisplay search information paginator */
-    public $topBarRight = array("search");
-    /** Definition of the position in bottom bar at left
-        Allowed : addNew numberEntryByDisplay search information paginator */
-    public $bottomBarLeft = array("information");
-    /** Definition of the position in bottom bar at right
-        Allowed : addNew numberEntryByDisplay search information paginator */
-    public $bottomBarRight = array("paginator");
-    /** The cookie path used to determine the old parameters
-        It is automatically generated with the URL */
+    /**
+     * Definition of the position in top bar at left
+     * Allowed : addNew numberEntryByDisplay search information paginator
+     */
+    public $topBarLeft = ["addNew", "numberEntryByDisplay"];
+    /**
+     * Definition of the position in top bar at right
+     * Allowed : addNew numberEntryByDisplay search information paginator
+     */
+    public $topBarRight = ["search"];
+    /**
+     * Definition of the position in bottom bar at left
+     * Allowed : addNew numberEntryByDisplay search information paginator
+     */
+    public $bottomBarLeft = ["information"];
+    /**
+     * Definition of the position in bottom bar at right
+     * Allowed : addNew numberEntryByDisplay search information paginator
+     */
+    public $bottomBarRight = ["paginator"];
+    /**
+     * The cookie path used to determine the old parameters
+     * It is automatically generated with the URL
+     */
     public $path = "";
-    /** Authentication for HTML part */
-    public $authHTML = array("email" => "anonymous");
-    /** Authentication for REST part */
-    public $authREST = array("email" => "anonymous");
-    /** Authorization object. Should allow a method named
-        "allow ($module, $user, $object)" which return
-        - NO if the object is not defined
-        - RO if the object is in read-only mode
-        - RW if the object is in read-write mode */
+    /**
+     * Authentication for HTML part
+     */
+    public $authHTML = ["email" => "anonymous"];
+    /**
+     * Authentication for REST part
+     */
+    public $authREST = ["email" => "anonymous"];
+    /**
+     * Authorization object. Should allow a method named
+     * "allow ($module, $user, $object)" which return
+     * - NO if the object is not defined
+     * - RO if the object is in read-only mode
+     * - RW if the object is in read-write mode
+     */
     public $authorization = null;
-    /** Module name for authorization */
+    /**
+     * Module name for authorization
+     */
     public $module = null;
-    /** Chain multiple routeSQL. Wait for an routeSQL object */
+    /**
+     * Chain multiple routeSQL. Wait for an routeSQL object
+     */
     public $chained = null;
-    /** Chain multiple routeSQL. Wait for the foreign key */
+    /**
+     * Chain multiple routeSQL. Wait for the foreign key
+     */
     public $chainedForeign = null;
-    /** Allow one or multiple links by entry in the list
-        The array must be of the form array ("linkname"=>, "icon"=>)
-        icon is optional and the linkname is used if it is not provided */
-    public $internalLinks = array();
-    /** The renderer class to use for HTML pages */
+    /**
+     * Allow one or multiple links by entry in the list
+     * The array must be of the form array ("linkname"=>, "icon"=>)
+     * icon is optional and the linkname is used if it is not provided
+     */
+    public $internalLinks = [];
+    /**
+     * The renderer class to use for HTML pages
+     */
     public $rendererHTMLclass = false;
-    /** The renderer method to use for HTML pages */
+    /**
+     * The renderer method to use for HTML pages
+     */
     public $rendererHTMLmethod = false;
-    /** The layout HTML to use for HTML pages */
+    /**
+     * The layout HTML to use for HTML pages
+     */
     public $rendererHTMLlayout = false;
-    /** The extensions allowed in REST */
-    public $extensionsAllowed = array("json", "xml");
+    /**
+     * The extensions allowed in REST
+     */
+    public $extensionsAllowed = ["json", "xml"];
 
-    /** The model file containing the database description */
+    /**
+     * The model file containing the database description
+     */
     private $model_file = "";
-    /** The model class included in the model file */
+    /**
+     * The model class included in the model file
+     */
     private $model_class = "";
-    /** The prefix to be used in the URL. Should be the end of $model_file
-        Ex : if $model_file = models/model_zone.php, the url_prefix should be
-             zone */
+    /**
+     * The prefix to be used in the URL. Should be the end of $model_file
+     * Ex : if $model_file = models/model_zone.php, the url_prefix should be
+     * zone
+     */
     private $url_prefix = "";
-    /** The SQL object created */
+    /**
+     * The SQL object created
+     */
     private $objectDB = null;
-    /** The DSN to connect to the database */
+    /**
+     * The DSN to connect to the database
+     */
     private $dsn = null;
-    /** The Username to connect to the database */
+    /**
+     * The Username to connect to the database
+     */
     private $username = null;
-    /** The Password to connect to the database */
+    /**
+     * The Password to connect to the database
+     */
     private $password = null;
-    /** The Options to the PDO driver if needed */
+    /**
+     * The Options to the PDO driver if needed
+     */
     private $driver_options = null;
-    /** The Datas are protected in read-only */
+    /**
+     * The Datas are protected in read-only
+     */
     private $readwriteAllowed = true;
 
-    /** Connect to the database
-      * @param string $model_file The model file containing the database
-      * description
-      * @param string $model_class The model class included in the model file
-      * @param string $url_prefix The prefix to be used in the URL. Should be the
-      * end of $model_file
-      * @param string $dsn The DSN to connect to the database
-      * @param string $username The username to connect to the database
-      * @param string $password The password to connect to the database
-      * @param array|null $driver_options The PDO driver options
-      */
+    /**
+     * Connect to the database
+     * @param string $model_file The model file containing the database
+     * description
+     * @param string $model_class The model class included in the model file
+     * @param string $url_prefix The prefix to be used in the URL. Should be the
+     * end of $model_file
+     * @param string $dsn The DSN to connect to the database
+     * @param string $username The username to connect to the database
+     * @param string $password The password to connect to the database
+     * @param array|null $driver_options The PDO driver options
+     */
     public function __construct(
         $model_file,
         $model_class,
@@ -129,7 +196,9 @@ class RouteSQL
         }
     }
 
-    /** Connect to the database */
+    /**
+     * Connect to the database
+     */
     private function connect()
     {
         include "models/$this->model_file";
@@ -141,7 +210,9 @@ class RouteSQL
         );
     }
 
-    /** Display the flash information if no flash view is available */
+    /**
+     * Display the flash information if no flash view is available
+     */
     private function showflash()
     {
         $dataflash = "";
@@ -180,15 +251,16 @@ class RouteSQL
         return $dataflash;
     }
 
-    /** Display a paginator
-      * $nbentries is the total number of elements
-      * num is the number of elements displayed by page
-      * page is the page to display
-      * @param integer $nbentries The number of entries to display
-      * @param integer $page The page number to display
-      * @param integer $num ???
-      * @param string $search The search query
-      */
+    /**
+     * Display a paginator
+     * $nbentries is the total number of elements
+     * num is the number of elements displayed by page
+     * page is the page to display
+     * @param integer $nbentries The number of entries to display
+     * @param integer $page The page number to display
+     * @param integer $num ???
+     * @param string $search The search query
+     */
     private function paginatorArea($nbentries, $page, $num, $search)
     {
         // The maximum of links available in the paginator
@@ -246,13 +318,14 @@ class RouteSQL
         return $content;
     }
 
-    /** Display the actions buttons outside of the table (actually, juste the
-      * 'Add new entry' button
-      * @param integer $nbentries The number of entries
-      * @param integer $page The page number
-      * @param integer $num ???
-      * @param string $search The search query
-      */
+    /**
+     * Display the actions buttons outside of the table (actually, juste the
+     * 'Add new entry' button
+     * @param integer $nbentries The number of entries
+     * @param integer $page The page number
+     * @param integer $num ???
+     * @param string $search The search query
+     */
     private function addNewArea($nbentries, $page, $num, $search)
     {
         $content = "";
@@ -266,12 +339,13 @@ class RouteSQL
         return $content;
     }
 
-    /** Display the select list to choose the number of displayed entries
-      * @param integer $nbentries The number of entries
-      * @param integer $page The page number
-      * @param integer $num ???
-      * @param string $search The search query
-      */
+    /**
+     * Display the select list to choose the number of displayed entries
+     * @param integer $nbentries The number of entries
+     * @param integer $page The page number
+     * @param integer $num ???
+     * @param string $search The search query
+     */
     private function numberEntryByDisplayArea($nbentries, $page, $num, $search)
     {
         $route = new Route();
@@ -280,7 +354,7 @@ class RouteSQL
         $content .= "      <form method='get' action='" . $route->baseURL() .
                 $this->url_prefix . "'>\n";
         $content .= "        <select name='num' onchange='this.form.submit()' >\n";
-        $list = array(10, 20, 50, 100, 200, 500, 1000);
+        $list = [10, 20, 50, 100, 200, 500, 1000];
         foreach ($list as $element) {
             $content .= "          <option ";
             if ($element == $num) {
@@ -295,12 +369,13 @@ class RouteSQL
         return $content;
     }
 
-    /** Display the search area
-      * @param integer $nbentries The number of entries
-      * @param integer $page The page number
-      * @param integer $num ???
-      * @param string $search The search query
-      */
+    /**
+     * Display the search area
+     * @param integer $nbentries The number of entries
+     * @param integer $page The page number
+     * @param integer $num ???
+     * @param string $search The search query
+     */
     private function searchArea($nbentries, $page, $num, $search)
     {
         $route = new Route();
@@ -316,12 +391,13 @@ class RouteSQL
         return $content;
     }
 
-    /** Display the information
-      * @param integer $nbentries The number of entries
-      * @param integer $page The page number
-      * @param integer $num ???
-      * @param string $search The search query
-      */
+    /**
+     * Display the information
+     * @param integer $nbentries The number of entries
+     * @param integer $page The page number
+     * @param integer $num ???
+     * @param string $search The search query
+     */
     private function informationArea($nbentries, $page, $num, $search)
     {
         $content = "";
@@ -346,7 +422,9 @@ class RouteSQL
         return $content;
     }
 
-    /** Create the routes for REST pages and the associated actions */
+    /**
+     * Create the routes for REST pages and the associated actions
+     */
     public function routesREST()
     {
         $route = new Route();
@@ -411,7 +489,7 @@ class RouteSQL
                 if (!isset($extension) || $extension === null || $extension === "") {
                     $extension = reset($this->extensionsAllowed);
                 }
-                if (!in_array($extension, $this->extensionsAllowed)) {
+                if (!in_array($extension, $this->extensionsAllowed, true)) {
                     throw new \Exception(dgettext(
                         "domframework",
                         "Extension not allowed"
@@ -423,7 +501,7 @@ class RouteSQL
                 unset($titles[$this->chainedForeign]);
                 $foreignSelect = null;
                 if ($this->chained !== null) {
-                    $foreignSelect = array(array($this->chainedForeign, $chain));
+                    $foreignSelect = [[$this->chainedForeign, $chain]];
                 }
                 if ($search === "") {
                     $data = $this->objectDB->read(
@@ -434,7 +512,7 @@ class RouteSQL
                         $foreignSelect
                     );
                 } else {
-                    $criteria = array();
+                    $criteria = [];
                     foreach (array_keys($titles) as $column) {
                         $s = $search;
                         if ($search[0] === "^") {
@@ -447,7 +525,7 @@ class RouteSQL
                         } else {
                             $s = "$s%";
                         }
-                        $criteria[] = array($column, "$s", "LIKE");
+                        $criteria[] = [$column, "$s", "LIKE"];
                     }
                     $data = $this->objectDB->read(
                         $criteria,
@@ -535,7 +613,7 @@ class RouteSQL
                 if (!isset($extension) || $extension === null || $extension === "") {
                     $extension = reset($this->extensionsAllowed);
                 }
-                if (!in_array($extension, $this->extensionsAllowed)) {
+                if (!in_array($extension, $this->extensionsAllowed, true)) {
                     throw new \Exception(dgettext(
                         "domframework",
                         "Extension not allowed"
@@ -543,17 +621,17 @@ class RouteSQL
                 }
                 $this->connect();
                 $values = $_POST;
-                $errorsChain = array();
+                $errorsChain = [];
                 if (
                     $this->chainedForeign !== null &&
                     isset($values[$this->chainedForeign]) &&
                     $values[$this->chainedForeign] !== $chain
                 ) {
                     $errorsChain[$this->chainedForeign] =
-                    array("error", dgettext(
+                    ["error", dgettext(
                         "domframework",
                         "Can not change the external key"
-                    ));
+                    )];
                 }
                 if ($this->chainedForeign !== null) {
                     $values[$this->chainedForeign] = $chain;
@@ -637,7 +715,7 @@ class RouteSQL
                 if (!isset($extension) || $extension === null || $extension === "") {
                     $extension = reset($this->extensionsAllowed);
                 }
-                if (!in_array($extension, $this->extensionsAllowed)) {
+                if (!in_array($extension, $this->extensionsAllowed, true)) {
                     throw new \Exception(dgettext(
                         "domframework",
                         "Extension not allowed"
@@ -645,17 +723,17 @@ class RouteSQL
                 }
                 $this->connect();
                 parse_str(file_get_contents("php://input"), $values);
-                $errorsChain = array();
+                $errorsChain = [];
                 if (
                     $this->chainedForeign !== null &&
                     isset($values[$this->chainedForeign]) &&
                     $values[$this->chainedForeign] !== $chain
                 ) {
                     $errorsChain[$this->chainedForeign] =
-                    array("error", dgettext(
+                    ["error", dgettext(
                         "domframework",
                         "Can not change the external key"
-                    ));
+                    )];
                 }
                 $errors = $this->objectDB->verify($values, $id);
                 if (count($errors) > 0 || count($errorsChain) > 0) {
@@ -736,7 +814,7 @@ class RouteSQL
                 if (!isset($extension) || $extension === null || $extension === "") {
                     $extension = reset($this->extensionsAllowed);
                 }
-                if (!in_array($extension, $this->extensionsAllowed)) {
+                if (!in_array($extension, $this->extensionsAllowed, true)) {
                     throw new \Exception(dgettext(
                         "domframework",
                         "Extension not allowed"
@@ -753,7 +831,9 @@ class RouteSQL
         );
     }
 
-    /** Create the routes for HTML pages and the associated actions */
+    /**
+     * Create the routes for HTML pages and the associated actions
+     */
     public function routesHTML()
     {
         // If chained routeSQL, the url_prefix must be adapted
@@ -767,7 +847,9 @@ class RouteSQL
             $this->url_prefix = $this->chained->url_prefix . "/{chain}/" .
                           $this->url_prefix;
         }
-        /** Add HTML routes */
+        /**
+         * Add HTML routes
+         */
         $route = new Route();
         $route->debug = $this->debug;
         ;
@@ -902,7 +984,7 @@ class RouteSQL
                 unset($titles[$this->chainedForeign]);
                 $foreignSelect = null;
                 if ($this->chained !== null) {
-                    $foreignSelect = array(array($this->chainedForeign, $chain));
+                    $foreignSelect = [[$this->chainedForeign, $chain]];
                 }
                 if ($search === "") {
                     $data = $this->objectDB->read(
@@ -913,7 +995,7 @@ class RouteSQL
                         $foreignSelect
                     );
                 } else {
-                    $criteria = array();
+                    $criteria = [];
                     foreach (array_keys($titles) as $column) {
                         $s = $search;
                         if ($search[0] === "^") {
@@ -926,7 +1008,7 @@ class RouteSQL
                         } else {
                             $s = "$s%";
                         }
-                        $criteria[] = array($column, "$s", "LIKE");
+                        $criteria[] = [$column, "$s", "LIKE"];
                     }
                     $data = $this->objectDB->read(
                         $criteria,
@@ -950,7 +1032,7 @@ class RouteSQL
 
                 // Get the non mandatory foreign keys and display them instead of the
                 // unusable id
-                $foreignData = array();
+                $foreignData = [];
                 if (isset($this->objectDB->foreign)) {
                     foreach ($this->objectDB->foreign as $foreign => $params) {
                         if (! isset($params[0])) {
@@ -970,10 +1052,10 @@ class RouteSQL
                         );
                         if (isset($foreignObject->unique)) {
                             $tmpData = $foreignObject->read(null, array_merge(
-                                array($column),
+                                [$column],
                                 $foreignObject->unique
                             ));
-                            $associated = array();
+                            $associated = [];
                             $unique = reset($foreignObject->unique);
                             foreach ($tmpData as $vals) {
                                 // TODO : If $foreignObject->unique is not an array ?
@@ -1458,7 +1540,7 @@ class RouteSQL
 
             // Get the non mandatory foreign keys and display them instead of the
             // unusable id
-            $foreignData = array();
+            $foreignData = [];
             if (isset($this->objectDB->foreign)) {
                 foreach ($this->objectDB->foreign as $foreign => $params) {
                     if (! isset($params[0])) {
@@ -1478,10 +1560,10 @@ class RouteSQL
                     );
                     if (isset($foreignObject->unique)) {
                         $tmpData = $foreignObject->read(null, array_merge(
-                            array($column),
+                            [$column],
                             $foreignObject->unique
                         ));
-                        $associated = array();
+                        $associated = [];
                         $unique = reset($foreignObject->unique);
                         foreach ($tmpData as $vals) {
                             // TODO : If $foreignObject->unique is not an array ?
@@ -1494,8 +1576,8 @@ class RouteSQL
             }
 
             $content = $this->showflash();
-            $values = array();
-            $errors = array();
+            $values = [];
+            $errors = [];
             $titles = $this->objectDB->titles();
             if (isset($_SESSION["domframework"]["routeSQL"]["errors"])) {
                 $errors = $_SESSION["domframework"]["routeSQL"]["errors"];
@@ -1609,7 +1691,7 @@ class RouteSQL
             }
 
             $f = new Form();
-            $fields = array();
+            $fields = [];
             foreach ($titles as $key => $val) {
                 $field = new Formfield($key, $val);
                 if (! isset($this->objectDB->fields[$key])) {
@@ -1621,10 +1703,10 @@ class RouteSQL
                         $key
                     ), 500);
                 }
-                if (in_array("not null", $this->objectDB->fields[$key])) {
+                if (in_array("not null", $this->objectDB->fields[$key], true)) {
                     $field->mandatory = true;
                 }
-                if (in_array("autoincrement", $this->objectDB->fields[$key])) {
+                if (in_array("autoincrement", $this->objectDB->fields[$key], true)) {
                     $field->type = "hidden";
                 }
                 if ($key === $this->chainedForeign) {
@@ -1716,17 +1798,17 @@ class RouteSQL
             $this->connect();
             $f = new Form();
             $values = $f->values();
-            $errorsChain = array();
+            $errorsChain = [];
             if (
                 $this->chainedForeign !== null &&
                 isset($values[$this->chainedForeign]) &&
                 $values[$this->chainedForeign] !== $chain
             ) {
                 $errorsChain[$this->chainedForeign] =
-                array("error", dgettext(
+                ["error", dgettext(
                     "domframework",
                     "Can not change the external key"
-                ));
+                )];
             }
             $errors = $this->objectDB->verify($values);
             if (count($errors) == 0 && count($errorsChain) == 0) {
@@ -1817,7 +1899,7 @@ class RouteSQL
             $this->connect();
             // Get the non mandatory foreign keys and display them instead of the
             // unusable id
-            $foreignData = array();
+            $foreignData = [];
             if (isset($this->objectDB->foreign)) {
                 foreach ($this->objectDB->foreign as $foreign => $params) {
                     if (! isset($params[0])) {
@@ -1837,10 +1919,10 @@ class RouteSQL
                     );
                     if (isset($foreignObject->unique)) {
                         $tmpData = $foreignObject->read(null, array_merge(
-                            array($column),
+                            [$column],
                             $foreignObject->unique
                         ));
-                        $associated = array();
+                        $associated = [];
                         $unique = reset($foreignObject->unique);
                         foreach ($tmpData as $vals) {
                             // TODO : If $foreignObject->unique is not an array ?
@@ -1852,11 +1934,11 @@ class RouteSQL
                 }
             }
             $content = $this->showflash();
-            $values = array();
-            $errors = array();
+            $values = [];
+            $errors = [];
             $titles = $this->objectDB->titles();
-            $values = $this->objectDB->read(array(array($this->objectDB->primary,
-                                       $id)));
+            $values = $this->objectDB->read([[$this->objectDB->primary,
+                                       $id]]);
             if (count($values) === 0) {
                 throw new \Exception(
                     dgettext("domframework", "Object not found"),
@@ -1976,7 +2058,7 @@ class RouteSQL
             }
 
             $f = new Form();
-            $fields = array();
+            $fields = [];
             foreach ($titles as $key => $val) {
                 $field = new Formfield($key, $val);
                 if (! isset($this->objectDB->fields[$key])) {
@@ -1988,10 +2070,10 @@ class RouteSQL
                         $key
                     ), 500);
                 }
-                if (in_array("not null", $this->objectDB->fields[$key])) {
+                if (in_array("not null", $this->objectDB->fields[$key], true)) {
                     $field->mandatory = true;
                 }
-                if (in_array("autoincrement", $this->objectDB->fields[$key])) {
+                if (in_array("autoincrement", $this->objectDB->fields[$key], true)) {
                     $field->type = "hidden";
                 }
                 if ($readonly === true || $this->readwriteAllowed === false) {
@@ -2086,7 +2168,7 @@ class RouteSQL
             }
 
             $this->connect();
-            $oldvalues = $this->objectDB->read(array(array($this->objectDB->primary, $id)));
+            $oldvalues = $this->objectDB->read([[$this->objectDB->primary, $id]]);
             if (count($oldvalues) === 0) {
                 throw new \Exception(
                     dgettext("domframework", "Object not found"),
@@ -2102,17 +2184,17 @@ class RouteSQL
                     "Can not change the primary key"
                 ), 403);
             }
-            $errorsChain = array();
+            $errorsChain = [];
             if (
                 $this->chainedForeign !== null &&
                 isset($values[$this->chainedForeign]) &&
                 $values[$this->chainedForeign] !== $chain
             ) {
                 $errorsChain[$this->chainedForeign] =
-                array("error", dgettext(
+                ["error", dgettext(
                     "domframework",
                     "Can not change the external key"
-                ));
+                )];
             }
             if ($this->chainedForeign !== null) {
                 $values[$this->chainedForeign] = $chain;
@@ -2150,11 +2232,12 @@ class RouteSQL
         });
     }
 
-    /** Authorization : Return TRUE if the user right allow to see the data
-      * Return FALSE else
-      * @param array $auth The auth to authenticate
-      * @param integer|null $id The id to examine
-      */
+    /**
+     * Authorization : Return TRUE if the user right allow to see the data
+     * Return FALSE else
+     * @param array $auth The auth to authenticate
+     * @param integer|null $id The id to examine
+     */
     public function accessright($auth, $id = null)
     {
         // echo "accessright=".var_export ($id, TRUE)." for ".
@@ -2177,11 +2260,12 @@ class RouteSQL
         return true;
     }
 
-    /** Authorization : Return TRUE if the user right allow to edit the data
-      * Return FALSE else
-      * @param array $auth The auth to authenticate
-      * @param integer|null $id The id to examine
-      */
+    /**
+     * Authorization : Return TRUE if the user right allow to edit the data
+     * Return FALSE else
+     * @param array $auth The auth to authenticate
+     * @param integer|null $id The id to examine
+     */
     public function editright($auth, $id = null)
     {
         // echo "editright=".var_export ($id, TRUE)." for ".
@@ -2201,11 +2285,12 @@ class RouteSQL
         return true;
     }
 
-    /** Authorization : Return TRUE if the $id is in READONLY for the user or
-      * FALSE if the user have the RW rights
-      * @param array $auth The auth to authenticate
-      * @param integer|null $id The id to examine
-      */
+    /**
+     * Authorization : Return TRUE if the $id is in READONLY for the user or
+     * FALSE if the user have the RW rights
+     * @param array $auth The auth to authenticate
+     * @param integer|null $id The id to examine
+     */
     public function readonly($auth, $id = null)
     {
         // echo "readonly=".var_export ($id, TRUE)." for ".
@@ -2225,30 +2310,32 @@ class RouteSQL
         return false;
     }
 
-    /** Return the data of the row if the $id exists in the primary key of the
-      * table
-      * Return FALSE in the other cases
-      * @param integer $id The id to examine
-      */
+    /**
+     * Return the data of the row if the $id exists in the primary key of the
+     * table
+     * Return FALSE in the other cases
+     * @param integer $id The id to examine
+     */
     public function keyexists($id)
     {
-        $data = $this->objectDB->read(array(array($this->objectDB->primary,
-                                                  $id)));
+        $data = $this->objectDB->read([[$this->objectDB->primary,
+                                                  $id]]);
         if (count($data) > 0) {
             return $data[0];
         }
         return false;
     }
 
-    /** Display the data in HTML with the view class/method if they are defined
-      * @param array $data The data to display
-      */
+    /**
+     * Display the data in HTML with the view class/method if they are defined
+     * @param array $data The data to display
+     */
     private function rendererhtml($data)
     {
         $route = new Route();
 
         $html = new Outputhtml();
-        $replacement = array("{baseurl}" => $route->baseURL());
+        $replacement = ["{baseurl}" => $route->baseURL()];
         if ($this->rendererHTMLlayout === false) {
             $this->rendererHTMLlayout = "<!DOCTYPE html>
 <html>
@@ -2274,11 +2361,12 @@ class RouteSQL
         exit;
     }
 
-    /** Return the result converted by JSON/XML, defined in REST
-      * @param string $extension The display method
-      * @param array $data The data to return
-      * @param integer $getCode The HTTP code to return (200 OK by default)
-      */
+    /**
+     * Return the result converted by JSON/XML, defined in REST
+     * @param string $extension The display method
+     * @param array $data The data to return
+     * @param integer $getCode The HTTP code to return (200 OK by default)
+     */
     private function renderrest($extension, $data, $getCode = 200)
     {
         $http = new Http();
diff --git a/src/Rss.php b/src/Rss.php
index b79b541..0eef980 100644
--- a/src/Rss.php
+++ b/src/Rss.php
@@ -1,47 +1,56 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Create the RSS pages for the websites
-  * Specification http://www.rssboard.org/rss-specification
-  *
-  * Will use RssItem class
-  */
+/**
+ * Create the RSS pages for the websites
+ * Specification http://www.rssboard.org/rss-specification
+ *
+ * Will use RssItem class
+ */
 class Rss
 {
-    /** The title of the site (MANDATORY)
-      */
+    /**
+     * The title of the site (MANDATORY)
+     */
     private $title;
 
-    /** The link (URL) to the site (MANDATORY)
-      */
+    /**
+     * The link (URL) to the site (MANDATORY)
+     */
     private $link;
 
-    /** The Description of the site (MANDATORY)
-      */
+    /**
+     * The Description of the site (MANDATORY)
+     */
     private $description;
 
-    /** The language of the feed
-      */
+    /**
+     * The language of the feed
+     */
     private $language;
 
-    /** The lastBuildDate
-      */
+    /**
+     * The lastBuildDate
+     */
     private $lastBuildDate;
 
-    /** The items linked to this RSS
-      */
-    private $items = array();
+    /**
+     * The items linked to this RSS
+     */
+    private $items = [];
 
-    /** Get/Set the value
-      * @param string|null $title The title to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $title The title to get/set
+     */
     public function title($title = null)
     {
         if ($title === null) {
@@ -57,9 +66,10 @@ class Rss
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $link The link to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $link The link to get/set
+     */
     public function link($link = null)
     {
         if ($link === null) {
@@ -79,9 +89,10 @@ class Rss
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $description The description to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $description The description to get/set
+     */
     public function description($description = null)
     {
         if ($description === null) {
@@ -97,9 +108,10 @@ class Rss
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $language The language to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $language The language to get/set
+     */
     public function language($language = null)
     {
         if ($language === null) {
@@ -111,7 +123,7 @@ class Rss
         if (
             ! in_array(
                 $language,
-                array("af", "sq", "eu", "be", "bg", "ca", "zh-cn", "zh-tw", "hr", "cs",
+                ["af", "sq", "eu", "be", "bg", "ca", "zh-cn", "zh-tw", "hr", "cs",
                 "da", "nl", "nl-be", "nl-nl", "en", "en-au", "en-bz", "en-ca",
                 "en-ie", "en-jm", "en-nz", "en-ph", "en-za", "en-tt", "en-gb",
                 "en-us", "en-zw", "et", "fo", "fi", "fr", "fr-be", "fr-ca",
@@ -122,7 +134,8 @@ class Rss
                 "ru-ru", "sr", "sk", "sl", "es", "es-ar", "es-bo", "es-cl",
                 "es-co", "es-cr", "es-do", "es-ec", "es-sv", "es-gt", "es-hn",
                 "es-mx", "es-ni", "es-pa", "es-py", "es-pe", "es-pr", "es-es",
-                "es-uy", "es-ve", "sv", "sv-fi", "sv-se", "tr", "uk")
+                "es-uy", "es-ve", "sv", "sv-fi", "sv-se", "tr", "uk"],
+                true
             )
         ) {
             throw new \Exception("Provided language for RSS is not allowed", 500);
@@ -134,10 +147,11 @@ class Rss
         return $this;
     }
 
-    /** Get/Set the value
-      * The date must be in the SQL format Y-m-d H:i:s
-      * @param string|null $lastBuildDate The lastBuildDate to get/set
-      */
+    /**
+     * Get/Set the value
+     * The date must be in the SQL format Y-m-d H:i:s
+     * @param string|null $lastBuildDate The lastBuildDate to get/set
+     */
     public function lastBuildDate($lastBuildDate = null)
     {
         if ($lastBuildDate === null) {
@@ -169,9 +183,10 @@ class Rss
         return $this;
     }
 
-    /** Add a new item to the RSS
-      * Return the new rss object created
-      */
+    /**
+     * Add a new item to the RSS
+     * Return the new rss object created
+     */
     public function addItem()
     {
         $rssitem = new RssItem();
@@ -179,9 +194,10 @@ class Rss
         return $rssitem;
     }
 
-    /** Return the complete RSS in XML format
-      * Throw an exception if there is some mandatory fields missing
-      */
+    /**
+     * Return the complete RSS in XML format
+     * Throw an exception if there is some mandatory fields missing
+     */
     public function asXML()
     {
         if ($this->title === null) {
diff --git a/src/RssItem.php b/src/RssItem.php
index 28560a3..f733088 100644
--- a/src/RssItem.php
+++ b/src/RssItem.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
@@ -15,37 +16,45 @@ namespace Domframework;
  */
 class RssItem
 {
-    /** The title of the item
-      */
+    /**
+     * The title of the item
+     */
     private $title;
 
-    /** The URL of the item
-      */
+    /**
+     * The URL of the item
+     */
     private $link;
 
-    /** The item synopsis
-      */
+    /**
+     * The item synopsis
+     */
     private $description;
 
-    /** Email address of the author of the item
-      */
+    /**
+     * Email address of the author of the item
+     */
     private $author;
 
-    /** URL of a page for comments relating to the item
-      */
+    /**
+     * URL of a page for comments relating to the item
+     */
     private $comments;
 
-    /** A string that uniquely identifies the item
-      */
+    /**
+     * A string that uniquely identifies the item
+     */
     private $guid;
 
-    /** Indicates when the item was published
-      */
+    /**
+     * Indicates when the item was published
+     */
     private $pubDate;
 
-    /** Get/Set the value
-      * @param string|null $title The title to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $title The title to get/set
+     */
     public function title($title = null)
     {
         if ($title === null) {
@@ -61,9 +70,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $link The link to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $link The link to get/set
+     */
     public function link($link = null)
     {
         if ($link === null) {
@@ -83,9 +93,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $description The description to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $description The description to get/set
+     */
     public function description($description = null)
     {
         if ($description === null) {
@@ -104,9 +115,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $author The author to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $author The author to get/set
+     */
     public function author($author = null)
     {
         if ($author === null) {
@@ -122,9 +134,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $comments The comments to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $comments The comments to get/set
+     */
     public function comments($comments = null)
     {
         if ($comments === null) {
@@ -143,9 +156,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $guid The guid to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $guid The guid to get/set
+     */
     public function guid($guid = null)
     {
         if ($guid === null) {
@@ -161,9 +175,10 @@ class RssItem
         return $this;
     }
 
-    /** Get/Set the value
-      * @param string|null $pubDate The pubDate to get/set
-      */
+    /**
+     * Get/Set the value
+     * @param string|null $pubDate The pubDate to get/set
+     */
     public function pubDate($pubDate = null)
     {
         if ($pubDate === null) {
diff --git a/src/Sitemap.php b/src/Sitemap.php
index 436e32f..8f772c9 100644
--- a/src/Sitemap.php
+++ b/src/Sitemap.php
@@ -1,34 +1,37 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to read the sitemaps files available in websites, and give
-  * the available URL and parameters
-  */
+/**
+ * This class allow to read the sitemaps files available in websites, and give
+ * the available URL and parameters
+ */
 class Sitemap
 {
-    /** Return an array containing the URL in sitemap associated with the
-      * information of priority and changefreq (in seconds)
-      * array (
-      *   "urls" => array (
-      *     [http://domain.tld/path...] => array (
-      *       "changefreq" => XX,
-      *       "priority" => ZZ),
-      *     ),
-      *   "sitemaps" => array (
-      *     [http://domain.tld/sitemap2] => array ("lastmod" => XX)
-      * ));
-      * The lastmod is return in time() based on UTC
-      * @param string $content The content file to analyze
-      * @param string $url The website URL
-      * @return array The content of the file if it is valid
-      */
+    /**
+     * Return an array containing the URL in sitemap associated with the
+     * information of priority and changefreq (in seconds)
+     * array (
+     *   "urls" => array (
+     *     [http://domain.tld/path...] => array (
+     *       "changefreq" => XX,
+     *       "priority" => ZZ),
+     *     ),
+     *   "sitemaps" => array (
+     *     [http://domain.tld/sitemap2] => array ("lastmod" => XX)
+     * ));
+     * The lastmod is return in time() based on UTC
+     * @param string $content The content file to analyze
+     * @param string $url The website URL
+     * @return array The content of the file if it is valid
+     */
     public function analyze($content, $url)
     {
         $finfo = new \finfo(FILEINFO_MIME_TYPE);
@@ -49,57 +52,59 @@ class Sitemap
         }
     }
 
-    /** Return an array containing the URL in sitemap associated with an empty
-      * array, as the Text format provide only URL, so return empty array.
-      * New sitemaps files can not be defined in text format.
-      * array (
-      *   "urls" => array (
-      *     [http://domain.tld/path...] => array (),
-      *   ),
-      *   "sitemaps" => array ()
-      * );
-      * @param string $content The content file to analyze
-      * @param string $url The website URL
-      * @return array The content of the file if it is valid
-      */
+    /**
+     * Return an array containing the URL in sitemap associated with an empty
+     * array, as the Text format provide only URL, so return empty array.
+     * New sitemaps files can not be defined in text format.
+     * array (
+     *   "urls" => array (
+     *     [http://domain.tld/path...] => array (),
+     *   ),
+     *   "sitemaps" => array ()
+     * );
+     * @param string $content The content file to analyze
+     * @param string $url The website URL
+     * @return array The content of the file if it is valid
+     */
     public function analyzeText($content, $url)
     {
         if (strlen($content) > 10000000) {
             trigger_error("Sitemap '$url' size is too big -> skip", E_USER_ERROR);
-            return array("urls" => array(), "sitemaps" => array());
+            return ["urls" => [], "sitemaps" => []];
         }
         $urls = preg_split('/\r\n|\r|\n/', trim($content));
-        if ($urls === array("")) {
-            $urls = array();
+        if ($urls === [""]) {
+            $urls = [];
         }
-        $urls = array_fill_keys($urls, array());
-        return array("urls" => $urls, "sitemaps" => array());
+        $urls = array_fill_keys($urls, []);
+        return ["urls" => $urls, "sitemaps" => []];
     }
 
-    /** Return an array containing the URL in sitemap associated with the
-      * information of priority and changefreq (in seconds)
-      * array (
-      *   "urls" => array (
-      *     [http://domain.tld/path...] => array (
-      *        "changefreq" => XX,
-      *        "priority" => ZZ),
-      *     ),
-      *   "sitemaps" => array (
-      *     [http://domain.tld/sitemap2] => array ("lastmod" => XX)
-      * ));
-      * @param string $content The content file to analyze
-      * @param string $url The website URL
-      * @return array The content of the file if it is valid
-      */
+    /**
+     * Return an array containing the URL in sitemap associated with the
+     * information of priority and changefreq (in seconds)
+     * array (
+     *   "urls" => array (
+     *     [http://domain.tld/path...] => array (
+     *        "changefreq" => XX,
+     *        "priority" => ZZ),
+     *     ),
+     *   "sitemaps" => array (
+     *     [http://domain.tld/sitemap2] => array ("lastmod" => XX)
+     * ));
+     * @param string $content The content file to analyze
+     * @param string $url The website URL
+     * @return array The content of the file if it is valid
+     */
     public function analyzeXML($content, $url)
     {
         if (strlen($content) > 10000000) {
             throw new \Exception("Sitemap '$url' size is too big -> skip", 406);
         }
         $xml = @simplexml_load_string($content);
-        $res = array("urls" => [], "sitemaps" => []);
+        $res = ["urls" => [], "sitemaps" => []];
         foreach ($xml->sitemap as $s) {
-            $tmp = array();
+            $tmp = [];
             if (! isset($s->loc)) {
                 trigger_error("No location in sitemap '$url'", E_USER_WARNING);
                 continue;
@@ -130,7 +135,7 @@ class Sitemap
             $res["sitemaps"][$loc] = $tmp;
         }
         foreach ($xml->url as $u) {
-            $tmp = array();
+            $tmp = [];
             if (! isset($u->loc)) {
                 trigger_error(
                     "No location in sitemap '$url' for url",
diff --git a/src/Smtp.php b/src/Smtp.php
index 28dfc61..456e386 100644
--- a/src/Smtp.php
+++ b/src/Smtp.php
@@ -1,64 +1,81 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Allow to send mails by smtp
-  */
+/**
+ * Allow to send mails by smtp
+ */
 class Smtp
 {
-    /** Debug mode
-      */
+    /**
+     * Debug mode
+     */
     public $debug = 0;
-    /** The debug file used to store all the communication between the client and
-      * the server. The file contains the passwords if used !
-      */
+    /**
+     * The debug file used to store all the communication between the client and
+     * the server. The file contains the passwords if used !
+     */
     public $debugFile = "/tmp/debugSMTP";
-    /** The authentication user allow to send SMTP mails
-      */
+    /**
+     * The authentication user allow to send SMTP mails
+     */
     public $user = null;
-    /** The authentication password allow to send SMTP mails
-      */
+    /**
+     * The authentication password allow to send SMTP mails
+     */
     public $password = null;
-    /** The SMTP server name or IP
-      */
+    /**
+     * The SMTP server name or IP
+     */
     public $server = "127.0.0.1";
-    /** The SMTP port to use (if false, use 25 if no SSL or 465 if SSL,
-      * if user defined, use the user value)
-      */
+    /**
+     * The SMTP port to use (if false, use 25 if no SSL or 465 if SSL,
+     * if user defined, use the user value)
+     */
     public $port = false;
-    /** The SMTPS support by tunnelling the session in SSL transport
-      */
+    /**
+     * The SMTPS support by tunnelling the session in SSL transport
+     */
     public $ssl = false;
-    /** Check the certification chain in SSL mode
-      */
+    /**
+     * Check the certification chain in SSL mode
+     */
     public $sslCheck = true;
-    /** The Timeout between the answer of the SMTP server. If the server don't
-      * answer in this time, an exception is raised
-      */
+    /**
+     * The Timeout between the answer of the SMTP server. If the server don't
+     * answer in this time, an exception is raised
+     */
     public $timeout = 10;
-    /** Activate STARTTLS if needed. Allowed values : none, may, encrypt
-      */
+    /**
+     * Activate STARTTLS if needed. Allowed values : none, may, encrypt
+     */
     public $starttls = "may";
-    /** Check the certificate in STARTTLS
-      */
+    /**
+     * Check the certificate in STARTTLS
+     */
     public $starttlsCheck = false;
-    /** The authentication methods in an array. Allowed : plain, login
-      */
-    public $authmethods = array("plain", "login");
-    /** The socket of the connection
-      */
+    /**
+     * The authentication methods in an array. Allowed : plain, login
+     */
+    public $authmethods = ["plain", "login"];
+    /**
+     * The socket of the connection
+     */
     private $smtpStream = null;
 
-    /** Connect to the SMTP server */
+    /**
+     * Connect to the SMTP server
+     */
     public function connect()
     {
-        $context = array();
+        $context = [];
         if ($this->ssl) {
             $this->server = "tls://$this->server";
             $context["ssl"]["verify_peer_name"] = $this->sslCheck;
@@ -100,7 +117,7 @@ class Smtp
         // Send EHLO
         $features = $this->putLine("EHLO " . gethostname() . "\r\n");
         $features = explode("\r\n", $features);
-        if (in_array("250-STARTTLS", $features)) {
+        if (in_array("250-STARTTLS", $features, true)) {
             // Server supports STARTTLS
             if ($this->starttls === "may" || $this->starttls === "encrypt") {
                 $this->putLine("STARTTLS\r\n");
@@ -136,14 +153,14 @@ class Smtp
         if ($this->user !== null && $this->password !== null) {
             $auths = preg_grep("#^250-AUTH #", $features);
             $auths = reset($auths);
-            if (strpos($auths, "PLAIN") && in_array("plain", $this->authmethods)) {
+            if (strpos($auths, "PLAIN") && in_array("plain", $this->authmethods, true)) {
                 // Send User and password AUTH PLAIN
                 $this->putLine("AUTH PLAIN " .
                         base64_encode($this->user . chr(0) . $this->user . chr(0) .
                                        $this->password) . "\r\n");
             } elseif (
                 strpos($auths, "LOGIN") &&
-                in_array("login", $this->authmethods)
+                in_array("login", $this->authmethods, true)
             ) {
                 // Send User and password AUTH LOGIN
                 $this->putLine("AUTH LOGIN " . base64_encode($this->user) . "\r\n");
@@ -160,10 +177,11 @@ class Smtp
         }
     }
 
-    /** Clean the provided mail and add the <> signs arround it
-      * @param string $mail The mail to clean
-      * @return string The cleaned mail
-      */
+    /**
+     * Clean the provided mail and add the <> signs arround it
+     * @param string $mail The mail to clean
+     * @return string The cleaned mail
+     */
     private function cleanMail($mail)
     {
         if (! is_string($mail)) {
@@ -182,14 +200,15 @@ class Smtp
         return $mail;
     }
 
-    /** Send the mail to the users
-      * @param string $from The email address used for the from enveloppe
-      * @param string|array $to the recipient of the email. Not displayed in the
-      *        email content
-      * @param string $completeMail The content of the email
-      * @return string the message from the server (where is stored the message queue
-      * identifier
-      */
+    /**
+     * Send the mail to the users
+     * @param string $from The email address used for the from enveloppe
+     * @param string|array $to the recipient of the email. Not displayed in the
+     *        email content
+     * @param string $completeMail The content of the email
+     * @return string the message from the server (where is stored the message queue
+     * identifier
+     */
     public function send($from, $to, $completeMail)
     {
         if ($this->smtpStream === null) {
@@ -227,8 +246,9 @@ class Smtp
         return $this->putLine("$completeMail.\r\n");
     }
 
-    /** Disconnect from the SMTP server
-      */
+    /**
+     * Disconnect from the SMTP server
+     */
     public function disconnect()
     {
         if ($this->smtpStream === null) {
@@ -244,8 +264,9 @@ class Smtp
         fclose($this->smtpStream);
     }
 
-    /** Reset the session to start a new mail in the same SMTP connection
-      */
+    /**
+     * Reset the session to start a new mail in the same SMTP connection
+     */
     public function reset()
     {
         if ($this->smtpStream === null) {
@@ -260,9 +281,10 @@ class Smtp
         $this->putLine("RSET\r\n");
     }
 
-    /** Send something to the SMTP server. Wait the acknoledgement line
-      * @param string $data The line to send to server
-      */
+    /**
+     * Send something to the SMTP server. Wait the acknoledgement line
+     * @param string $data The line to send to server
+     */
     private function putLine($data)
     {
         $this->debug("> $data");
@@ -270,9 +292,10 @@ class Smtp
         return $this->getLine($data);
     }
 
-    /** Wait something from the server
-      * @param string $message The answer to wait from server
-      */
+    /**
+     * Wait something from the server
+     * @param string $message The answer to wait from server
+     */
     private function getLine($message = "")
     {
         $this->debug("Waiting for " . rtrim($message) . " answer\n", 2);
@@ -302,10 +325,11 @@ class Smtp
         return $content;
     }
 
-    /** Save the connection debug in file
-      * @param string $message The message to save in debug
-      * @param integer|null $priority The priority to use
-      */
+    /**
+     * Save the connection debug in file
+     * @param string $message The message to save in debug
+     * @param integer|null $priority The priority to use
+     */
     private function debug($message, $priority = 1)
     {
         if ($this->debug == false) {
diff --git a/src/Spfcheck.php b/src/Spfcheck.php
index 1774322..2bc7ba4 100644
--- a/src/Spfcheck.php
+++ b/src/Spfcheck.php
@@ -1,68 +1,79 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to get a SPF record for a domain and check an IP against
-  * the rules set in SPF record.
-  * It also says in which rule the IP match
-  * RFC 7208
-  * SPF Format :
-  * v=spf1 (ip4:[0-9.]+(/\d+)|ip6:[0-9a-f:]+(/\d+)|mx(:\S+)|
-  *         a(:\S+)|
-  *         redirect=\S+|include:\S+)
-  */
+/**
+ * This class allow to get a SPF record for a domain and check an IP against
+ * the rules set in SPF record.
+ * It also says in which rule the IP match
+ * RFC 7208
+ * SPF Format :
+ * v=spf1 (ip4:[0-9.]+(/\d+)|ip6:[0-9a-f:]+(/\d+)|mx(:\S+)|
+ *         a(:\S+)|
+ *         redirect=\S+|include:\S+)
+ */
 class Spfcheck
 {
     ////////////////////
     //   PROPERTIES   //
     ////////////////////
-    /** The stack of errors detected
-      */
-    private $errors = array();
-    /** The [+-~]all parameter first get
-      */
+    /**
+     * The stack of errors detected
+     */
+    private $errors = [];
+    /**
+     * The [+-~]all parameter first get
+     */
     private $catchAll = "";
-    /** The domain catchAll
-      */
+    /**
+     * The domain catchAll
+     */
     private $catchAllDomain = "";
-    /** The rule matching the search
-      */
+    /**
+     * The rule matching the search
+     */
     private $matchRule = "";
-    /** The IP records get from SPF record
-      */
-    private $ipRecords = array();
-    /** Store all the DNS requests done
-      */
-    private $dnsRequests = array();
-    /** Store the number of DNS requests
-      */
+    /**
+     * The IP records get from SPF record
+     */
+    private $ipRecords = [];
+    /**
+     * Store all the DNS requests done
+     */
+    private $dnsRequests = [];
+    /**
+     * Store the number of DNS requests
+     */
     private $dnsCounter = 0;
-    /** Set the DNS maximum number of requests
-      */
+    /**
+     * Set the DNS maximum number of requests
+     */
     public const DNSREQUESTSMAX = 30;
 
     ////////////////////////
     //   PUBLIC METHODS   //
     ////////////////////////
-    /** Get all the IP entries set in all the blocks of the SPF for provided
-      * domain. Manage all the redirections, and get extract all the MX, IP4, IP6
-      * content.
-      * Set also the $this->errors and $this->catchAll properties available with
-      * the associated getters
-      * @param string $domain The domain to check
-      * @return array (The netmasks to match, the last all)
-      */
+    /**
+     * Get all the IP entries set in all the blocks of the SPF for provided
+     * domain. Manage all the redirections, and get extract all the MX, IP4, IP6
+     * content.
+     * Set also the $this->errors and $this->catchAll properties available with
+     * the associated getters
+     * @param string $domain The domain to check
+     * @return array (The netmasks to match, the last all)
+     */
     public function getRecords($domain)
     {
-        $this->errors = array();
+        $this->errors = [];
         $this->dnsCounter = 0;
-        $this->dnsRequests = array();
+        $this->dnsRequests = [];
         $this->catchAll = "";
         $this->ipRecords = $this->getRecordsRecurse($domain);
         if ($this->catchAll === "") {
@@ -74,12 +85,13 @@ class Spfcheck
         return $this->ipRecords;
     }
 
-    /** Try to match the provided IP address against the $domain SPF record to
-      * be get
-      * @param string $domain The domain to check
-      * @param string $ip The IPv4 or IPv6 address to check against the SPF record
-      * @return string PASS/FAIL/SOFTFAIL
-      */
+    /**
+     * Try to match the provided IP address against the $domain SPF record to
+     * be get
+     * @param string $domain The domain to check
+     * @param string $ip The IPv4 or IPv6 address to check against the SPF record
+     * @return string PASS/FAIL/SOFTFAIL
+     */
     public function ipCheckToSPF($domain, $ip)
     {
         $ips = $this->getRecords($domain);
@@ -154,52 +166,59 @@ class Spfcheck
     /////////////////
     //   GETTERS   //
     /////////////////
-    /** Get the errors detected when reading the SPF record
-      */
+    /**
+     * Get the errors detected when reading the SPF record
+     */
     public function getErrors()
     {
         return $this->errors;
     }
 
-    /** Get the DNS requests done to get the SPF records
-      */
+    /**
+     * Get the DNS requests done to get the SPF records
+     */
     public function getDNSRequests()
     {
         return $this->dnsRequests;
     }
 
-    /** Get the number of DNS queries
-      */
+    /**
+     * Get the number of DNS queries
+     */
     public function getDNSRequestNumber()
     {
         return $this->dnsCounter;
     }
 
-    /** Get default case (if set)
-      */
+    /**
+     * Get default case (if set)
+     */
     public function getDefaultCase()
     {
         return $this->catchAll;
     }
 
-    /** Get the matching rule when testing an IP against a SPF domain record
-      */
+    /**
+     * Get the matching rule when testing an IP against a SPF domain record
+     */
     public function getMatchRule()
     {
         return $this->matchRule;
     }
 
-    /** Get the IPs from the SPF records
-      */
+    /**
+     * Get the IPs from the SPF records
+     */
     public function getIpRecords()
     {
         return $this->ipRecords;
     }
 
-    /** Get the DNS values set for the provided $domain/$part(/$entity)
-      * @param string $search The search entity
-      * @return array|boolean The array of result from DNS or false if not exists
-      */
+    /**
+     * Get the DNS values set for the provided $domain/$part(/$entity)
+     * @param string $search The search entity
+     * @return array|boolean The array of result from DNS or false if not exists
+     */
     public function getDNSEntries($search)
     {
         if (! key_exists($search, $this->dnsRequests)) {
@@ -211,18 +230,19 @@ class Spfcheck
     /////////////////////////
     //   PRIVATE METHODS   //
     /////////////////////////
-    /** Get all the IP entries set in all the blocks of the SPF for provided
-      * domain. Manage all the redirections, and get extract all the MX, IP4, IP6
-      * content.
-      * Set also the $this->errors and $this->catchAll properties available with
-      * the associated getters
-      * Recursive, can be called by itself
-      * @param string $domain The domain to check
-      * @return array (The netmasks to match, the last all)
-      */
+    /**
+     * Get all the IP entries set in all the blocks of the SPF for provided
+     * domain. Manage all the redirections, and get extract all the MX, IP4, IP6
+     * content.
+     * Set also the $this->errors and $this->catchAll properties available with
+     * the associated getters
+     * Recursive, can be called by itself
+     * @param string $domain The domain to check
+     * @return array (The netmasks to match, the last all)
+     */
     private function getRecordsRecurse($domain)
     {
-        $records = array();
+        $records = [];
         $localAll = "";
         // TODO : Catch timeouts !
         foreach ($this->dns_get_record($domain, DNS_TXT, $domain) as $record) {
@@ -247,7 +267,7 @@ class Spfcheck
                 403
             );
         }
-        $ips = array();
+        $ips = [];
         foreach ($records as $domain => $record) {
             $split = preg_split("#\s+#", $record);
             foreach ($split as $nb => $part) {
@@ -255,7 +275,7 @@ class Spfcheck
                     continue;
                 }
                 // "redirect=" part
-                $ips[$domain][$part] = array();
+                $ips[$domain][$part] = [];
                 // Manage the sign in front of part
                 $sign = "";
                 if (
@@ -478,7 +498,7 @@ class Spfcheck
                     sort($ips[$domain][$sign . $part]);
                 } elseif (strtolower($part) === "all") {
                     // "-all" / "~all" / "+all" part
-                    $ips[$domain][$sign . $part] = array();
+                    $ips[$domain][$sign . $part] = [];
                     if ($localAll !== "") {
                         $this->errors [$domain][$sign . $part] =
                         sprintf(dgettext(
@@ -512,12 +532,13 @@ class Spfcheck
         return $ips;
     }
 
-    /** Get the requested hostname and get the type
-      * @param string $hostname The hostname to get
-      * @param integer $type The type to get
-      * @param string $domain The domain to impact the errors
-      * @return array (array (ip (for A), target (for TXT));
-      */
+    /**
+     * Get the requested hostname and get the type
+     * @param string $hostname The hostname to get
+     * @param integer $type The type to get
+     * @param string $domain The domain to impact the errors
+     * @return array (array (ip (for A), target (for TXT));
+     */
     private function dns_get_record($hostname, $type, $domain)
     {
         $typeStr = "";
@@ -548,7 +569,7 @@ class Spfcheck
             ), 500);
         }
         $this->dnsCounter++;
-        $res = array();
+        $res = [];
         if ($type === DNS_TXT) {
             foreach (dns_get_record($hostname, DNS_TXT) as $record) {
                 if (! isset($record["txt"])) {
diff --git a/src/Sse.php b/src/Sse.php
index 1aecc19..d472fd6 100644
--- a/src/Sse.php
+++ b/src/Sse.php
@@ -1,61 +1,69 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to manage Server-Sent Events
-  * The browser will be connected to a not ending loop. This loop will send
-  * ping regularly. If the backend value change, it will be sent to the
-  * browser.
-  * The backend will be a file for each event name. Each line of the file will
-  * be sent when it will be added
-  * See https://developer.mozilla.org/fr/docs/Web/API/Server-sent_events/
-  * The developper can use a handler to read/modify each event before it is
-  * send to the user.
-  */
+/**
+ * This class allow to manage Server-Sent Events
+ * The browser will be connected to a not ending loop. This loop will send
+ * ping regularly. If the backend value change, it will be sent to the
+ * browser.
+ * The backend will be a file for each event name. Each line of the file will
+ * be sent when it will be added
+ * See https://developer.mozilla.org/fr/docs/Web/API/Server-sent_events/
+ * The developper can use a handler to read/modify each event before it is
+ * send to the user.
+ */
 class Sse
 {
     //////////////////////////
     ////    PROPERTIES    ////
     //////////////////////////
-    /** The backend File to use
-      */
+    /**
+     * The backend File to use
+     */
     private $files;
 
-    /** Set the time between each ping (in seconds). 30 by default
-      */
+    /**
+     * Set the time between each ping (in seconds). 30 by default
+     */
     private $pingTime = 30;
 
-    /** The filepointers storage
-      */
-    private $fps = array();
+    /**
+     * The filepointers storage
+     */
+    private $fps = [];
 
-    /** The handlers storage
-      */
-    private $handlers = array();
-    /** The handlers parameters
-      */
-    private $handlersParams = array();
+    /**
+     * The handlers storage
+     */
+    private $handlers = [];
+    /**
+     * The handlers parameters
+     */
+    private $handlersParams = [];
 
     //////////////////////////////
     ////    SETTER METHODS    ////
     //////////////////////////////
-    /** The backend Files to use.
-      * The backend directory used to store the files must exists and be readable
-      * If array (namedEvent => filePath, "data" => dataFilePath);
-      * If string dataFilePath
-      * @param string|array $files The files to use
-      * @return $this
-      */
+    /**
+     * The backend Files to use.
+     * The backend directory used to store the files must exists and be readable
+     * If array (namedEvent => filePath, "data" => dataFilePath);
+     * If string dataFilePath
+     * @param string|array $files The files to use
+     * @return $this
+     */
     final public function setBackendFiles($files)
     {
         if (! is_array($files)) {
-            $files = array("data" => $files);
+            $files = ["data" => $files];
         }
         foreach ($files as $event => $file) {
             if (! file_exists(dirname($file))) {
@@ -84,10 +92,11 @@ class Sse
         return $this;
     }
 
-    /** The pingTime to use. Must be positive. If null, the ping is disabled
-      * @param integer|float $pingTime The time in seconds between two keepalive
-      * pings
-      */
+    /**
+     * The pingTime to use. Must be positive. If null, the ping is disabled
+     * @param integer|float $pingTime The time in seconds between two keepalive
+     * pings
+     */
     final public function setPingTime($pingTime)
     {
         if (! is_float($pingTime) && ! is_integer($pingTime)) {
@@ -112,11 +121,12 @@ class Sse
         return $this;
     }
 
-    /** The optional handler to use in DataOnly. Must be callable method
-      * @param callable|null $handler The handler
-      * If callable is null, remove the handler for this event
-      * @param mixed... $params The optional needed parameters
-      */
+    /**
+     * The optional handler to use in DataOnly. Must be callable method
+     * @param callable|null $handler The handler
+     * If callable is null, remove the handler for this event
+     * @param mixed... $params The optional needed parameters
+     */
     final public function setHandlerDataonly($handler, $params = null)
     {
         if (! is_callable($handler) && $handler !== null) {
@@ -132,15 +142,16 @@ class Sse
         return $this;
     }
 
-    /** The optional handler to use in Events. Must be array of callable methods
-      * @param array $handlers The handlers method, array[event=>callable]
-      * @param array|mixed $params The parameters of the handlers
-      * array[event=>callable]
-      * If callable is null, remove the handler for this event
-      * @param array|null $params The optional needed parameters
-      * array(event=>array(params))
-      * if event=>null is set, remove the parameters for the event
-      */
+    /**
+     * The optional handler to use in Events. Must be array of callable methods
+     * @param array $handlers The handlers method, array[event=>callable]
+     * @param array|mixed $params The parameters of the handlers
+     * array[event=>callable]
+     * If callable is null, remove the handler for this event
+     * @param array|null $params The optional needed parameters
+     * array(event=>array(params))
+     * if event=>null is set, remove the parameters for the event
+     */
     final public function setHandlersEvent($handlers, $params = null)
     {
         if (! is_array($handlers)) {
@@ -190,11 +201,12 @@ class Sse
     //////////////////////////////
     ////    PUBLIC METHODS    ////
     //////////////////////////////
-    /** This method is called by the user's browser.
-      * It send the "ping" each X second and send the backend content if it
-      * is updated.
-      * Never return !
-      */
+    /**
+     * This method is called by the user's browser.
+     * It send the "ping" each X second and send the backend content if it
+     * is updated.
+     * Never return !
+     */
     final public function loop()
     {
         if ($this->files === null) {
@@ -232,7 +244,7 @@ class Sse
                         key_exists($event, $this->handlers) &&
                         is_callable($this->handlers[$event])
                     ) {
-                        $array = array($line);
+                        $array = [$line];
                         if (key_exists($event, $this->handlersParams)) {
                             $array = array_merge($array, $this->handlersParams[$event]);
                         }
@@ -266,8 +278,9 @@ class Sse
     ///////////////////////////////
     ////    PRIVATE METHODS    ////
     ///////////////////////////////
-    /** Initialize the backend : open all the files and go at the end
-      */
+    /**
+     * Initialize the backend : open all the files and go at the end
+     */
     private function backendInit()
     {
         if ($this->files === null) {
@@ -285,11 +298,12 @@ class Sse
         }
     }
 
-    /** Get the pending lines from requested backend
-      * @param string $event The event to get data
-      * @return null if there is no new line pending
-      * @return string the data lines stored in the lines
-      */
+    /**
+     * Get the pending lines from requested backend
+     * @param string $event The event to get data
+     * @return null if there is no new line pending
+     * @return string the data lines stored in the lines
+     */
     private function backendGet($event)
     {
         // If the file was previously opened but doesn't exists anymore. Close it
@@ -322,11 +336,12 @@ class Sse
         return $res;
     }
 
-    /** Initialize the backend for one specific file.
-      * @param string $event The event to start
-      * @param string $filePath The file path where the event data are stored
-      * @return boolean false if the file doesn't exists
-      */
+    /**
+     * Initialize the backend for one specific file.
+     * @param string $event The event to start
+     * @param string $filePath The file path where the event data are stored
+     * @return boolean false if the file doesn't exists
+     */
     private function backendInitEvent($event, $filePath)
     {
         clearstatcache(true, $filePath);
diff --git a/src/StateMachine.php b/src/StateMachine.php
index a92c2ca..5a1b8fe 100644
--- a/src/StateMachine.php
+++ b/src/StateMachine.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
@@ -21,8 +22,8 @@ namespace Domframework;
  */
 class StateMachine
 {
-    private $states = array();
-    private $transitions = array();
+    private $states = [];
+    private $transitions = [];
     private $debug = false;
 
     public function addState(string $stateName, callable $methodName): self
diff --git a/src/StateMachineState.php b/src/StateMachineState.php
index 08eeb1b..47aedf0 100644
--- a/src/StateMachineState.php
+++ b/src/StateMachineState.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
diff --git a/src/StateMachineTransition.php b/src/StateMachineTransition.php
index a324614..ee40eab 100644
--- a/src/StateMachineTransition.php
+++ b/src/StateMachineTransition.php
@@ -1,10 +1,11 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
diff --git a/src/Tcpclient.php b/src/Tcpclient.php
index 5a75c28..be8cdb7 100644
--- a/src/Tcpclient.php
+++ b/src/Tcpclient.php
@@ -1,80 +1,91 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** TCP Client
-  * Allow to create TCP connections to a server.
-  * If both IPv6 and IPv4 are allowed by the server, try in IPv6 then back in
-  * IPv4 if it doesn't works.
-  * If the name of the server is provided instead of the IP, look for all the
-  * IP address, manage the CNAME aliases.
-  * If multiple addresses are available in IPv6 or IPv4, randomize them to allow
-  * round-robin connections to the server.
-  * Manage the timeout, send a command, receive a max number of bytes,
-  * allow SSL trafic with CA verification
-  */
+/**
+ * TCP Client
+ * Allow to create TCP connections to a server.
+ * If both IPv6 and IPv4 are allowed by the server, try in IPv6 then back in
+ * IPv4 if it doesn't works.
+ * If the name of the server is provided instead of the IP, look for all the
+ * IP address, manage the CNAME aliases.
+ * If multiple addresses are available in IPv6 or IPv4, randomize them to allow
+ * round-robin connections to the server.
+ * Manage the timeout, send a command, receive a max number of bytes,
+ * allow SSL trafic with CA verification
+ */
 class Tcpclient
 {
     //    PROPERTIES    //
-    /** The IPv6 allowed for the server
-      */
-    private $ipv6 = array();
+    /**
+     * The IPv6 allowed for the server
+     */
+    private $ipv6 = [];
 
-    /** The IPv4 allowed for the server
-      */
-    private $ipv4 = array();
+    /**
+     * The IPv4 allowed for the server
+     */
+    private $ipv4 = [];
 
-    /** The ipOrName parameter
-      */
+    /**
+     * The ipOrName parameter
+     */
     private $ipOrName = null;
 
-    /** The port to connect to the server
-      */
+    /**
+     * The port to connect to the server
+     */
     private $port = null;
 
-    /** Prefer the IPv4 connection either the IPv6 is valid
-      */
+    /**
+     * Prefer the IPv4 connection either the IPv6 is valid
+     */
     private $preferIPv4 = false;
 
-    /** The internal socket connected to the server
-      */
+    /**
+     * The internal socket connected to the server
+     */
     private $socket = null;
 
-    /** Read in Text mode or in Binary mode
-      */
+    /**
+     * Read in Text mode or in Binary mode
+     */
     private $readMode = "text";
 
-    /** The timeout before aborting the connection
-      * 30s by default
-      */
+    /**
+     * The timeout before aborting the connection
+     * 30s by default
+     */
     private $timeout = 30;
 
-    /** Initialize the object, by setting the name or the IP of the server
-      * @param string $ipOrName The IP or the name of the server
-      * @param integer $port The port of the server to connect
-      */
+    /**
+     * Initialize the object, by setting the name or the IP of the server
+     * @param string $ipOrName The IP or the name of the server
+     * @param integer $port The port of the server to connect
+     */
     public function __construct($ipOrName, $port)
     {
         $providedIpOrName = $ipOrName;
         if (filter_var($ipOrName, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            $this->ipv4 = array($ipOrName);
+            $this->ipv4 = [$ipOrName];
         } elseif (filter_var($ipOrName, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            $this->ipv6 = array($ipOrName);
+            $this->ipv6 = [$ipOrName];
         } else {
             $i = 0;
             while (empty($this->ipv4) && empty($this->ipv6) && $i < 10) {
                 $nsRecords = @dns_get_record($ipOrName, DNS_A + DNS_AAAA);
-                if ($nsRecords === false || $nsRecords == array()) {
+                if ($nsRecords === false || $nsRecords == []) {
                     // There is some problems with CNAME if they are not defined.
                     // So enter in this case only if there is no other solution
                     $nsRecords = @dns_get_record($ipOrName, DNS_CNAME);
-                    if ($nsRecords === false || $nsRecords == array()) {
+                    if ($nsRecords === false || $nsRecords == []) {
                         throw new \Exception("Can not find the IP for $ipOrName : " .
                         "DNS Error (No A, AAAA, CNAME entries)", 523);
                     }
@@ -112,10 +123,11 @@ class Tcpclient
         shuffle($this->ipv4);
     }
 
-    /** Set/get the preferIPv4 property
-      * @param boolean|null $preferIPv4 The preferIPv4 property to set (or to get
-      * if null)
-      */
+    /**
+     * Set/get the preferIPv4 property
+     * @param boolean|null $preferIPv4 The preferIPv4 property to set (or to get
+     * if null)
+     */
     public function preferIPv4($preferIPv4 = null)
     {
         if ($preferIPv4 === null) {
@@ -129,9 +141,10 @@ class Tcpclient
         return $this;
     }
 
-    /** Set/get the read mode : text or binary
-      * @param string|null $readMode The mode to set (or get if null)
-      */
+    /**
+     * Set/get the read mode : text or binary
+     * @param string|null $readMode The mode to set (or get if null)
+     */
     public function readMode($readMode = null)
     {
         if ($readMode === null) {
@@ -147,9 +160,10 @@ class Tcpclient
         return $this;
     }
 
-    /** Set/get the timeout
-      * @param integer|null $timeout The timeout in seconds
-      */
+    /**
+     * Set/get the timeout
+     * @param integer|null $timeout The timeout in seconds
+     */
     public function timeout($timeout = null)
     {
         if ($timeout === null) {
@@ -159,9 +173,10 @@ class Tcpclient
         return $this;
     }
 
-    /** Initialize the connection to the server
-      * Return the socket
-      */
+    /**
+     * Initialize the connection to the server
+     * Return the socket
+     */
     public function connect()
     {
         if ($this->preferIPv4) {
@@ -201,15 +216,16 @@ class Tcpclient
         $errstr, 500);
     }
 
-    /** Activate the SSL connection.
-      * Put the socket in blocking mode, as it is mandatory to have SSL connection
-      * @param boolean $val True to activate, false to disable SSL
-      * @param integer|null $cryptoMethod The cryptoMethod allowed
-      * @param array|null $options Can overload the SSL options if needed
-      * @return boolean false if the client can not found a encryption method
-      * with the server
-      */
-    public function cryptoEnable($val, $cryptoMethod = null, $options = array())
+    /**
+     * Activate the SSL connection.
+     * Put the socket in blocking mode, as it is mandatory to have SSL connection
+     * @param boolean $val True to activate, false to disable SSL
+     * @param integer|null $cryptoMethod The cryptoMethod allowed
+     * @param array|null $options Can overload the SSL options if needed
+     * @return boolean false if the client can not found a encryption method
+     * with the server
+     */
+    public function cryptoEnable($val, $cryptoMethod = null, $options = [])
     {
         if ($this->socket === null) {
             throw new \Exception("Can not send to server $this->ipOrName : " .
@@ -220,14 +236,14 @@ class Tcpclient
                       STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT |
                       STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
         }
-        $optionsBase = array("ssl" => array(
+        $optionsBase = ["ssl" => [
         "peer_name" => $this->ipOrName,
         "verify_peer" => true,
         "verify_peer_name" => true,
         "capture_peer_cert" => true,
         "capture_peer_cert_chain" => true,
         "SNI_enabled" => true,
-        ));
+        ]];
         $optionsMerged["ssl"] = array_merge($optionsBase["ssl"], $options);
         stream_set_blocking($this->socket, true);
         stream_context_set_option($this->socket, $optionsMerged);
@@ -242,10 +258,11 @@ class Tcpclient
         return $rc;
     }
 
-    /** Send a data to the server.
-      * The connection must be established
-      * @param mixed $data The data to send
-      */
+    /**
+     * Send a data to the server.
+     * The connection must be established
+     * @param mixed $data The data to send
+     */
     public function send($data)
     {
         if ($this->socket === null) {
@@ -261,14 +278,15 @@ class Tcpclient
         return $sentLen;
     }
 
-    /** Read the data from the server.
-      * The connection must be established
-      * Use the readMode in text or binary (text by default)
-      * In text mode, the read return when found the first \r\n, and doesn't
-      * returns the \r\n.
-      * @param integer $maxLength Limit the length of the data from the server
-      * @return string The content
-      */
+    /**
+     * Read the data from the server.
+     * The connection must be established
+     * Use the readMode in text or binary (text by default)
+     * In text mode, the read return when found the first \r\n, and doesn't
+     * returns the \r\n.
+     * @param integer $maxLength Limit the length of the data from the server
+     * @return string The content
+     */
     public function read($maxLength = 1024)
     {
         if ($this->socket === null) {
@@ -290,8 +308,9 @@ class Tcpclient
         return $read;
     }
 
-    /** Disconnect the socket
-      */
+    /**
+     * Disconnect the socket
+     */
     public function disconnect()
     {
         if ($this->socket === null) {
@@ -302,16 +321,18 @@ class Tcpclient
         $this->socket = null;
     }
 
-    /** Get meta data, like the timeout state, the crypto protocol and ciphers...
-      */
+    /**
+     * Get meta data, like the timeout state, the crypto protocol and ciphers...
+     */
     public function getMeta()
     {
         return stream_get_meta_data($this->socket);
     }
 
-    /** Get the connection peer address, peer port and localaddress and localport
-      * @return array
-      */
+    /**
+     * Get the connection peer address, peer port and localaddress and localport
+     * @return array
+     */
     public function getInfo()
     {
         if ($this->socket === null) {
@@ -326,12 +347,13 @@ class Tcpclient
         $pos = strrpos($name, ":");
         $port = substr($name, $pos + 1);
         $address = substr($name, 0, $pos);
-        return array($address, $port, $localAddress, $localPort);
+        return [$address, $port, $localAddress, $localPort];
     }
 
-    /** Get the socket to direct access
-      * @return resource The socket with the client
-      */
+    /**
+     * Get the socket to direct access
+     * @return resource The socket with the client
+     */
     public function getSock()
     {
         return $this->socket;
diff --git a/src/Tcpserver.php b/src/Tcpserver.php
index 9aef991..b60c412 100644
--- a/src/Tcpserver.php
+++ b/src/Tcpserver.php
@@ -1,68 +1,83 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to start a TCP server and call a function each time a
-  * client is connected on it. Each client is separated in a child, so the
-  * server allow to have multiple simultaneous connections.
-  *
-  * The handler method or function will get one parameter : the client from
-  * socket_accept. It will allow to use socket_getpeername to get the peer
-  * address and port, socket_read to get the data from the client,
-  * socket_write to write on the client, socket_shutdown ($client) and
-  *  socket_close ($client) to finish the connection
-  *
-  * The server has a child limit set to 500 connections by default
-  */
+/**
+ * This class allow to start a TCP server and call a function each time a
+ * client is connected on it. Each client is separated in a child, so the
+ * server allow to have multiple simultaneous connections.
+ *
+ * The handler method or function will get one parameter : the client from
+ * socket_accept. It will allow to use socket_getpeername to get the peer
+ * address and port, socket_read to get the data from the client,
+ * socket_write to write on the client, socket_shutdown ($client) and
+ *  socket_close ($client) to finish the connection
+ *
+ * The server has a child limit set to 500 connections by default
+ */
 class Tcpserver
 {
     ////////////////////
     //   PROPERTIES   //
     ////////////////////
-    /** Allow to debug with messages on screen
-      */
+    /**
+     * Allow to debug with messages on screen
+     */
     private $debug = false;
-    /** Store the data concerning the sockets and the handlers
-      */
-    private $handlers = array();
-    /** Store the addresses
-      */
-    private $addresses = array();
-    /** Store the ports
-      */
-    private $ports = array();
-    /** The max number of children. The maximum of concurrent connections
-      */
+    /**
+     * Store the data concerning the sockets and the handlers
+     */
+    private $handlers = [];
+    /**
+     * Store the addresses
+     */
+    private $addresses = [];
+    /**
+     * Store the ports
+     */
+    private $ports = [];
+    /**
+     * The max number of children. The maximum of concurrent connections
+     */
     private $maxChild = 500;
-    /** The timeout if not used a channel
-      */
+    /**
+     * The timeout if not used a channel
+     */
     private $timeout = 30;
-    /** Set to true in parent, and false in child
-      */
+    /**
+     * Set to true in parent, and false in child
+     */
     private $parent = true;
-    /** The socket in the child
-      */
+    /**
+     * The socket in the child
+     */
     private $socket = null;
-    /** Read in Text mode or in Binary mode
-      */
+    /**
+     * Read in Text mode or in Binary mode
+     */
     private $readMode = "text";
-    /** Stop the new connections
-      */
+    /**
+     * Stop the new connections
+     */
     private $loopStop = false;
-    /** The number of active clients
-      */
+    /**
+     * The number of active clients
+     */
     private $nbChild = 0;
-    /** The PID number when loop in background is active
-      */
+    /**
+     * The PID number when loop in background is active
+     */
     private $pidLoopInBackground;
-    /** Server name displayed in process list
-      */
+    /**
+     * Server name displayed in process list
+     */
     private $processName = "tcpserver";
 
     private $ipOrName;
@@ -70,25 +85,28 @@ class Tcpserver
     ////////////////////////
     //   PUBLIC METHODS   //
     ////////////////////////
-    /** The constructor add the error handler needed to catch the error on
-      * stream_select () when the process is killed
-      */
+    /**
+     * The constructor add the error handler needed to catch the error on
+     * stream_select () when the process is killed
+     */
     public function __construct()
     {
         $this->logDebug("NEW OBJECT CONSTRUCTED");
         set_error_handler([$this, 'errorHandler']);
     }
 
-    /** The destructor is a log for debug
-      */
+    /**
+     * The destructor is a log for debug
+     */
     public function __destruct()
     {
         $this->logDebug("Object destructed");
     }
 
-    /** Set/get the max children, the maximum of concurrent connections
-      * @param integer|null $val The number of child to get/set
-      */
+    /**
+     * Set/get the max children, the maximum of concurrent connections
+     * @param integer|null $val The number of child to get/set
+     */
     final public function maxChild($val = null)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -99,9 +117,10 @@ class Tcpserver
         return $this;
     }
 
-    /** Set/get the read mode : text or binary
-      * @param string|null $val The mode to set (or get if null)
-      */
+    /**
+     * Set/get the read mode : text or binary
+     * @param string|null $val The mode to set (or get if null)
+     */
     final public function readMode($val = null)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -118,9 +137,10 @@ class Tcpserver
         return $this;
     }
 
-    /** Set the process name displayed in system
-      * @param string|null $val The name of the process to set (or get if null)
-      */
+    /**
+     * Set the process name displayed in system
+     * @param string|null $val The name of the process to set (or get if null)
+     */
     final public function processName($val = null)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -131,9 +151,10 @@ class Tcpserver
         return $this;
     }
 
-    /** Set the timeout for open communication without any data transmited.
-      * @param string|null $val The number of seconds to set (or get if null)
-      */
+    /**
+     * Set the timeout for open communication without any data transmited.
+     * @param string|null $val The number of seconds to set (or get if null)
+     */
     final public function timeout($val = null)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -156,13 +177,14 @@ class Tcpserver
         return $this;
     }
 
-    /** Set the address, port and handler that will be enabled by loop
-      * @param string $address The server address (can be 0.0.0.0 for all IPv4
-      * interfaces or :: for all the IPv4 and IPv6 interfaces)
-      * @param integer $port The port to listen
-      * @param callable $handler The handler that will be called when a client is
-      * connected to the address:port
-      */
+    /**
+     * Set the address, port and handler that will be enabled by loop
+     * @param string $address The server address (can be 0.0.0.0 for all IPv4
+     * interfaces or :: for all the IPv4 and IPv6 interfaces)
+     * @param integer $port The port to listen
+     * @param callable $handler The handler that will be called when a client is
+     * connected to the address:port
+     */
     final public function init($address, $port, $handler)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -173,8 +195,9 @@ class Tcpserver
         return $this;
     }
 
-    /** Start the main loop after the init and keep in it until loopStop
-      */
+    /**
+     * Start the main loop after the init and keep in it until loopStop
+     */
     final public function loop()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -347,19 +370,21 @@ class Tcpserver
         }
     }
 
-    /** Request the loop to stop. Will not allow new connections, but wait the
-      * end of the existing processus
-      * Block until all is closed
-      */
+    /**
+     * Request the loop to stop. Will not allow new connections, but wait the
+     * end of the existing processus
+     * Block until all is closed
+     */
     final public function loopStop()
     {
         $this->logMethods(__METHOD__, func_get_args());
         $this->loopStop = true;
     }
 
-    /** Start the main loop in background and do not wait its end
-      * @return integer the PID of the child
-      */
+    /**
+     * Start the main loop in background and do not wait its end
+     * @return integer the PID of the child
+     */
     final public function loopInBackgroundStart()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -389,8 +414,9 @@ class Tcpserver
         exit;
     }
 
-    /** Stop the main loop in background and wait until its end
-      */
+    /**
+     * Stop the main loop in background and wait until its end
+     */
     final public function loopInBackgroundStop()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -400,9 +426,10 @@ class Tcpserver
         $this->logDebug("Request loopInBackgroundStop : END");
     }
 
-    /** In child, get the socket to direct access
-      * @return resource The socket with the client
-      */
+    /**
+     * In child, get the socket to direct access
+     * @return resource The socket with the client
+     */
     final public function getSock()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -415,11 +442,12 @@ class Tcpserver
         return $this->socket;
     }
 
-    /** Get an array with the peer address, peer port, local address and local
-      * port
-      * @return array array ("peer address", peer port, "local address", local
-      * port)
-      */
+    /**
+     * Get an array with the peer address, peer port, local address and local
+     * port
+     * @return array array ("peer address", peer port, "local address", local
+     * port)
+     */
     final public function getInfo()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -443,14 +471,15 @@ class Tcpserver
         if (substr($localAddress, 0, 7) === "[::ffff:") {
             $localAddress = substr($localAddress, 8, -1);
         }
-        return array($address, $port, $localAddress, $localPort);
+        return [$address, $port, $localAddress, $localPort];
     }
 
-    /** Activate the SSL connection
-      * Put the socket in blocking mode, as it is mandatory to have SSL connection
-      * @param boolean $val True to activate, false to disable SSL
-      * @param integer $cryptoMethod The cryptoMethod allowed
-      */
+    /**
+     * Activate the SSL connection
+     * Put the socket in blocking mode, as it is mandatory to have SSL connection
+     * @param boolean $val True to activate, false to disable SSL
+     * @param integer $cryptoMethod The cryptoMethod allowed
+     */
     final public function cryptoEnable(
         $val,
         $cryptoMethod = STREAM_CRYPTO_METHOD_TLS_SERVER
@@ -462,17 +491,18 @@ class Tcpserver
         }
         // Setting the options allow the IP to be decided by the connect and valid
         // the certificate of the server by the name
-        $options = array("ssl" => array(
+        $options = ["ssl" => [
         "verify_peer_name" => false,
-        ));
+        ]];
         stream_set_blocking($this->socket, true);
         stream_context_set_option($this->socket, $options);
         return @stream_socket_enable_crypto($this->socket, !!$val, $cryptoMethod);
     }
 
-    /** Set context SSL option.
-      * @param array $options The ssl array to set
-      */
+    /**
+     * Set context SSL option.
+     * @param array $options The ssl array to set
+     */
     final public function setSSLOptions($options)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -480,13 +510,14 @@ class Tcpserver
             throw new \Exception("Can not send to server $this->ipOrName : " .
             "The server is not connected", 500);
         }
-        return stream_context_set_option($this->socket, array("ssl" => $options));
+        return stream_context_set_option($this->socket, ["ssl" => $options]);
     }
 
-    /** Send data to the client
-      * @param mixed $data The data to send
-      * @return the length of data sent
-      */
+    /**
+     * Send data to the client
+     * @param mixed $data The data to send
+     * @return the length of data sent
+     */
     final public function send($data)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -505,13 +536,14 @@ class Tcpserver
         return $sentLen;
     }
 
-    /** Read the data from the client.
-      * The connection must be established
-      * Use the readMode in text or binary (text by default)
-      * In text mode, the read return when found the first \r or the first \n.
-      * @param integer $maxLength Limit the length of the data from the server
-      * @return string The content
-      */
+    /**
+     * Read the data from the client.
+     * The connection must be established
+     * Use the readMode in text or binary (text by default)
+     * In text mode, the read return when found the first \r or the first \n.
+     * @param integer $maxLength Limit the length of the data from the server
+     * @return string The content
+     */
     final public function read($maxLength = 1024)
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -540,8 +572,9 @@ class Tcpserver
         return $read;
     }
 
-    /** Disconnect the socket
-      */
+    /**
+     * Disconnect the socket
+     */
     final public function disconnect()
     {
         $this->logMethods(__METHOD__, func_get_args());
@@ -555,10 +588,11 @@ class Tcpserver
         $this->socket = null;
     }
 
-    /** Log the data send to the client. By default, do nothing, but can be
-      * overrided by the user
-      * @param string $data The data to store in log
-      */
+    /**
+     * Log the data send to the client. By default, do nothing, but can be
+     * overrided by the user
+     * @param string $data The data to store in log
+     */
     public function logSend($data)
     {
         if (! $this->debug) {
@@ -569,10 +603,11 @@ class Tcpserver
         "] S> $data", FILE_APPEND);
     }
 
-    /** Log the data received from the client. By default, do nothing, but can be
-      * overrided by the user
-      * @param string $data The data to store in log
-      */
+    /**
+     * Log the data received from the client. By default, do nothing, but can be
+     * overrided by the user
+     * @param string $data The data to store in log
+     */
     public function logReceive($data)
     {
         if (! $this->debug) {
@@ -583,11 +618,12 @@ class Tcpserver
         "] C> $data", FILE_APPEND);
     }
 
-    /** Log the methods called. By default, do nothing, but can be overrided by
-      * the user
-      * @param string $method The data to store in log
-      * @param mixed|null $args The data to store in log
-      */
+    /**
+     * Log the methods called. By default, do nothing, but can be overrided by
+     * the user
+     * @param string $method The data to store in log
+     * @param mixed|null $args The data to store in log
+     */
     public function logMethods($method, $args)
     {
         if (! $this->debug) {
@@ -621,9 +657,10 @@ class Tcpserver
         "] METHOD $data", FILE_APPEND);
     }
 
-    /** Log the debug, By defaul do nothing, but can be overrided by the user
-      * @param mixed|null $params The data to store in log
-      */
+    /**
+     * Log the debug, By defaul do nothing, but can be overrided by the user
+     * @param mixed|null $params The data to store in log
+     */
     public function logDebug($params)
     {
         if (! $this->debug) {
@@ -633,9 +670,10 @@ class Tcpserver
         "] DEBUG  $params\n", FILE_APPEND);
     }
 
-    /** Log the errors, By defaul do nothing, but can be overrided by the user
-      * @param mixed|null $params The data to store in log
-      */
+    /**
+     * Log the errors, By defaul do nothing, but can be overrided by the user
+     * @param mixed|null $params The data to store in log
+     */
     public function logError($params)
     {
         if (! $this->debug) {
@@ -645,13 +683,14 @@ class Tcpserver
         "] ERROR  $params\n", FILE_APPEND);
     }
 
-    /** Error catcher.
-      * By default, do nothing, but can be overrided by the user
-      * @param integer $errNo The error number
-      * @param string $errMsg The error message
-      * @param string $file The file name
-      * @param integer $line The line where the error raised
-      */
+    /**
+     * Error catcher.
+     * By default, do nothing, but can be overrided by the user
+     * @param integer $errNo The error number
+     * @param string $errMsg The error message
+     * @param string $file The file name
+     * @param integer $line The line where the error raised
+     */
     public function errorHandler($errNo, $errMsg, $file, $line)
     {
         // @-operator : error suppressed
@@ -661,19 +700,21 @@ class Tcpserver
         $this->logError("line $line : $errMsg");
     }
 
-    /** Exception catcher
-      * By default do nothing, but can be overrided by the user
-      * @param object $exception The exception to catch
-      */
+    /**
+     * Exception catcher
+     * By default do nothing, but can be overrided by the user
+     * @param object $exception The exception to catch
+     */
     public function exceptionHandler($exception)
     {
         $this->logError("Exception " . $exception->getMessage() . " (" .
         $exception->getFile() . ":" . $exception->getLine() . ")");
     }
 
-    /** Manage the timeout handler
-      * By default, disconnect and generate an exception
-      */
+    /**
+     * Manage the timeout handler
+     * By default, disconnect and generate an exception
+     */
     public function timeoutHandler()
     {
         $this->disconnect();
@@ -686,8 +727,9 @@ class Tcpserver
     /////////////////////////
     //   PRIVATE METHODS   //
     /////////////////////////
-    /** Manage the child stop signal
-      */
+    /**
+     * Manage the child stop signal
+     */
     private function sigCHLD()
     {
         $this->nbChild --;
@@ -698,10 +740,11 @@ class Tcpserver
         $this->logDebug("One child finished : $rc");
     }
 
-    /** Manage the term / int signals
-      * Will catch the stop signal, but the real end will be done when the last
-      * child will be closed
-      */
+    /**
+     * Manage the term / int signals
+     * Will catch the stop signal, but the real end will be done when the last
+     * child will be closed
+     */
     private function sigTERMINT()
     {
         $this->logDebug("Request TERM/INT : Wait for last childs");
diff --git a/src/Users.php b/src/Users.php
index 7cda67e..0c26745 100644
--- a/src/Users.php
+++ b/src/Users.php
@@ -2,98 +2,109 @@
 
 /**
  * DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** The abstraction class of the users
-  * Allow to manage the users in multiple storages (SQL, HTPasswd, passwd file).
-  * CRUD the users and allow to modify the password
-  */
+/**
+ * The abstraction class of the users
+ * Allow to manage the users in multiple storages (SQL, HTPasswd, passwd file).
+ * CRUD the users and allow to modify the password
+ */
 class Users
 {
-    /** Connect to the storage
-      */
+    /**
+     * Connect to the storage
+     */
     public function connect()
     {
     }
 
-    /** Initialise the storage
-      * Create the structure of data needed to the class
-      */
+    /**
+     * Initialise the storage
+     * Create the structure of data needed to the class
+     */
     public function initStorage()
     {
     }
 
-    /** Create a new user
-      * If the password is not provided, create a default passwd (can be disable
-      * password)
-      * @param string $email The email to create
-      * @param string $firstname The firstname to create
-      * @param string $lastname The lastname to create
-      * @param string|null $password The password of the user
-      */
+    /**
+     * Create a new user
+     * If the password is not provided, create a default passwd (can be disable
+     * password)
+     * @param string $email The email to create
+     * @param string $firstname The firstname to create
+     * @param string $lastname The lastname to create
+     * @param string|null $password The password of the user
+     */
     public function adduser($email, $firstname, $lastname, $password = null)
     {
     }
 
-    /** Delete a user
-      * @param string $email The email to delete
-      */
+    /**
+     * Delete a user
+     * @param string $email The email to delete
+     */
     public function deluser($email)
     {
     }
 
-    /** Update a user
-      * @param string $oldemail The old email to update
-      * @param string $newemail The new mail to store
-      * @param string $firstname The new firstname to store
-      * @param string $lastname The lastname to store
-      */
+    /**
+     * Update a user
+     * @param string $oldemail The old email to update
+     * @param string $newemail The new mail to store
+     * @param string $firstname The new firstname to store
+     * @param string $lastname The lastname to store
+     */
     public function updateuser($oldemail, $newemail, $firstname, $lastname)
     {
     }
 
-    /** List the users
-      */
+    /**
+     * List the users
+     */
     public function listusers()
     {
     }
 
-    /** Change password
-      * @param string $email the user email to change the password
-      * @param string $oldpassword The old password (to check if the user have the
-      *    rights to change the password)
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Change password
+     * @param string $email the user email to change the password
+     * @param string $oldpassword The old password (to check if the user have the
+     *    rights to change the password)
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($email, $oldpassword, $newpassword)
     {
     }
 
-    /** Overwrite password (without oldpassword check)
-      * Must be reserved to the administrators. For the users, use changepassword
-      * method
-      * @param string $email the user email to change the password
-      * @param string $newpassword The new password to be recorded
-      */
+    /**
+     * Overwrite password (without oldpassword check)
+     * Must be reserved to the administrators. For the users, use changepassword
+     * method
+     * @param string $email the user email to change the password
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
     }
 
-    /** Check if the provided password is correctely associated to the email user
-      * @param string $email The email to validate
-      * @param string $password The password to validate
-      */
+    /**
+     * Check if the provided password is correctely associated to the email user
+     * @param string $email The email to validate
+     * @param string $password The password to validate
+     */
     public function checkValidPassword($email, $password)
     {
     }
 
-    /** Check if the user provided is correct
-      * @param string $email The email to validate
-      */
+    /**
+     * Check if the user provided is correct
+     * @param string $email The email to validate
+     */
     public function checkEmail($email)
     {
         if (! is_string($email)) {
@@ -126,9 +137,10 @@ class Users
         return true;
     }
 
-    /** Check if the firstname provided is correct
-      * @param string $firstname The firstname to check
-      */
+    /**
+     * Check if the firstname provided is correct
+     * @param string $firstname The firstname to check
+     */
     public function checkFirstname($firstname)
     {
         if (! is_string($firstname)) {
@@ -161,9 +173,10 @@ class Users
         return true;
     }
 
-    /** Check if the lastname provided is correct
-      * @param string $lastname The lastname to check
-      */
+    /**
+     * Check if the lastname provided is correct
+     * @param string $lastname The lastname to check
+     */
     public function checkLastname($lastname)
     {
         if (! is_string($lastname)) {
@@ -187,9 +200,10 @@ class Users
         return true;
     }
 
-    /** Check if the password provided is correct
-      * @param string $password The password to check
-      */
+    /**
+     * Check if the password provided is correct
+     * @param string $password The password to check
+     */
     public function checkPassword($password)
     {
         if (! is_string($password)) {
@@ -222,9 +236,10 @@ class Users
         return true;
     }
 
-    /** Crypt the password with the best algorithm available
-      * @param string $password The password to crypt
-      */
+    /**
+     * Crypt the password with the best algorithm available
+     * @param string $password The password to crypt
+     */
     public function cryptPasswd($password)
     {
         if (! function_exists("openssl_random_pseudo_bytes")) {
@@ -239,19 +254,20 @@ class Users
         $cost = 11;
         $salt = substr(base64_encode(openssl_random_pseudo_bytes(17)), 0, 22);
         $salt = str_replace("+", ".", $salt);
-        $param = '$' . implode('$', array(
-             "2y", //select the most secure version of blowfish (>=PHP 5.3.7)
-             str_pad($cost, 2, "0", STR_PAD_LEFT), //add the cost in two digits
-             $salt //add the salt
-        ));
+        $param = '$' . implode('$', [
+            "2y", //select the most secure version of blowfish (>=PHP 5.3.7)
+            str_pad($cost, 2, "0", STR_PAD_LEFT), //add the cost in two digits
+            $salt //add the salt
+        ]);
         //now do the actual hashing
         return crypt($password, $param);
     }
 
-    /** Check if the password is enough complex
-      * Return True if the password is enough complex
-      * @param string $password The password to check
-      */
+    /**
+     * Check if the password is enough complex
+     * Return True if the password is enough complex
+     * @param string $password The password to check
+     */
     public function passwdComplexity($password)
     {
     }
diff --git a/src/Userssql.php b/src/Userssql.php
index 3727de4..409d01e 100644
--- a/src/Userssql.php
+++ b/src/Userssql.php
@@ -1,52 +1,80 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework.
+ *
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Store the users in SQL database. Manage the creation of the users,
-  * modification, delete, password management
-  */
+/**
+ * Store the users in SQL database. Manage the creation of the users,
+ * modification, delete, password management.
+ */
 class Userssql extends Users
 {
-    /** The database connector */
+    /**
+     * The database connector.
+     */
     private $dsn;
-    /** The user needed to connect to database */
+    /**
+     * The user needed to connect to database.
+     */
     private $username;
-    /** The password needed to connect to database */
+    /**
+     * The password needed to connect to database.
+     */
     private $password;
-    /** The optional drivers need by the database */
+    /**
+     * The optional drivers need by the database.
+     */
     private $driver_options;
-    /** The db connector */
+    /**
+     * The db connector.
+     */
     private $db;
 
-    /** The table to store the information */
-    public $table = "authusers";
-    /** The tableprefix text to prepend to table name (Should finish by _)
-        Just allow chars ! */
-    public $tableprefix = "";
+    /**
+     * The table to store the information.
+     */
+    public $table = 'authusers';
+    /**
+     * The tableprefix text to prepend to table name (Should finish by _).
+     * Just allow chars !
+     */
+    public $tableprefix = '';
 
-    /** The email field in the database */
-    public $fieldEmail = "email";
-    /** The firstname field in the database */
-    public $fieldFirstname = "firstname";
-    /** The lastname field in the database */
-    public $fieldLastname = "lastname";
-    /** The password field in the database */
-    public $fieldPassword = "password";
-    /** The lastchange field in the database */
-    public $fieldLastchange = "lastchange";
+    /**
+     * The email field in the database.
+     */
+    public $fieldEmail = 'email';
+    /**
+     * The firstname field in the database.
+     */
+    public $fieldFirstname = 'firstname';
+    /**
+     * The lastname field in the database.
+     */
+    public $fieldLastname = 'lastname';
+    /**
+     * The password field in the database.
+     */
+    public $fieldPassword = 'password';
+    /**
+     * The lastchange field in the database.
+     */
+    public $fieldLastchange = 'lastchange';
 
-    /** The constructor. Save the parameters to connect to the database
-      * @param string $dsn The DSN to connect
-      * @param string|null $username The username to connect
-      * @param string|null $password The password to connect
-      * @param array|null $driver_options The optional drivers parameters
-      */
+    /**
+     * The constructor. Save the parameters to connect to the database.
+     *
+     * @param string      $dsn            The DSN to connect
+     * @param string|null $username       The username to connect
+     * @param string|null $password       The password to connect
+     * @param array|null  $driver_options The optional drivers parameters
+     */
     public function __construct(
         $dsn,
         $username = null,
@@ -59,44 +87,28 @@ class Userssql extends Users
         $this->driver_options = $driver_options;
     }
 
-    /** Connect to the storage */
+    /**
+     * Connect to the storage.
+     */
     public function connect()
     {
-        if ($this->table === null) {
-            throw new \Exception(
-                dgettext("domframework", "No SQL table defined"),
-                500
-            );
+        if (null === $this->table) {
+            throw new \Exception(dgettext('domframework', 'No SQL table defined'), 500);
         }
-        if ($this->fieldEmail === null) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No fieldIdentifier defined"
-            ), 500);
+        if (null === $this->fieldEmail) {
+            throw new \Exception(dgettext('domframework', 'No fieldIdentifier defined'), 500);
         }
-        if ($this->fieldPassword === null) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No fieldPassword defined"
-            ), 500);
+        if (null === $this->fieldPassword) {
+            throw new \Exception(dgettext('domframework', 'No fieldPassword defined'), 500);
         }
-        if ($this->fieldLastname === null) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No fieldLastname defined"
-            ), 500);
+        if (null === $this->fieldLastname) {
+            throw new \Exception(dgettext('domframework', 'No fieldLastname defined'), 500);
         }
-        if ($this->fieldFirstname === null) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No fieldFirstname defined"
-            ), 500);
+        if (null === $this->fieldFirstname) {
+            throw new \Exception(dgettext('domframework', 'No fieldFirstname defined'), 500);
         }
-        if ($this->fieldLastchange === null) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No fieldLastchange defined"
-            ), 500);
+        if (null === $this->fieldLastchange) {
+            throw new \Exception(dgettext('domframework', 'No fieldLastchange defined'), 500);
         }
         $this->db = new Dblayer(
             $this->dsn,
@@ -105,189 +117,193 @@ class Userssql extends Users
             $this->driver_options
         );
         $this->db->table = $this->table;
-        $this->db->fields = array(
-        $this->fieldEmail => array("varchar", "255", "not null"),
-        $this->fieldFirstname => array("varchar", "255", "not null"),
-        $this->fieldLastname => array("varchar", "255"),
-        $this->fieldPassword => array("varchar", "255"),
-        $this->fieldLastchange => array("datetime"));
+        $this->db->fields = [
+            $this->fieldEmail => ['varchar', '255', 'not null'],
+            $this->fieldFirstname => ['varchar', '255', 'not null'],
+            $this->fieldLastname => ['varchar', '255'],
+            $this->fieldPassword => ['varchar', '255'],
+            $this->fieldLastchange => ['datetime']];
         $this->db->primary = $this->fieldEmail;
-        $this->db->unique = array($this->fieldEmail);
+        $this->db->unique = [$this->fieldEmail];
         $this->db->tableprefix = $this->tableprefix;
     }
 
-    /** Initialise the storage
-        Create the structure of data needed to the class */
+    /**
+     * Initialise the storage.
+     * Create the structure of data needed to the class
+     */
     public function initStorage()
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
+
         return $this->db->createTable();
     }
 
-    /** Create a new user
-      * If the password is not provided, create a default passwd (can be disable
-      * password)
-      * @param string $email The email to add
-      * @param string $firstname The firstname to add
-      * @param string $lastname The lastname to add
-      * @param string|null $password The password of the user
-      */
+    /**
+     * Create a new user
+     * If the password is not provided, create a default passwd (can be disable
+     * password).
+     *
+     * @param string      $email     The email to add
+     * @param string      $firstname The firstname to add
+     * @param string      $lastname  The lastname to add
+     * @param string|null $password  The password of the user
+     */
     public function adduser($email, $firstname, $lastname, $password = null)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($email);
         $this->checkFirstname($firstname);
         $this->checkLastname($lastname);
-        if ($password !== null) {
+        if (null !== $password) {
             $this->checkPassword($password);
             $password = $this->cryptPasswd($password);
         }
-        return $this->db->insert(array($this->fieldEmail => $email,
-                                     $this->fieldFirstname => $firstname,
-                                     $this->fieldLastname => $lastname,
-                                     $this->fieldPassword => $password));
+
+        return $this->db->insert([$this->fieldEmail => $email,
+            $this->fieldFirstname => $firstname,
+            $this->fieldLastname => $lastname,
+            $this->fieldPassword => $password]);
     }
 
-    /** Delete a user
-      * @param string $email The email to remove
-      */
+    /**
+     * Delete a user.
+     *
+     * @param string $email The email to remove
+     */
     public function deluser($email)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($email);
+
         return $this->db->delete($email);
     }
 
-    /** Update a user
-      * @param string $oldemail The old email to modify
-      * @param string $newemail The new email to save
-      * @param string $firstname The firstname of the user
-      * @param string $lastname The lastname of the user
-      */
+    /**
+     * Update a user.
+     *
+     * @param string $oldemail  The old email to modify
+     * @param string $newemail  The new email to save
+     * @param string $firstname The firstname of the user
+     * @param string $lastname  The lastname of the user
+     */
     public function updateuser($oldemail, $newemail, $firstname, $lastname)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($oldemail);
         $this->checkEmail($newemail);
         $this->checkFirstname($firstname);
         $this->checkLastname($lastname);
+
         return $this->db->update(
             $oldemail,
-            array($this->fieldEmail => $newemail,
-                                     $this->fieldFirstname => $firstname,
-                                     $this->fieldLastname => $lastname)
+            [$this->fieldEmail => $newemail,
+            $this->fieldFirstname => $firstname,
+            $this->fieldLastname => $lastname]
         );
     }
 
-    /** List the users */
+    /**
+     * List the users.
+     */
     public function listusers()
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
-        return $this->db->read(null, array($this->fieldEmail,
-                                         $this->fieldFirstname,
-                                         $this->fieldLastname));
+
+        return $this->db->read(null, [$this->fieldEmail,
+            $this->fieldFirstname,
+            $this->fieldLastname]);
     }
 
-    /** Change password
-        @param string $email the user email to change the password
-        @param string $oldpassword The old password (to check if the user have the
-           rights to change the password)
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Change password.
+     * @param string $newpassword The new password to be recorded
+     */
     public function changepassword($email, $oldpassword, $newpassword)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($email);
         $this->checkPassword($oldpassword);
         $this->checkPassword($newpassword);
-        if ($this->checkValidPassword($email, $oldpassword) !== true) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "Bad old password provided"
-            ), 401);
+        if (true !== $this->checkValidPassword($email, $oldpassword)) {
+            throw new \Exception(dgettext('domframework', 'Bad old password provided'), 401);
         }
         $cryptedPassword = $this->cryptPasswd($newpassword);
+
         return $this->db->update(
             $email,
-            array($this->fieldPassword => $cryptedPassword,
-                                     $this->fieldLastchange =>
-                                                 date("Y-m-d H:i:s", time()))
+            [$this->fieldPassword => $cryptedPassword,
+            $this->fieldLastchange => date('Y-m-d H:i:s', time())]
         );
     }
 
-    /** Overwrite password (without oldpassword check)
-        Must be reserved to the administrators. For the users, use changepassword
-        method
-        @param string $email the user email to change the password
-        @param string $newpassword The new password to be recorded */
+    /**
+     * Overwrite password (without oldpassword check).
+     * @param string $newpassword The new password to be recorded
+     */
     public function overwritepassword($email, $newpassword)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($email);
         $this->checkPassword($newpassword);
         $data = $this->db->read(
-            array(array($this->fieldEmail, $email)),
-            array($this->fieldPassword)
+            [[$this->fieldEmail, $email]],
+            [$this->fieldPassword]
         );
-        if (count($data) === 0) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No information found for this email"
-            ), 404);
+        if (0 === count($data)) {
+            throw new \Exception(dgettext('domframework', 'No information found for this email'), 404);
         }
         $cryptedPassword = $this->cryptPasswd($newpassword);
+
         return $this->db->update(
             $email,
-            array($this->fieldPassword => $cryptedPassword,
-                                     $this->fieldLastchange =>
-                                                 date("Y-m-d H:i:s", time()))
+            [$this->fieldPassword => $cryptedPassword,
+            $this->fieldLastchange => date('Y-m-d H:i:s', time())]
         );
     }
 
-    /** Check if the provided password is correctely associated to the email user
-      * @param string $email The email to authenticate
-      * @param string $password The user password (not crypted !)
-      */
+    /**
+     * Check if the provided password is correctely associated to the email user.
+     *
+     * @param string $email    The email to authenticate
+     * @param string $password The user password (not crypted !)
+     */
     public function checkValidPassword($email, $password)
     {
-        if ($this->db === null) {
+        if (null === $this->db) {
             $this->connect();
         }
         $this->checkEmail($email);
         $this->checkPassword($password);
         $data = $this->db->read(
-            array(array($this->fieldEmail, $email)),
-            array($this->fieldPassword)
+            [[$this->fieldEmail, $email]],
+            [$this->fieldPassword]
         );
-        if (count($data) === 0) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No information found for this email"
-            ), 404);
+        if (0 === count($data)) {
+            throw new \Exception(dgettext('domframework', 'No information found for this email'), 404);
         }
-        if (! isset($data[0][$this->fieldPassword])) {
-            throw new \Exception(dgettext(
-                "domframework",
-                "No password available for this email"
-            ), 404);
+        if (!isset($data[0][$this->fieldPassword])) {
+            throw new \Exception(dgettext('domframework', 'No password available for this email'), 404);
         }
         $cryptedPassword = $data[0][$this->fieldPassword];
         if (crypt($password, $cryptedPassword) !== $cryptedPassword) {
             return false;
         }
+
         return true;
     }
 }
diff --git a/src/Uuid.php b/src/Uuid.php
index befda44..e9ba139 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -1,21 +1,24 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Generate a UUID v4
-  */
+/**
+ * Generate a UUID v4
+ */
 class Uuid
 {
-    /** Create a UUID
-      * Based on http://php.net/manual/fr/function.uniqid.php#94959
-      * @return string UUID created
-      */
+    /**
+     * Create a UUID
+     * Based on http://php.net/manual/fr/function.uniqid.php#94959
+     * @return string UUID created
+     */
     public static function uuid4()
     {
         return sprintf(
diff --git a/src/Verify.php b/src/Verify.php
index 89a9d54..377cf84 100644
--- a/src/Verify.php
+++ b/src/Verify.php
@@ -1,33 +1,37 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Permit to check the validity of fields
-  */
+/**
+ * Permit to check the validity of fields
+ */
 class Verify
 {
     /////////////////
     //   NETWORK   //
     /////////////////
-    /** Check if $val is a valid IPv4
-      * Return true or false
-      * @param string $val The IP to test
-      */
+    /**
+     * Check if $val is a valid IPv4
+     * Return true or false
+     * @param string $val The IP to test
+     */
     public function isIp($val)
     {
         return Verify::staticIsIp($val);
     }
 
-    /** Check if $val is a valid IPv4 in static mode
-      * Return true or false
-      * @param string $val The IP to test
-      */
+    /**
+     * Check if $val is a valid IPv4 in static mode
+     * Return true or false
+     * @param string $val The IP to test
+     */
     public static function staticIsIp($val)
     {
         if (filter_var($val, FILTER_VALIDATE_IP)) {
@@ -36,39 +40,43 @@ class Verify
         return false;
     }
 
-    /** Check if $val is a valid IPv4
-      * Return true or false
-      * @param string $val The IP to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv4
+     * Return true or false
+     * @param string $val The IP to test
+     * @deprecated 0.39
+     */
     public function is_Ip($val)
     {
         return Verify::staticIsIp($val);
     }
 
-    /** Check if $val is a valid IPv4 in static mode
-      * Return true or false
-      * @param string $val The IP to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv4 in static mode
+     * Return true or false
+     * @param string $val The IP to test
+     * @deprecated 0.39
+     */
     public static function staticIs_ip($val)
     {
         return Verify::staticIsIp($val);
     }
 
-    /** Check if $val is a valid IPv4
-      * Return true or false
-      * @param string $val The IPv4 to test
-      */
+    /**
+     * Check if $val is a valid IPv4
+     * Return true or false
+     * @param string $val The IPv4 to test
+     */
     public function isIpv4($val)
     {
         return Verify::staticIsIpv4($val);
     }
 
-    /** Check if $val is a valid IPv4 in static mode
-      * Return true or false
-      * @param string $val The IPv4 to test
-      */
+    /**
+     * Check if $val is a valid IPv4 in static mode
+     * Return true or false
+     * @param string $val The IPv4 to test
+     */
     public static function staticIsIpv4($val)
     {
         if (filter_var($val, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
@@ -77,39 +85,43 @@ class Verify
         return false;
     }
 
-    /** Check if $val is a valid IPv4
-      * Return true or false
-      * @param string $val The IPv4 to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv4
+     * Return true or false
+     * @param string $val The IPv4 to test
+     * @deprecated 0.39
+     */
     public function is_ipv4($val)
     {
         return Verify::staticIsIpv4($val);
     }
 
-    /** Check if $val is a valid IPv4 in static mode
-      * Return true or false
-      * @param string $val The IPv4 to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv4 in static mode
+     * Return true or false
+     * @param string $val The IPv4 to test
+     * @deprecated 0.39
+     */
     public static function staticIs_ipv4($val)
     {
         return Verify::staticIsIpv4($val);
     }
 
-    /** Check if $val is a valid IPv6
-      * Return true or false
-      * @param string $val The IPv6 to test
-      */
+    /**
+     * Check if $val is a valid IPv6
+     * Return true or false
+     * @param string $val The IPv6 to test
+     */
     public function isIpv6($val)
     {
         return Verify::staticIsIpv6($val);
     }
 
-    /** Check if $val is a valid IPv6 in static mode
-      * Return true or false
-      * @param string $val The IPv6 to test
-      */
+    /**
+     * Check if $val is a valid IPv6 in static mode
+     * Return true or false
+     * @param string $val The IPv6 to test
+     */
     public static function staticIsIpv6($val)
     {
         if (filter_var($val, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
@@ -118,39 +130,43 @@ class Verify
         return false;
     }
 
-    /** Check if $val is a valid IPv6
-      * Return true or false
-      * @param string $val The IPv6 to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv6
+     * Return true or false
+     * @param string $val The IPv6 to test
+     * @deprecated 0.39
+     */
     public function is_ipv6($val)
     {
         return Verify::staticIsipv6($val);
     }
 
-    /** Check if $val is a valid IPv6 in static mode
-      * Return true or false
-      * @param string $val The IPv6 to test
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid IPv6 in static mode
+     * Return true or false
+     * @param string $val The IPv6 to test
+     * @deprecated 0.39
+     */
     public static function staticIs_ipv6($val)
     {
         return Verify::staticIsipv6($val);
     }
 
-    /** Check if $val is a valid hostname (without domain)
-      * Return true or false
-      * @param string $val The hostname to check
-      */
+    /**
+     * Check if $val is a valid hostname (without domain)
+     * Return true or false
+     * @param string $val The hostname to check
+     */
     public function isHostname($val)
     {
         return Verify::staticIsHostname($val);
     }
 
-    /** Check if $val is a valid hostname (without domain)
-      * Return true or false
-      * @param string $val The hostname to check
-      */
+    /**
+     * Check if $val is a valid hostname (without domain)
+     * Return true or false
+     * @param string $val The hostname to check
+     */
     public static function staticIsHostname($val)
     {
         if (strlen($val) < 2 || strlen($val) > 128) {
@@ -170,39 +186,43 @@ class Verify
         }
         return true;
     }
-    /** Check if $val is a valid hostname (without domain)
-      * Return true or false
-      * @param string $val The hostname to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid hostname (without domain)
+     * Return true or false
+     * @param string $val The hostname to check
+     * @deprecated 0.39
+     */
     public function is_hostname($val)
     {
         return Verify::staticIs_hostname($val);
     }
 
-    /** Check if $val is a valid hostname (without domain)
-      * Return true or false
-      * @param string $val The hostname to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid hostname (without domain)
+     * Return true or false
+     * @param string $val The hostname to check
+     * @deprecated 0.39
+     */
     public static function staticIs_hostname($val)
     {
         return Verify::staticIsHostname($val);
     }
 
-    /** Check if $val is a valid domain (without hostname)
-      * Return true or false
-      * @param string $val The domain to check
-      */
+    /**
+     * Check if $val is a valid domain (without hostname)
+     * Return true or false
+     * @param string $val The domain to check
+     */
     public function isDomain($val)
     {
         return Verify::staticIsDomain($val);
     }
 
-    /** Check if $val is a valid domain (without hostname) in static mode
-      * Return true or false
-      * @param string $val The domain to check
-      */
+    /**
+     * Check if $val is a valid domain (without hostname) in static mode
+     * Return true or false
+     * @param string $val The domain to check
+     */
     public static function staticIsDomain($val)
     {
         if (strlen($val) < 2 || strlen($val) > 128) {
@@ -223,39 +243,43 @@ class Verify
         return true;
     }
 
-    /** Check if $val is a valid domain (without hostname)
-      * Return true or false
-      * @param string $val The domain to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid domain (without hostname)
+     * Return true or false
+     * @param string $val The domain to check
+     * @deprecated 0.39
+     */
     public function is_domain($val)
     {
         return Verify::staticIsDomain($val);
     }
 
-    /** Check if $val is a valid domain (without hostname) in static mode
-      * Return true or false
-      * @param string $val The domain to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid domain (without hostname) in static mode
+     * Return true or false
+     * @param string $val The domain to check
+     * @deprecated 0.39
+     */
     public static function staticIs_domain($val)
     {
         return Verify::staticIsDomain($val);
     }
 
-    /** Check if $val is a valid FQDN
-      * Return true or false
-      * @param string $val The FQDN to check
-      */
+    /**
+     * Check if $val is a valid FQDN
+     * Return true or false
+     * @param string $val The FQDN to check
+     */
     public function isFQDN($val)
     {
         return Verify::staticIsFQDN($val);
     }
 
-    /** Check if $val is a valid FQDN in static mode
-      * Return true or false
-      * @param string $val The FQDN to check
-      */
+    /**
+     * Check if $val is a valid FQDN in static mode
+     * Return true or false
+     * @param string $val The FQDN to check
+     */
     public static function staticIsFQDN($val)
     {
         if (strlen($val) < 2 || strlen($val) > 255) {
@@ -279,21 +303,23 @@ class Verify
         return true;
     }
 
-    /** Check if $val is a valid FQDN
-      * Return true or false
-      * @param string $val The FQDN to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid FQDN
+     * Return true or false
+     * @param string $val The FQDN to check
+     * @deprecated 0.39
+     */
     public function is_FQDN($val)
     {
         return Verify::staticIsFQDN($val);
     }
 
-    /** Check if $val is a valid FQDN in static mode
-      * Return true or false
-      * @param string $val The FQDN to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid FQDN in static mode
+     * Return true or false
+     * @param string $val The FQDN to check
+     * @deprecated 0.39
+     */
     public static function staticIs_FQDN($val)
     {
         return Verify::staticIsFQDN($val);
@@ -302,21 +328,23 @@ class Verify
     ///////////////
     //   DATES   //
     ///////////////
-    /** Check if $val is a valid date and time in SQL
-      * A valid date is 2014-03-20 12:27:34
-      * Return true or false
-      * @param string $val The date to check
-      */
+    /**
+     * Check if $val is a valid date and time in SQL
+     * A valid date is 2014-03-20 12:27:34
+     * Return true or false
+     * @param string $val The date to check
+     */
     public function isDatetimeSQL($val)
     {
         return Verify::staticIsDatetimeSQL($val);
     }
 
-    /** Check if $val is a valid date and time in SQL in static mode
-      * A valid date is 2014-03-20 12:27:34
-      * Return true or false
-      * @param string $val The date to check
-      */
+    /**
+     * Check if $val is a valid date and time in SQL in static mode
+     * A valid date is 2014-03-20 12:27:34
+     * Return true or false
+     * @param string $val The date to check
+     */
     public static function staticIsDatetimeSQL($val)
     {
         if (strlen($val) !== 19) {
@@ -341,43 +369,47 @@ class Verify
         return true;
     }
 
-    /** Check if $val is a valid date and time in SQL
-      * A valid date is 2014-03-20 12:27:34
-      * Return true or false
-      * @param string $val The date to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid date and time in SQL
+     * A valid date is 2014-03-20 12:27:34
+     * Return true or false
+     * @param string $val The date to check
+     * @deprecated 0.39
+     */
     public function is_datetimeSQL($val)
     {
         return Verify::staticIsDatetimeSQL($val);
     }
 
-    /** Check if $val is a valid date and time in SQL in static mode
-      * A valid date is 2014-03-20 12:27:34
-      * Return true or false
-      * @param string $val The date to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid date and time in SQL in static mode
+     * A valid date is 2014-03-20 12:27:34
+     * Return true or false
+     * @param string $val The date to check
+     * @deprecated 0.39
+     */
     public static function staticIs_datetimeSQL($val)
     {
         return Verify::staticIsDatetimeSQL($val);
     }
 
-    /** Check if $val is a valid date in SQL
-      * A valid date is 2014-03-20
-      * Return true or false
-      * @param string $val The date to check
-      */
+    /**
+     * Check if $val is a valid date in SQL
+     * A valid date is 2014-03-20
+     * Return true or false
+     * @param string $val The date to check
+     */
     public function isDateSQL($val)
     {
         return Verify::staticIsDateSQL($val);
     }
 
-    /** Check if $val is a valid date in SQL in static mode
-      * A valid date is 2014-03-20
-      * Return true or false
-      * @param string $val The date to check
-      */
+    /**
+     * Check if $val is a valid date in SQL in static mode
+     * A valid date is 2014-03-20
+     * Return true or false
+     * @param string $val The date to check
+     */
     public static function staticIsDateSQL($val)
     {
         if (strlen($val) !== 10) {
@@ -402,23 +434,25 @@ class Verify
         return true;
     }
 
-    /** Check if $val is a valid date in SQL
-      * A valid date is 2014-03-20
-      * Return true or false
-      * @param string $val The date to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid date in SQL
+     * A valid date is 2014-03-20
+     * Return true or false
+     * @param string $val The date to check
+     * @deprecated 0.39
+     */
     public function is_dateSQL($val)
     {
         return Verify::staticIsDateSQL($val);
     }
 
-    /** Check if $val is a valid date in SQL in static mode
-      * A valid date is 2014-03-20
-      * Return true or false
-      * @param string $val The date to check
-      * @deprecated 0.39
-      */
+    /**
+     * Check if $val is a valid date in SQL in static mode
+     * A valid date is 2014-03-20
+     * Return true or false
+     * @param string $val The date to check
+     * @deprecated 0.39
+     */
     public static function staticIs_dateSQL($val)
     {
         return Verify::staticIsDateSQL($val);
@@ -428,22 +462,24 @@ class Verify
     /////////////////
     //   STRINGS   //
     /////////////////
-    /** Check if the provided value is only contains the provided chars.
-      * All the strings must be in UTF-8
-      * @param string $val The string to test
-      * @param string $allowedChars The allowed chars
-      */
+    /**
+     * Check if the provided value is only contains the provided chars.
+     * All the strings must be in UTF-8
+     * @param string $val The string to test
+     * @param string $allowedChars The allowed chars
+     */
     public function isAllowedChars($val, $allowedChars)
     {
         return Verify::staticIsAllowedChars($val, $allowedChars);
     }
 
-    /** Check if the provided value is only contains the provided chars.
-      * In static mode
-      * All the strings must be in UTF-8
-      * @param string $val The string to test
-      * @param string $allowedChars The allowed chars
-      */
+    /**
+     * Check if the provided value is only contains the provided chars.
+     * In static mode
+     * All the strings must be in UTF-8
+     * @param string $val The string to test
+     * @param string $allowedChars The allowed chars
+     */
     public static function staticIsAllowedChars($val, $allowedChars)
     {
         $allowedChars = preg_quote($allowedChars, "#");
@@ -460,18 +496,20 @@ class Verify
     /////////////////
     //   NUMBERS   //
     /////////////////
-    /** Return true if the provided value is an integer in decimal (not octal)
-      * @param string $val The Integer val to check
-      */
+    /**
+     * Return true if the provided value is an integer in decimal (not octal)
+     * @param string $val The Integer val to check
+     */
     public function isInteger($val)
     {
         return Verify::staticIsInteger($val);
     }
 
-    /** Return true if the provided value is an integer in decimal (not octal)
-      * In static mode
-      * @param string $val The Integer val to check
-      */
+    /**
+     * Return true if the provided value is an integer in decimal (not octal)
+     * In static mode
+     * @param string $val The Integer val to check
+     */
     public static function staticIsInteger($val)
     {
         if (! is_string($val) && ! is_int($val)) {
@@ -486,20 +524,22 @@ class Verify
         return true;
     }
 
-    /** Return true if the provided value is an integer in decimal (not octal)
-      * @param string $val The Integer val to check
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is an integer in decimal (not octal)
+     * @param string $val The Integer val to check
+     * @deprecated 0.39
+     */
     public function is_integer($val)
     {
         return Verify::staticIsInteger($val);
     }
 
-    /** Return true if the provided value is an integer in decimal (not octal)
-      * In static mode
-      * @param string $val The Integer val to check
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is an integer in decimal (not octal)
+     * In static mode
+     * @param string $val The Integer val to check
+     * @deprecated 0.39
+     */
     public static function staticIs_integer($val)
     {
         return Verify::staticIsInteger($val);
@@ -508,39 +548,43 @@ class Verify
     ////////////////
     //   EMAILS   //
     ////////////////
-    /** Return true if the provided value is a valid email address
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid email address
+     * @param string $val The value to check
+     * @return boolean
+     */
     public function isEmail($val)
     {
         return Verify::staticIsEmail($val);
     }
 
-    /** Return true if the provided value is a valid email address in static mode
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid email address in static mode
+     * @param string $val The value to check
+     * @return boolean
+     */
     public static function staticIsEmail($val)
     {
         return !! filter_var($val, FILTER_VALIDATE_EMAIL);
     }
 
-    /** Return true if the provided value is a valid email address
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid email address
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public function is_email($val)
     {
         return Verify::staticIsEmail($val);
     }
 
-    /** Return true if the provided value is a valid email address in static mode
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid email address in static mode
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public static function staticIs_email($val)
     {
         return Verify::staticIsEmail($val);
@@ -549,39 +593,43 @@ class Verify
     /////////////
     //   URL   //
     /////////////
-    /** Return true if the provided value is a valid URL
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid URL
+     * @param string $val The value to check
+     * @return boolean
+     */
     public function isURL($val)
     {
         return Verify::staticIsURL($val);
     }
 
-    /** Return true if the provided value is a valid URL in static mode
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid URL in static mode
+     * @param string $val The value to check
+     * @return boolean
+     */
     public static function staticIsURL($val)
     {
         return !! filter_var($val, FILTER_VALIDATE_URL);
     }
 
-    /** Return true if the provided value is a valid URL
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid URL
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public function is_URL($val)
     {
         return Verify::staticIsURL($val);
     }
 
-    /** Return true if the provided value is a valid URL in static mode
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid URL in static mode
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public static function staticIs_URL($val)
     {
         return Verify::staticIsURL($val);
@@ -590,21 +638,23 @@ class Verify
     //////////////////
     ///   OTHERS   ///
     //////////////////
-    /** Return true if the provided value is a valid UUID
-      * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid UUID
+     * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
+     * @param string $val The value to check
+     * @return boolean
+     */
     public function isUUID($val)
     {
         return Verify::staticIsUUID($val);
     }
 
-    /** Return true if the provided value is a valid UUID in static mode
-      * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
-      * @param string $val The value to check
-      * @return boolean
-      */
+    /**
+     * Return true if the provided value is a valid UUID in static mode
+     * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
+     * @param string $val The value to check
+     * @return boolean
+     */
     public static function staticIsUUID($val)
     {
         if (! is_string($val)) {
@@ -625,47 +675,51 @@ class Verify
         return true;
     }
 
-    /** Return true if the provided value is a valid UUID
-      * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid UUID
+     * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public function is_UUID($val)
     {
         return Verify::staticIsUUID($val);
     }
 
-    /** Return true if the provided value is a valid UUID in static mode
-      * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
-      * @param string $val The value to check
-      * @return boolean
-      * @deprecated 0.39
-      */
+    /**
+     * Return true if the provided value is a valid UUID in static mode
+     * %04x%04x-%04x-%04x-%04x-%04x%04x%04x
+     * @param string $val The value to check
+     * @return boolean
+     * @deprecated 0.39
+     */
     public static function staticIs_UUID($val)
     {
         return Verify::staticIsUUID($val);
     }
 
-    /** Return true if the provided string is a valid hash
-      * @param string $algo The hash algo to test
-      * @param string $val The value to test
-      */
+    /**
+     * Return true if the provided string is a valid hash
+     * @param string $algo The hash algo to test
+     * @param string $val The value to test
+     */
     public function isHash($algo, $val)
     {
         return Verify::IsHash($algo, $val);
     }
 
-    /** Return true if the provided string is a valid hash in static
-      * @param string $algo The hash algo to test
-      * @param string $val The value to test
-      */
+    /**
+     * Return true if the provided string is a valid hash in static
+     * @param string $algo The hash algo to test
+     * @param string $val The value to test
+     */
     public static function staticIsHash($algo, $val)
     {
         if (! is_string($algo) || ! is_string($val)) {
             return false;
         }
-        if (! in_array($algo, hash_algos())) {
+        if (! in_array($algo, hash_algos(), true)) {
             throw new \Exception("Unknown algo provided to verify the hash", 500);
         }
         $len = strlen(hash($algo, ""));
diff --git a/src/Version.php b/src/Version.php
index 1e762f6..560c6c7 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -1,21 +1,23 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This is the version of DomFramework.
-  * It can be used to test if the framework is uptodate for the application
-  * with :
-  * require ("domframework/version.php");
-  * if (!defined ("DOMFRAMEWORK_VERSION") ||
-  *     version_compare (DOMFRAMEWORK_VERSION, "0.6") < 0)
-  *   die ("Your DomFramework version is too old : 0.6 minimum\n");
-  */
+/**
+ * This is the version of DomFramework.
+ * It can be used to test if the framework is uptodate for the application
+ * with :
+ * require ("domframework/version.php");
+ * if (!defined ("DOMFRAMEWORK_VERSION") ||
+ *     version_compare (DOMFRAMEWORK_VERSION, "0.6") < 0)
+ *   die ("Your DomFramework version is too old : 0.6 minimum\n");
+ */
 
 class Version
 {
diff --git a/src/Xdiff.php b/src/Xdiff.php
index 6825391..3392b81 100644
--- a/src/Xdiff.php
+++ b/src/Xdiff.php
@@ -1,49 +1,58 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** Create a diff from two strings, array or files
-  * The output is compatible with "patch" command.
-  */
+/**
+ * Create a diff from two strings, array or files
+ * The output is compatible with "patch" command.
+ */
 class Xdiff
 {
-    /** The name of file1
-      */
+    /**
+     * The name of file1
+     */
     private $filename1 = "Original";
 
-    /** The name of file2
-      */
+    /**
+     * The name of file2
+     */
     private $filename2 = "New";
 
-    /** The timestamp for file1
-      */
+    /**
+     * The timestamp for file1
+     */
     private $file1Time;
 
-    /** The timestamp for file2
-      */
+    /**
+     * The timestamp for file2
+     */
     private $file2Time;
 
-    /** The output requested
-      */
+    /**
+     * The output requested
+     */
     private $output = null;
 
-    /** Define the size of one column in side by side mode
-      * 62 chars by default
-      * The maximum width used on screen is 2*$s2sWidth+2 (134 by default)
-      * The value must validate $s2sWidth = 8 * X - 2 (with X is integer), like
-      * 6, 14, 22, 30, 38, 46, 54, 62, 70, 78, 86, 94, 102
-      */
+    /**
+     * Define the size of one column in side by side mode
+     * 62 chars by default
+     * The maximum width used on screen is 2*$s2sWidth+2 (134 by default)
+     * The value must validate $s2sWidth = 8 * X - 2 (with X is integer), like
+     * 6, 14, 22, 30, 38, 46, 54, 62, 70, 78, 86, 94, 102
+     */
     private $s2sWidth = 62;
 
-    /** The constructor allow to choose the output.
-      * @param string $output The output mode [Normal|Unified|SideBySide]
-      */
+    /**
+     * The constructor allow to choose the output.
+     * @param string $output The output mode [Normal|Unified|SideBySide]
+     */
     public function __construct($output = "normal")
     {
         if (! method_exists($this, "display" . ucfirst($output))) {
@@ -54,9 +63,10 @@ class Xdiff
         $this->file2Time = date("Y-m-d H:i:s.u001 O");
     }
 
-    /** Allow to set the side by side width to the maximum allowed by screenWidth
-      * @param integer $screenWidth The maximum width of the screen
-      */
+    /**
+     * Allow to set the side by side width to the maximum allowed by screenWidth
+     * @param integer $screenWidth The maximum width of the screen
+     */
     public function setScreenWidth($screenWidth)
     {
         for ($x = 20; $x > 0; $x--) {
@@ -68,10 +78,11 @@ class Xdiff
         }
     }
 
-    /** Compute the differences between two strings $string1 and $string2
-      * @param string $string1 The first string to compare
-      * @param string $string2 The second string to compare
-      */
+    /**
+     * Compute the differences between two strings $string1 and $string2
+     * @param string $string1 The first string to compare
+     * @param string $string2 The second string to compare
+     */
     public function diff($string1, $string2)
     {
         if (! is_string($string1)) {
@@ -102,10 +113,11 @@ class Xdiff
         );
     }
 
-    /** Compute the differences between two files $file1 and $file2
-      * @param string $file1 The first file to use to compare
-      * @param string $file2 The second file to use to compare
-      */
+    /**
+     * Compute the differences between two files $file1 and $file2
+     * @param string $file1 The first file to use to compare
+     * @param string $file2 The second file to use to compare
+     */
     public function diffFile($file1, $file2)
     {
         if (! is_string($file1)) {
@@ -160,10 +172,11 @@ class Xdiff
         );
     }
 
-    /** Compute the differences between two arrays $array1 and $array2
-      * @param array $array1 The first array to compare
-      * @param array $array2 The second array to compare
-      */
+    /**
+     * Compute the differences between two arrays $array1 and $array2
+     * @param array $array1 The first array to compare
+     * @param array $array2 The second array to compare
+     */
     public function diffArray($array1, $array2)
     {
         $diff = $this->computeArray($array1, $array2);
@@ -171,11 +184,12 @@ class Xdiff
         return $this->$method($diff);
     }
 
-    /** Compute the differences between two arrays $array1 and $array2
-      * @param array $array1 The first array to compare
-      * @param array $array2 The second array to compare
-      * @return array The data in internal format
-      */
+    /**
+     * Compute the differences between two arrays $array1 and $array2
+     * @param array $array1 The first array to compare
+     * @param array $array2 The second array to compare
+     * @return array The data in internal format
+     */
     final public function computeArray($array1, $array2)
     {
         if (! is_array($array1)) {
@@ -192,12 +206,12 @@ class Xdiff
         }
         $array1 = array_values($array1);
         $array2 = array_values($array2);
-        $diff = array();
+        $diff = [];
         $i = 0; // $i is the index for $array1
         $j = 0; // $j is the index for $array2
         while ($i < count($array1) || $j < count($array2)) {
-            $chunk1 = array();
-            $chunk2 = array();
+            $chunk1 = [];
+            $chunk2 = [];
             if (key_exists($i, $array1) && is_array($array1[$i])) {
                 throw new \Exception("Can not diff a multidimensional array");
             }
@@ -217,13 +231,13 @@ class Xdiff
                     $i++;
                     $j++;
                 }
-                $diff[] = array("type"       => "Equal",
+                $diff[] = ["type"       => "Equal",
                          "startLine1" => 1 + $i - count($chunk1),
                          "endLine1"   => $i,
                          "startLine2" => 1 + $j - count($chunk1),
                          "endLine2"   => $j,
                          "length"     => count($chunk1),
-                         "chunk"      => $chunk1);
+                         "chunk"      => $chunk1];
 
                 continue;
             }
@@ -265,25 +279,25 @@ class Xdiff
             // Add the diffs by the chunks availability
             if (empty($chunk1) && ! empty($chunk2)) {
                 //   APPEND
-                $diff[] = array("type"       => "Append",
+                $diff[] = ["type"       => "Append",
                          "startLine1" => $i,
                          "endLine1"   => $i,
                          "startLine2" => 1 + $j - count($chunk2),
                          "endLine2"   => $j,
                          "length"     => count($chunk2),
-                         "chunk"      => $chunk2);
+                         "chunk"      => $chunk2];
             } elseif (! empty($chunk1) && empty($chunk2)) {
                 //   DELETE
-                $diff[] = array("type"       => "Delete",
+                $diff[] = ["type"       => "Delete",
                          "startLine1" => 1 + $i - count($chunk1),
                          "endLine1"   => $i,
                          "startLine2" => $j,
                          "endLine2"   => $j,
                          "length"     => count($chunk1),
-                         "chunk"      => $chunk1);
+                         "chunk"      => $chunk1];
             } else {
                 //   CHANGE ON BOTH ARRAY
-                $diff[] = array("type"       => "Change",
+                $diff[] = ["type"       => "Change",
                          "startLine1" => 1 + $i - count($chunk1),
                          "endLine1"   => $i,
                          "startLine2" => 1 + $j - count($chunk2),
@@ -291,16 +305,17 @@ class Xdiff
                          "length1"    => count($chunk1),
                          "length2"    => count($chunk2),
                          "chunk1"     => $chunk1,
-                         "chunk2"     => $chunk2);
+                         "chunk2"     => $chunk2];
             }
         }
         return $diff;
     }
 
-    /** Return a string like "diff -u"
-      * @param array $diffArray The diff array analyzed by diffArray method
-      * @return string
-      */
+    /**
+     * Return a string like "diff -u"
+     * @param array $diffArray The diff array analyzed by diffArray method
+     * @return string
+     */
     private function displayUnified($diffArray)
     {
         $d = "";
@@ -364,10 +379,11 @@ class Xdiff
         return $e . $d;
     }
 
-    /** Return a string like "diff" without parameter
-      * @param array $diffArray The diff array analyzed by diffArray method
-      * @return string
-      */
+    /**
+     * Return a string like "diff" without parameter
+     * @param array $diffArray The diff array analyzed by diffArray method
+     * @return string
+     */
     private function displayNormal($diffArray)
     {
         $d = "";
@@ -406,10 +422,11 @@ class Xdiff
         return $d;
     }
 
-    /** Return a string like "diff -y" (Side by Side)
-      * @param array $diffArray The diff array analyzed by diffArray method
-      * @return string
-      */
+    /**
+     * Return a string like "diff -y" (Side by Side)
+     * @param array $diffArray The diff array analyzed by diffArray method
+     * @return string
+     */
     private function displaySideBySide($diffArray)
     {
         $d = "";
@@ -453,11 +470,12 @@ class Xdiff
         return $d;
     }
 
-    /** Return a string sideBySide. Used by displaySideBySide for each line
-      * @param string $side1 The string to be displayed on side1
-      * @param string $side2 The string to be displayed on side2
-      * @param string|null $symbol The symbol used to present the diff (<>|)
-      */
+    /**
+     * Return a string sideBySide. Used by displaySideBySide for each line
+     * @param string $side1 The string to be displayed on side1
+     * @param string $side2 The string to be displayed on side2
+     * @param string|null $symbol The symbol used to present the diff (<>|)
+     */
     private function side($side1, $side2, $symbol = null)
     {
         $d = "";
@@ -499,15 +517,16 @@ class Xdiff
         return $d;
     }
 
-    /** This function return the next common part between both arrays starting at
-      * position $i for $array1 and $j for array2
-      * Return empty string if no common lines was found
-      * @param array $array1 The first array to compare
-      * @param array $array2 The second array to compare
-      * @param integer $i The position pointer on first array
-      * @param integer $j The position pointer on second array
-      * @return string
-      */
+    /**
+     * This function return the next common part between both arrays starting at
+     * position $i for $array1 and $j for array2
+     * Return empty string if no common lines was found
+     * @param array $array1 The first array to compare
+     * @param array $array2 The second array to compare
+     * @param integer $i The position pointer on first array
+     * @param integer $j The position pointer on second array
+     * @return string
+     */
     private function lcs($array1, $array2, $i, $j)
     {
         $found1 = false;
diff --git a/src/Xmppclient.php b/src/Xmppclient.php
index b019e56..9da7402 100644
--- a/src/Xmppclient.php
+++ b/src/Xmppclient.php
@@ -1,58 +1,68 @@
 <?php
 
-/** DomFramework
-  * @package domframework
-  * @author Dominique Fournier <dominique@fournier38.fr>
-  * @license BSD
-  */
+/**
+ * DomFramework
+ * @package domframework
+ * @author Dominique Fournier <dominique@fournier38.fr>
+ * @license BSD
+ */
 
 namespace Domframework;
 
-/** This class allow to send XMPP messages to a server.
-  * If the server supports it, crypt the connection by StartTLS before auth
-  */
+/**
+ * This class allow to send XMPP messages to a server.
+ * If the server supports it, crypt the connection by StartTLS before auth
+ */
 class Xmppclient
 {
     //   CLASS CONSTANT   //
-    /** One send command each $RATE µs maximum
-      */
+    /**
+     * One send command each $RATE µs maximum
+     */
     public const RATE = 30000;
 
     //     PROPERTIES     //
-    /** The connection socket when connected
-      */
+    /**
+     * The connection socket when connected
+     */
     private $sock;
 
-    /** The XML stream exchange string
-      */
+    /**
+     * The XML stream exchange string
+     */
     private $xmlStream;
 
-    /** The debug state
-      */
+    /**
+     * The debug state
+     */
     private $debug = false;
 
-    /** The object identifier increment
-      */
+    /**
+     * The object identifier increment
+     */
     private $id = 0;
 
-    /** The JID provided by the user
-      */
+    /**
+     * The JID provided by the user
+     */
     private $jid = "";
 
-    /** Ratelimiter of send commands to server. Store the last timestamp, in
-      * microseconds.
-      */
+    /**
+     * Ratelimiter of send commands to server. Store the last timestamp, in
+     * microseconds.
+     */
     private $sendLastTime = 0;
 
     //   PUBLIC METHODS   //
-    /** Connect to XMPP server $server, on port $port (5222 by default)
-      * @param string $server The XMPP server
-      * @param integer $port The port to use (5222 by default)
-      * @param string $login The login to use
-      * @param string $password The password to use
-      * @param boolean|null $debug Debug the socket on stderr
-      * @return $this
-      */
+    /**
+     * Connect to XMPP server $server, on port $port (5222 by default)
+     * @param string $server The XMPP server
+     * @param integer $port The port to use (5222 by default)
+     * @param string $login The login to use
+     * @param string $password The password to use
+     * @param boolean|null $debug Debug the socket on stderr
+     * @return $this
+     */
     public function connect(
         $server,
         $port,
@@ -86,7 +96,7 @@ class Xmppclient
             $xml = $this->read();
             // Can not use the tcpclient part : the certificate is provided by domain,
             // not by the XMPP server globally
-            $options = array("peer_name" => $domain);
+            $options = ["peer_name" => $domain];
             $this->sock->cryptoEnable(
                 true,
                 STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
@@ -148,8 +158,9 @@ class Xmppclient
         return $this;
     }
 
-    /** Disconnect from the XMPP server
-      */
+    /**
+     * Disconnect from the XMPP server
+     */
     public function disconnect()
     {
         if ($this->sock && $this->sock->getSock()) {
@@ -158,9 +169,10 @@ class Xmppclient
         }
     }
 
-    /** Call the Discovery Service to find the available services on the server
-      * @return array The services available
-      */
+    /**
+     * Call the Discovery Service to find the available services on the server
+     * @return array The services available
+     */
     public function discoveryService()
     {
         $this->send("<iq id='disco-$this->id' type='get'>" .
@@ -180,13 +192,14 @@ class Xmppclient
         return $features[1];
     }
 
-    /** Send a direct message to a recipient. The message subject can be omitted,
-      * as it is not displayed on the clients
-      * @param string $recipient The recipient of the message
-      * @param string $message The message to send
-      * @param string|null $subject The message subject
-      * @return $this
-      */
+    /**
+     * Send a direct message to a recipient. The message subject can be omitted,
+     * as it is not displayed on the clients
+     * @param string $recipient The recipient of the message
+     * @param string $message The message to send
+     * @param string|null $subject The message subject
+     * @return $this
+     */
     public function sendMessagePrivate($recipient, $message, $subject = null)
     {
         $this->send("<message from='$this->jid' to='$recipient' " .
@@ -198,16 +211,18 @@ class Xmppclient
         return $this;
     }
 
-    /** In case of destruction, try to disconnect the server properly
-      */
+    /**
+     * In case of destruction, try to disconnect the server properly
+     */
     public function __destruct()
     {
         $this->disconnect();
     }
 
-    /** Each debug message is sent to stderr if $debug is set
-      * @param string $msg The message to display
-      */
+    /**
+     * Each debug message is sent to stderr if $debug is set
+     * @param string $msg The message to display
+     */
     public function debug($msg)
     {
         if ($this->debug === false) {
@@ -217,9 +232,10 @@ class Xmppclient
     }
 
     //   PRIVATE METHODS   //
-    /** Read fron socket
-      * @return string the read value
-      */
+    /**
+     * Read fron socket
+     * @return string the read value
+     */
     private function read()
     {
         $xml = $this->sock->read(4096);
@@ -227,9 +243,10 @@ class Xmppclient
         return $xml;
     }
 
-    /** Send the data on socket, add the carriage return
-      * @param string $msg The message to send
-      */
+    /**
+     * Send the data on socket, add the carriage return
+     * @param string $msg The message to send
+     */
     private function send($msg)
     {
         $start = microtime(true);