alxarafe / alixar

Dolibarr/Code/Contact/Classes/Contact.php

Spacing +5 added lines, -5 removed lines

@@ -215,8 +215,8 @@ 
     /**
      * @var int Thirdparty ID
      */
-    public $socid;      // both socid and fk_soc are used
-    public $fk_soc;     // both socid and fk_soc are used
+    public $socid; // both socid and fk_soc are used
+    public $fk_soc; // both socid and fk_soc are used
 
     /**
      * @var string Thirdparty name
@@ -1067,8 +1067,8 @@ 
                 $this->country_code = $obj->country_id ? $obj->country_code : '';
                 $this->country      = $obj->country_id ? ($langs->trans('Country' . $obj->country_code) != 'Country' . $obj->country_code ? $langs->transnoentities('Country' . $obj->country_code) : $obj->country) : '';
 
-                $this->fk_soc       = $obj->fk_soc;     // Both fk_soc and socid are used
-                $this->socid        = $obj->fk_soc;     // Both fk_soc and socid are used
+                $this->fk_soc       = $obj->fk_soc; // Both fk_soc and socid are used
+                $this->socid        = $obj->fk_soc; // Both fk_soc and socid are used
                 $this->socname      = $obj->socname;
                 $this->poste        = $obj->poste;
                 $this->statut       = $obj->statut;
@@ -1876,7 +1876,7 @@ 
         $error = 0;
 
         if (!isset($this->roles)) {
-            return 0;   // Avoid to loose roles when property not set
+            return 0; // Avoid to loose roles when property not set
         }
 
         $this->db->begin();

Dolibarr/Code/Contrat/Classes/Contrat.php

Spacing +17 added lines, -17 removed lines

@@ -286,12 +286,12 @@ 
     /*
      * No signature
      */
-    const STATUS_NO_SIGNATURE    = 0;
+    const STATUS_NO_SIGNATURE = 0;
 
     /*
      * Signed by sender
      */
-    const STATUS_SIGNED_SENDER   = 1;
+    const STATUS_SIGNED_SENDER = 1;
 
     /*
      * Signed by receiver
@@ -301,7 +301,7 @@ 
     /*
      * Signed by all
      */
-    const STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+    const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
 
 
     /**
@@ -437,7 +437,7 @@ 
             if ($contratline->statut != ContratLigne::STATUS_OPEN) {
                 $contratline->context = $this->context;
 
-                $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment);  // This call trigger LINECONTRACT_ACTIVATE
+                $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE
                 if ($result < 0) {
                     $error++;
                     $this->error = $contratline->error;
@@ -487,7 +487,7 @@ 
             // Close lines not already closed
             if ($contratline->statut != ContratLigne::STATUS_CLOSED) {
                 $contratline->date_end_real = $now;
-                $contratline->date_cloture = $now;  // For backward compatibility
+                $contratline->date_cloture = $now; // For backward compatibility
                 $contratline->user_closing_id = $user->id;
                 $contratline->statut = ContratLigne::STATUS_CLOSED;
                 $result = $contratline->close_line($user, $now, $comment, $notrigger);
@@ -942,7 +942,7 @@ 
                 //$line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
                 //$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
 
-                $line->rang     = $objp->rang;
+                $line->rang = $objp->rang;
 
                 // Retrieve all extrafields for contract line
                 // fetch optionals attributes and labels
@@ -1454,7 +1454,7 @@ 
         }
 
         if (!$error) {
-            $result = $this->insertExtraFields();   // This delete and reinsert extrafields
+            $result = $this->insertExtraFields(); // This delete and reinsert extrafields
             if ($result < 0) {
                 $error++;
             }
@@ -2558,7 +2558,7 @@ 
         global $user;
 
         $ticket = new Ticket($this->db);
-        $nbTicket =  $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id));
+        $nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id));
 
         return ($nbTicket < 0 ? $nbTicket : $ticket->lines);
     }
@@ -2580,7 +2580,7 @@ 
         global $conf, $langs;
 
         if (!dol_strlen($modele)) {
-            $modele = '';   // No doc template/generation by default
+            $modele = ''; // No doc template/generation by default
 
             if (!empty($this->model_pdf)) {
                 $modele = $this->model_pdf;
@@ -2806,7 +2806,7 @@ 
 
                     // Load contract
                     $object = new Contrat($this->db);
-                    $object->fetch($obj->rowid);        // fetch also lines
+                    $object->fetch($obj->rowid); // fetch also lines
                     //$object->fetch_thirdparty();
 
                     if ($object->id <= 0) {
@@ -2853,7 +2853,7 @@ 
                     if ($expirationdate && $expirationdate < $enddatetoscan) {
                         dol_syslog("Define the newdate of end of services from expirationdate=" . $expirationdate);
                         $newdate = $expirationdate;
-                        $protecti = 0;  //$protecti is to avoid infinite loop
+                        $protecti = 0; //$protecti is to avoid infinite loop
                         while ($newdate < $enddatetoscan && $protecti < 1000) {
                             $newdate = dol_time_plus_duree($newdate, $duration_value, $duration_unit);
                             $protecti++;
@@ -2881,20 +2881,20 @@ 
 
                                 // Create an event
                                 $actioncomm = new ActionComm($this->db);
-                                $actioncomm->type_code    = 'AC_OTH_AUTO';      // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+                                $actioncomm->type_code    = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
                                 $actioncomm->code         = 'AC_' . $actioncode;
                                 $actioncomm->label        = $label;
                                 $actioncomm->datep        = $now;
                                 $actioncomm->datef        = $now;
-                                $actioncomm->percentage   = -1;   // Not applicable
+                                $actioncomm->percentage   = -1; // Not applicable
                                 $actioncomm->socid        = $object->socid;
-                                $actioncomm->authorid     = $user->id;   // User saving action
-                                $actioncomm->userownerid  = $user->id;  // Owner of action
+                                $actioncomm->authorid     = $user->id; // User saving action
+                                $actioncomm->userownerid  = $user->id; // Owner of action
                                 $actioncomm->fk_element   = $object->id;
                                 $actioncomm->elementtype  = 'contract';
                                 $actioncomm->note_private = $comment;
 
-                                $ret = $actioncomm->create($user);       // User creating action
+                                $ret = $actioncomm->create($user); // User creating action
                             } else {
                                 $contracterror[$object->id] = $object->ref;
 
@@ -2903,7 +2903,7 @@ 
                                 $this->error = $this->db->lasterror();
                             }
 
-                            if (! $errorforlocaltransaction) {
+                            if (!$errorforlocaltransaction) {
                                 $this->db->commit();
                             } else {
                                 $this->db->rollback();

Dolibarr/Code/Contrat/Api/Contracts.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
             if ($search_sale == -2) {
                 $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
             } elseif ($search_sale > 0) {
-                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
             }
         }
         // Add sql filters
@@ -278,7 +278,7 @@ 
             throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
         }
 
-        $request_data = (object)$request_data;
+        $request_data = (object) $request_data;
 
         $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
         $request_data->price_base_type = sanitizeVal($request_data->price_base_type);
@@ -336,7 +336,7 @@ 
             throw new RestException(403, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
         }
 
-        $request_data = (object)$request_data;
+        $request_data = (object) $request_data;
 
         $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
         $request_data->price_base_type = sanitizeVal($request_data->price_base_type);
@@ -547,7 +547,7 @@ 
             }
             if ($field == 'array_options' && is_array($value)) {
                 foreach ($value as $index => $val) {
-                    $this->contract->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contract);;
+                    $this->contract->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contract); ;
                 }
                 continue;
             }

Dolibarr/Code/Core/Classes/Utils.php

Spacing +5 added lines, -5 removed lines

@@ -133,14 +133,14 @@ 
             if ($choice == 'allfiles') {
                 // Delete all files (except .lock and .unlock files, do not follow symbolic links)
                 if ($dolibarr_main_data_root) {
-                    $filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1);    // No need to use recursive, we will delete directory
+                    $filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1); // No need to use recursive, we will delete directory
                 }
             }
 
             if ($choice == 'allfilesold') {
                 // Delete all files (except .lock and .unlock files, do not follow symbolic links)
                 if ($dolibarr_main_data_root) {
-                    $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);   // No need to use recursive, we will delete directory
+                    $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold); // No need to use recursive, we will delete directory
                 }
             }
 
@@ -830,7 +830,7 @@ 
                         } elseif (is_string($row[$j]) && $row[$j] == '') {
                             // if it's an empty string, we set it as an empty string
                             $row[$j] = "''";
-                        } elseif (is_numeric($row[$j]) && !strcmp((string)$row[$j], (string)((float)$row[$j] + 0))) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+                        } elseif (is_numeric($row[$j]) && !strcmp((string) $row[$j], (string) ((float) $row[$j] + 0))) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
                             // if it's a number, we return it as-is
                             //                      $row[$j] = $row[$j];
                         } else { // else for all other cases we escape the value and put quotes around
@@ -1390,7 +1390,7 @@ 
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $this->error = "Error sending backp file " . ((string)$error);
+        $this->error = "Error sending backp file " . ((string) $error);
         $this->output = $output;
 
         if ($result) {
@@ -1431,7 +1431,7 @@ 
         }
 
         $cron_job = new Cronjob($db);
-        $cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, [], 1);   // Fetch jobs that are currently running
+        $cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, [], 1); // Fetch jobs that are currently running
 
         // Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)
         foreach ($cron_job->lines as $job_line) {

Dolibarr/Code/Core/Classes/vCard.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
     {
         // $type = "GIF" | "JPEG"
         //$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo;        // must be url of photo
+        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
         //$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
     }
 
@@ -359,7 +359,7 @@ 
     public function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text .= "VERSION:4.0\r\n";     // With V4, all encoding are UTF-8
+        $text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
         //$text.= "VERSION:2.1\r\n";
         foreach ($this->properties as $key => $value) {
             $newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...

Dolibarr/Code/Core/Classes/Stats.php

Spacing +4 added lines, -4 removed lines

@@ -102,8 +102,8 @@ 
             return array();
         }
 
-        $data  = array();  // This is the return value
-        $datay = array();  // This is a work value
+        $data  = array(); // This is the return value
+        $datay = array(); // This is a work value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -205,7 +205,7 @@ 
         }
 
         $datay = array();
-        $data = array();  // Return value
+        $data = array(); // Return value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -359,7 +359,7 @@ 
         if ($foundintocache) {    // Cache file found and is not too old
             dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
             $data = json_decode(file_get_contents($newpathofdestfile), true);
-            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data';  // Phan can't decode json_decode's return value
+            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data'; // Phan can't decode json_decode's return value
         } else {
             // This method is defined in parent object only, not into abstract, so we disable phpstan warning
             /** @phpstan-ignore-next-line */

Dolibarr/Code/Core/Classes/Notify.php

Spacing +2 added lines, -2 removed lines

@@ -367,7 +367,7 @@ 
                 $this->fk_user = $obj->fk_user;
                 $this->email = $obj->email;
                 $this->threshold = $obj->threshold;
-                $this->context  = $obj->context;
+                $this->context = $obj->context;
                 $this->datec = $this->db->jdate($obj->datec);
                 $this->datem = $this->db->jdate($obj->datem);
             }
@@ -488,7 +488,7 @@ 
                     while ($i < $num) {
                         $obj = $this->db->fetch_object($resql);
                         // we want to notify only if contact is enable
-                        if ($obj && $obj->status ==  1) {
+                        if ($obj && $obj->status == 1) {
                             $newval2 = trim($obj->email);
                             $isvalid = isValidEmail($newval2);
                             if (empty($resarray[$newval2])) {

Dolibarr/Code/Core/Classes/lessc_parser.php

Spacing +20 added lines, -20 removed lines

@@ -133,17 +133,17 @@ 
 
 		if (!self::$operatorString) {
 			self::$operatorString =
-				'('.implode('|', array_map(
+				'(' . implode('|', array_map(
 					array('lessc', 'preg_quote'),
 					array_keys(self::$precedence)
-				)).')';
+				)) . ')';
 
 			$commentSingle = Lessc::preg_quote(self::$commentSingle);
 			$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
 			$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
 
-			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
-			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+			self::$commentMulti = $commentMultiLeft . '.*?' . $commentMultiRight;
+			self::$whitePattern = '/' . $commentSingle . '[^\n]*\s*|(' . self::$commentMulti . ')\s*|\s+/Ais';
 		}
 	}
 
@@ -176,7 +176,7 @@ 
 		while (false !== $this->parseChunk());
 
 		if ($this->count != strlen($this->buffer)) {
-			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+			$this->throwError('parse error count ' . $this->count . ' != len buffer ' . strlen($this->buffer));
 
 		}
 
@@ -383,7 +383,7 @@ 
 		// mixin
 		if ($this->mixinTags($tags) &&
 			$this->argumentDef($argv, $isVararg) &&
-			$this->keyword($suffix)  && $this->end()
+			$this->keyword($suffix) && $this->end()
 		) {
 			$tags = $this->fixTags($tags);
 			$this->append(array('mixin', $tags, $argv, $suffix), $s);
@@ -407,7 +407,7 @@ 
 			"|",
 			array_map(array("lessc", "preg_quote"), $directives)
 		);
-		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
+		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
 
 		return preg_match($pattern, $dirname);
 	}
@@ -491,7 +491,7 @@ 
 			$needWhite = $whiteBefore && !$this->inParens;
 
 			$m = array();
-			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+			if ($this->match(self::$operatorString . ($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
 				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
 					foreach (self::$supressDivisionProps as $pattern) {
 						if (preg_match($pattern, $this->env->currentProperty)) {
@@ -653,7 +653,7 @@ 
 		// css hack: \0
 		$m = array();
 		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
-			$value = array('keyword', '\\'.$m[1]);
+			$value = array('keyword', '\\' . $m[1]);
 			return true;
 		} else {
 			$this->seek($s);
@@ -777,7 +777,7 @@ 
 			$stop = array_merge($stop, $rejectStrs);
 		}
 
-		$patt = '(.*?)('.implode("|", $stop).')';
+		$patt = '(.*?)(' . implode("|", $stop) . ')';
 
 		$nestingLevel = 0;
 
@@ -851,8 +851,8 @@ 
 		$content = array();
 
 		// look for either ending delim , escape, or string interpolation
-		$patt = '([^\n]*?)(@\{|\\\\|'.
-			Lessc::preg_quote($delim).')';
+		$patt = '([^\n]*?)(@\{|\\\\|' .
+			Lessc::preg_quote($delim) . ')';
 
 		$oldWhite = $this->eatWhiteDefault;
 		$this->eatWhiteDefault = false;
@@ -1199,7 +1199,7 @@ 
 
 		while (true) {
 			$m = array();
-			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+			if ($this->match('([' . $chars . '0-9][' . $chars . ']*)', $m)) {
 				$parts[] = $m[1];
 				if ($simple) {
 					break;
@@ -1312,7 +1312,7 @@ 
 			if (!empty($sub)) {
 				$name = array('variable', $sub);
 			} else {
-				$name = $this->lessc->vPrefix.$name;
+				$name = $this->lessc->vPrefix . $name;
 			}
 			return true;
 		}
@@ -1499,7 +1499,7 @@ 
 			$validChars = $allowNewline ? "." : "[^\n]";
 		}
 		$m = array();
-		if (!$this->match('('.$validChars.'*?)'.Lessc::preg_quote($what), $m, !$until)) {
+		if (!$this->match('(' . $validChars . '*?)' . Lessc::preg_quote($what), $m, !$until)) {
 			return false;
 		}
 		if ($until) {
@@ -1516,7 +1516,7 @@ 
 			$eatWhitespace = $this->eatWhiteDefault;
 		}
 
-		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		$r = '/' . $regex . ($eatWhitespace && !$this->writeComments ? '\s*' : '') . '/Ais';
 		if (preg_match($r, $this->buffer, $out, 0, $this->count)) {
 			$this->count += strlen($out[0]);
 			if ($eatWhitespace && $this->writeComments) {
@@ -1554,7 +1554,7 @@ 
 		if (is_null($from)) {
 			$from = $this->count;
 		}
-		$r = '/'.$regex.'/Ais';
+		$r = '/' . $regex . '/Ais';
 		$result = preg_match($r, $this->buffer, $out, 0, $from);
 
 		return $result;
@@ -1674,7 +1674,7 @@ 
 				case '"':
 				case "'":
 					$m = array();
-					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
+					if (preg_match('/' . $min[0] . '.*?(?<!\\\\)' . $min[0] . '/', $text, $m, 0, $count)) {
 						$count += strlen($m[0]) - 1;
 					}
 					break;
@@ -1699,12 +1699,12 @@ 
 				$count += strlen($min[0]);
 			}
 
-			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+			$out .= substr($text, 0, $count) . str_repeat("\n", $newlines);
 			$text = substr($text, $count + $skip);
 
 			$min = null;
 		}
 
-		return $out.$text;
+		return $out . $text;
 	}
 }

Dolibarr/Code/Core/Classes/SMTPs.php

Spacing +2 added lines, -2 removed lines

@@ -588,7 +588,7 @@ 
                 }
                 // Most servers expect a 2nd pass of EHLO after TLS is established to get another time
                 // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-                if (! $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250')) {
+                if (!$_retVal = $this->socket_send_str('EHLO ' . $hosth, '250')) {
                     $this->_setErr(126, '"' . $hosth . '" does not support authenticated connections or temporary error. Error after 2nd sending EHLO ' . $hosth . ' : ' . $this->lastretval);
                     return $_retVal;
                 }
@@ -1709,7 +1709,7 @@ 
             $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
             $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
             $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-            $this->_msgContent['attachment'][$strFileName]['cid']      = $strCid;       // If defined, it means this attachment must be shown inline
+            $this->_msgContent['attachment'][$strFileName]['cid']      = $strCid; // If defined, it means this attachment must be shown inline
 
             if ($this->getMD5flag()) {
                 $this->_msgContent['attachment'][$strFileName]['md5'] = dol_hash($strContent, 3);