Dolibarr / dolibarr

dev/tools/phan/config.php

Spacing +70 added lines, -70 removed lines

@@ -76,12 +76,12 @@ 
 	'bom' => 'Bom',
 	'bookcal' => 'BookCal',
 	'bookmark' => 'Bookmark',
-	'cashdesk' => null,  // TODO: fill in proper class
+	'cashdesk' => null, // TODO: fill in proper class
 	'category' => 'Categorie',
 	'clicktodial' => 'ClickToDial',
 	'collab' => 'Collab',
 	'comptabilite' => 'Comptabilite',
-	'contact' => null,  // TODO: fill in proper class
+	'contact' => null, // TODO: fill in proper class
 	'contract' => 'Contrat',
 	'cron' => 'Cron',
 	'datapolicy' => 'DataPolicy',
@@ -93,7 +93,7 @@ 
 	'don' => 'Don',
 	'dynamicprices' => 'DynamicPrices',
 	'ecm' => 'ECM',
-	'ecotax' => null,  // TODO: External module ?
+	'ecotax' => null, // TODO: External module ?
 	'emailcollector' => 'EmailCollector',
 	'eventorganization' => 'EventOrganization',
 	'expensereport' => 'ExpenseReport',
@@ -104,7 +104,7 @@ 
 	'fournisseur' => 'Fournisseur',
 	'ftp' => 'FTP',
 	'geoipmaxmind' => 'GeoIPMaxmind',
-	'google' => null,  // External ?
+	'google' => null, // External ?
 	'gravatar' => 'Gravatar',
 	'holiday' => 'Holiday',
 	'hrm' => 'HRM',
@@ -118,7 +118,7 @@ 
 	'ldap' => 'Ldap',
 	'loan' => 'Loan',
 	'mailing' => 'Mailing',
-	'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+	'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
 	'mailmanspip' => 'MailmanSpip',
 	'margin' => 'Margin',
 	'member' => 'Adherent',
@@ -131,7 +131,7 @@ 
 	'notification' => 'Notification',
 	'numberwords' => null, // Not provided by default, no module tests
 	'oauth' => 'OAuth',
-	'openstreetmap' => null,  // External module?
+	'openstreetmap' => null, // External module?
 	'opensurvey' => 'OpenSurvey',
 	'order' => 'Commande',
 	'partnership' => 'Partnership',
@@ -158,8 +158,8 @@ 
 	'stock' => 'Stock',
 	'stocktransfer' => 'StockTransfer',
 	'stripe' => 'Stripe',
-	'supplier_invoice' => null,  // Special case, uses invoice
-	'supplier_order' => null,  // Special case, uses invoice
+	'supplier_invoice' => null, // Special case, uses invoice
+	'supplier_order' => null, // Special case, uses invoice
 	'supplier_proposal' => 'SupplierProposal',
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
@@ -221,7 +221,7 @@ 
 	//	'processes' => 6,
 	'backward_compatibility_checks' => false,
 	'simplify_ast' => true,
-	'analyzed_file_extensions' => ['php','inc'],
+	'analyzed_file_extensions' => ['php', 'inc'],
 	'globals_type_map' => [
 		'_Avery_Labels' => 'array<string,array{name:string,paper-size:string,orientation:string,metric:string,marginLeft:float,marginTop:float,NX:int,NY:int,SpaceX:float,SpaceY:float,width:float,height:float,font-size:float,custom_x:float,custom_y:float}>',
 		'action' => 'string',
@@ -275,7 +275,7 @@ 
 		'shmkeys' => 'array<string,int>', // memory.lib
 		'shmoffset' => 'int', // memory.lib
 		'user' => '\User',
-		'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
+		'website' => 'string', // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
 		'websitepage' => '\WebSitePage',
 		'websitepagefile' => 'string',
 		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
@@ -299,7 +299,7 @@ 
 	// your application should be included in this list.
 	'directory_list' => [
 		'htdocs',
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 
 	// A directory list that defines files that will be excluded
@@ -317,7 +317,7 @@ 
 		'htdocs/includes/',
 		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
 	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
@@ -334,7 +334,7 @@ 
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
 		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		// .'|htdocs/[^h].*/.*'  // For testing @phpstan-ignore-line
-		.')@',  // @phpstan-ignore-line
+		.')@', // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
 	// Plugins which are bundled with Phan can be added here by providing their name
@@ -350,14 +350,14 @@ 
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
-		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
-		'/^checkVal$/' => [1, $sanitizeRegex,"UnknownCheckValSanitizeType"],
-		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex,"UnknownExtrafieldTypeBack"],
-		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}',"InvalidDolNowArgument"],
-		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}',"InvalidDolMktimeArgument"],  // '', 0, 1 match bool and int values
-		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}',"InvalidDolMktimeArgument"],  // '', 0, 1 match bool and int values
-		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidGetPostFloatRounding"],
-		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidPrice2NumRounding"],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex, "UnknownSanitizeType"],
+		'/^checkVal$/' => [1, $sanitizeRegex, "UnknownCheckValSanitizeType"],
+		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex, "UnknownExtrafieldTypeBack"],
+		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}', "InvalidDolNowArgument"],
+		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}', "InvalidDolMktimeArgument"], // '', 0, 1 match bool and int values
+		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}', "InvalidDolMktimeArgument"], // '', 0, 1 match bool and int values
+		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidGetPostFloatRounding"],
+		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidPrice2NumRounding"],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
@@ -418,42 +418,42 @@ 
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 
-		'PhanCompatibleNegativeStringOffset',	// return false positive
-		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanCompatibleNegativeStringOffset', // return false positive
+		'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayPropertyType',	// this option costs more time to be supported than it solves time
-		'PhanTypeArraySuspiciousNullable',		// this option costs more time to be supported than it solves time
+		'PhanTypeArraySuspiciousNullable', // this option costs more time to be supported than it solves time
 		// 'PhanTypeInvalidDimOffset',			// Helps identify missing array indexes in types or reference to unset indexes
 		'PhanTypeObjectUnsetDeclaredProperty',
-		'PhanTypePossiblyInvalidDimOffset',			// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is
 
-		'PhanPluginWhitespaceTab',		// Dolibarr uses tabs
-		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
-		'PhanPluginShortArray',			// Dolibarr uses array()
-		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		'PhanPluginWhitespaceTab', // Dolibarr uses tabs
+		'PhanPluginCanUsePHP71Void', // Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray', // Dolibarr uses array()
+		'PhanPluginShortArrayList', // Dolibarr uses array()
 		// Fixers From PHPDocToRealTypesPlugin:
-		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
-		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+		'PhanPluginCanUseParamType', // Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType', // Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType', // Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType', // Fixer - Report/Add nullable return types in the function definition
 
-		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
-		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Also reported by phpstan < lvl6 - 12300+ occurrences
-		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
-		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginNonBoolBranch', // Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison', // Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument', // Also reported by phpstan < lvl6 - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith', // Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar', // Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',
-		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
-		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
-		'PhanPluginRedundantAssignment',				// Not essential, useless
-		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences
+		'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning
+		'PhanPluginRedundantAssignment', // Not essential, useless
+		'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences
 
 		// 'PhanPluginUnknownArrayMethodParamType',	// Too many troubles to manage. Is enabled in config_extended only.
 		// 'PhanPluginUnknownArrayMethodReturnType',	// Too many troubles to manage. Is enabled in config_extended only.
 		// 'PhanUndeclaredGlobalVariable',			// Helps identify variables that are not set/defined - add '@phan-var-force TYPE $varname' in tpl or includes to help type the variable
 		// 'PhanPluginUnknownObjectMethodCall',	// False positive for some class. Is enabled in config_extended only.
-		'PhanTypeSuspiciousNonTraversableForeach',  // Reports on `foreach ($object as $key => $value)` which works without php notices, so we ignore it because this is intentional in the code.
+		'PhanTypeSuspiciousNonTraversableForeach', // Reports on `foreach ($object as $key => $value)` which works without php notices, so we ignore it because this is intentional in the code.
 	],
 	// You can put relative paths to internal stubs in this config option.
 	// Phan will continue using its detailed type annotations,
@@ -472,31 +472,31 @@ 
 		//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
 		//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
 		//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
-		'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
-		'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
-		'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
-		'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
-		'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
-		'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
-		'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
-		'imagick'  => PHAN_DIR . '/stubs/imagick.phan_php',
-		'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
-		'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
-		'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
-		'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
-		'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
-		'memcached' => PHAN_DIR . '/stubs/memcached.phan_php',
-		'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
-		'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
-		'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
-		'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
-		'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
-		'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
-		'session'  => PHAN_DIR . '/stubs/session.phan_php',
-		'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
-		'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
-		'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
-		'tidy'  => PHAN_DIR . '/stubs/tidy.phan_php',
-		'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+		'brotli'  => PHAN_DIR.'/stubs/brotli.phan_php',
+		'curl'  => PHAN_DIR.'/stubs/curl.phan_php',
+		'calendar'  => PHAN_DIR.'/stubs/calendar.phan_php',
+		'fileinfo'  => PHAN_DIR.'/stubs/fileinfo.phan_php',
+		'ftp'  => PHAN_DIR.'/stubs/ftp.phan_php',
+		'gd'  => PHAN_DIR.'/stubs/gd.phan_php',
+		'geoip'  => PHAN_DIR.'/stubs/geoip.phan_php',
+		'imagick'  => PHAN_DIR.'/stubs/imagick.phan_php',
+		'imap'  => PHAN_DIR.'/stubs/imap.phan_php',
+		'intl'  => PHAN_DIR.'/stubs/intl.phan_php',
+		'ldap'  => PHAN_DIR.'/stubs/ldap.phan_php',
+		'mcrypt'  => PHAN_DIR.'/stubs/mcrypt.phan_php',
+		'memcache'  => PHAN_DIR.'/stubs/memcache.phan_php',
+		'memcached' => PHAN_DIR.'/stubs/memcached.phan_php',
+		'mysqli'  => PHAN_DIR.'/stubs/mysqli.phan_php',
+		'pdo_cubrid'  => PHAN_DIR.'/stubs/pdo_cubrid.phan_php',
+		'pdo_mysql'  => PHAN_DIR.'/stubs/pdo_mysql.phan_php',
+		'pdo_pgsql'  => PHAN_DIR.'/stubs/pdo_pgsql.phan_php',
+		'pdo_sqlite'  => PHAN_DIR.'/stubs/pdo_sqlite.phan_php',
+		'pgsql'  => PHAN_DIR.'/stubs/pgsql.phan_php',
+		'session'  => PHAN_DIR.'/stubs/session.phan_php',
+		'simplexml'  => PHAN_DIR.'/stubs/SimpleXML.phan_php',
+		'soap'  => PHAN_DIR.'/stubs/soap.phan_php',
+		'sockets'  => PHAN_DIR.'/stubs/sockets.phan_php',
+		'tidy'  => PHAN_DIR.'/stubs/tidy.phan_php',
+		'zip'  => PHAN_DIR.'/stubs/zip.phan_php',
 	],
 ];

htdocs/compta/facture/class/facture-rec.class.php

Spacing +24 added lines, -24 removed lines

@@ -645,7 +645,7 @@ 
 				$this->titre                  = $obj->title; // deprecated
 				$this->title                  = $obj->title;
 				$this->ref                    = $obj->title;
-				$this->subtype				  = $obj->subtype;
+				$this->subtype = $obj->subtype;
 				$this->suspended              = $obj->suspended;
 				$this->total_ht               = $obj->total_ht;
 				$this->total_tva              = $obj->total_tva;
@@ -665,7 +665,7 @@ 
 				$this->fk_account             = $obj->fk_account;
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
-				$this->user_author            = $obj->fk_user_author;	// deprecated
+				$this->user_author            = $obj->fk_user_author; // deprecated
 				$this->user_creation_id       = $obj->fk_user_author;
 				$this->model_pdf              = $obj->model_pdf;
 				//$this->special_code = $obj->special_code;
@@ -764,35 +764,35 @@ 
 				$objp = $this->db->fetch_object($result);
 				$line = new FactureLigneRec($this->db);
 
-				$line->id				= $objp->rowid;
+				$line->id = $objp->rowid;
 				$line->rowid			= $objp->rowid;
-				$line->fk_facture		= $objp->fk_facture;
-				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->fk_facture = $objp->fk_facture;
+				$line->fk_parent_line = $objp->fk_parent_line;
 				$line->desc				= $objp->description; // Description line
 				$line->description		= $objp->description; // Description line
-				$line->ref				= $objp->product_ref; // Ref product
+				$line->ref = $objp->product_ref; // Ref product
 				$line->product_ref		= $objp->product_ref; // Ref product
-				$line->libelle			= $objp->product_label; // deprecated
+				$line->libelle = $objp->product_label; // deprecated
 				$line->product_label	= $objp->product_label; // Label product
 				$line->product_desc		= $objp->product_desc; // Description product
 				$line->product_type		= $objp->product_type; // Type of line
-				$line->fk_product_type	= $objp->fk_product_type; // Type of product
+				$line->fk_product_type = $objp->fk_product_type; // Type of product
 				$line->qty 				= $objp->qty;
-				$line->subprice			= $objp->subprice;
+				$line->subprice = $objp->subprice;
 
 				$line->label			= $objp->custom_label; // @deprecated
 
 				$line->vat_src_code		= $objp->vat_src_code;
-				$line->tva_tx			= $objp->tva_tx;
+				$line->tva_tx = $objp->tva_tx;
 				$line->localtax1_tx		= $objp->localtax1_tx;
 				$line->localtax2_tx		= $objp->localtax2_tx;
 				$line->localtax1_type	= $objp->localtax1_type;
 				$line->localtax2_type	= $objp->localtax2_type;
 				$line->remise_percent	= $objp->remise_percent;
 				//$line->fk_remise_except = $objp->fk_remise_except;
-				$line->fk_product		= $objp->fk_product;
-				$line->date_start_fill	= $objp->date_start_fill;
-				$line->date_end_fill	= $objp->date_end_fill;
+				$line->fk_product = $objp->fk_product;
+				$line->date_start_fill = $objp->date_start_fill;
+				$line->date_end_fill = $objp->date_end_fill;
 				$line->info_bits		= $objp->info_bits;
 				$line->total_ht			= $objp->total_ht;
 				$line->total_tva		= $objp->total_tva;
@@ -808,13 +808,13 @@ 
 				$line->marge_tx			= (string) $marginInfos[1];
 				$line->marque_tx		= (string) $marginInfos[2];
 				$line->rang				= $objp->rang;
-				$line->special_code		= $objp->special_code;
-				$line->fk_unit			= $objp->fk_unit;
-				$line->fk_contract_line	= $objp->fk_contract_line;
+				$line->special_code = $objp->special_code;
+				$line->fk_unit = $objp->fk_unit;
+				$line->fk_contract_line = $objp->fk_contract_line;
 
 				// Ne plus utiliser
-				$line->price			= $objp->price;
-				$line->remise			= $objp->remise;
+				$line->price = $objp->price;
+				$line->remise = $objp->remise;
 
 				$line->fetch_optionals();
 
@@ -1407,7 +1407,7 @@ 
 
 					$facture->type = self::TYPE_STANDARD;
 					$facture->subtype = $facturerec->subtype;
-					$facture->statut = self::STATUS_DRAFT;	// deprecated
+					$facture->statut = self::STATUS_DRAFT; // deprecated
 					$facture->status = self::STATUS_DRAFT;
 					$facture->date = (empty($facturerec->date_when) ? $now : $facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
 					$facture->socid = $facturerec->socid;
@@ -1557,7 +1557,7 @@ 
 		}
 		$result .= $linkend;
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -2008,7 +2008,7 @@ 
 					$resSuspend = $this->setValueFrom('suspended', 1);
 
 					if ($resSuspend <= 0) {
-						dol_syslog(__METHOD__ . '::setValueFrom Error : ' . $this->error, LOG_ERR);
+						dol_syslog(__METHOD__.'::setValueFrom Error : '.$this->error, LOG_ERR);
 						return -1;
 					}
 				}
@@ -2348,9 +2348,9 @@ 
 		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
-			$this->id				= $objp->rowid;
-			$this->fk_facture		= $objp->fk_facture;
-			$this->fk_parent_line	= $objp->fk_parent_line;
+			$this->id = $objp->rowid;
+			$this->fk_facture = $objp->fk_facture;
+			$this->fk_parent_line = $objp->fk_parent_line;
 			$this->label            = $objp->custom_label; // Label line
 			$this->desc             = $objp->description; // Description line
 			$this->description      = $objp->description; // Description line

htdocs/webportal/controllers/document.controller.class.php

Spacing +18 added lines, -18 removed lines

@@ -23,7 +23,7 @@ 
 * \brief       This file is a controller for documents
 */
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 /**
@@ -152,7 +152,7 @@ 
 		}
 
 		// Security: Delete string ../ or ..\ into $original_file
-		$original_file = preg_replace('/\.\.+/', '..', $original_file);    // Replace '... or more' with '..'
+		$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 		$original_file = str_replace('../', '/', $original_file);
 		$original_file = str_replace('..\\', '/', $original_file);
 
@@ -169,13 +169,13 @@ 
 		// check config access
 		// and file mime type (only PDF)
 		// and check login access
-		if (getDolGlobalInt('WEBPORTAL_' . $moduleNameUpperEn . '_LIST_ACCESS')
+		if (getDolGlobalInt('WEBPORTAL_'.$moduleNameUpperEn.'_LIST_ACCESS')
 			&& in_array($type, array('application/pdf'))
 			&& ($context->logged_thirdparty && $context->logged_thirdparty->id > 0)
 			&& $context->logged_thirdparty->id == $socId
 		) {
 			if (isModEnabled($moduleName) && isset($conf->{$moduleName}->multidir_output[$entity])) {
-				$original_file = $conf->{$moduleName}->multidir_output[$entity] . '/' . $original_file;
+				$original_file = $conf->{$moduleName}->multidir_output[$entity].'/'.$original_file;
 				$accessallowed = 1;
 			}
 		}
@@ -190,13 +190,13 @@ 
 		// Security:
 		// We refuse directory transversal change and pipes in file names
 		if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file)) {
-			dol_syslog("Refused to deliver file " . $fullpath_original_file);
-			print "ErrorFileNameInvalid: " . dol_escape_htmltag($original_file);
+			dol_syslog("Refused to deliver file ".$fullpath_original_file);
+			print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 			exit;
 		}
 
 		// Find the subdirectory name as the reference
-		$refname = basename(dirname($original_file) . "/");
+		$refname = basename(dirname($original_file)."/");
 
 		$filename = basename($fullpath_original_file);
 		$filename = preg_replace('/\.noexe$/i', '', $filename);
@@ -207,8 +207,8 @@ 
 
 		// This test if file exists should be useless. We keep it to find bug more easily
 		if (!file_exists($fullpath_original_file_osencoded)) {
-			dol_syslog("ErrorFileDoesNotExists: " . $fullpath_original_file);
-			print "ErrorFileDoesNotExists: " . $original_file;
+			dol_syslog("ErrorFileDoesNotExists: ".$fullpath_original_file);
+			print "ErrorFileDoesNotExists: ".$original_file;
 			exit;
 		}
 
@@ -216,8 +216,8 @@ 
 		$fileSizeMaxDefault = 20 * 1024; // 20 Mo by default
 		$fileSizeMax = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED', $fileSizeMaxDefault);
 		if ($fileSize > $fileSizeMax) {
-			dol_syslog('ErrorFileSizeTooLarge: ' . $fileSize);
-			print 'ErrorFileSizeTooLarge: ' . $fileSize . ' (max ' . $fileSizeMax . ')';
+			dol_syslog('ErrorFileSizeTooLarge: '.$fileSize);
+			print 'ErrorFileSizeTooLarge: '.$fileSize.' (max '.$fileSizeMax.')';
 			exit;
 		}
 
@@ -229,9 +229,9 @@ 
 		$object = new stdClass();
 		$reshook = $hookmanager->executeHooks('downloadDocument', $parameters, $object, $action); // Note that $action and $object may have been
 		if ($reshook < 0) {
-			$errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . implode(', ', $hookmanager->errors) : '');
-			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors);
-			print "ErrorDownloadDocumentHooks: " . $errors;
+			$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').implode(', ', $hookmanager->errors) : '');
+			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
+			print "ErrorDownloadDocumentHooks: ".$errors;
 			exit;
 		}
 
@@ -309,19 +309,19 @@ 
 		top_httphead($type);
 		header('Content-Description: File Transfer');
 		if ($encoding) {
-			header('Content-Encoding: ' . $encoding);
+			header('Content-Encoding: '.$encoding);
 		}
 		// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
 		if ($attachment) {
-			header('Content-Disposition: attachment; filename="' . $filename . '"');
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
 		} else {
-			header('Content-Disposition: inline; filename="' . $filename . '"');
+			header('Content-Disposition: inline; filename="'.$filename.'"');
 		}
 		header('Cache-Control: Public, must-revalidate');
 		header('Pragma: public');
 
 		// Send file now
-		header('Content-Length: ' . dol_filesize($fullpath_original_file));
+		header('Content-Length: '.dol_filesize($fullpath_original_file));
 		readfileLowMemory($fullpath_original_file_osencoded);
 	}
 }

htdocs/ftp/index.php

Spacing +1 added lines, -1 removed lines

@@ -489,7 +489,7 @@
 				$buff = ftp_rawlist($conn_id, $newsectioniso);
 				$contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
 			} else {
-				dol_syslog(__FILE__ . ": Unexpected state for ftp connection", LOG_ERR);
+				dol_syslog(__FILE__.": Unexpected state for ftp connection", LOG_ERR);
 				$buff = array();
 				$contents = array();
 			}

htdocs/core/lib/customreports.lib.php

Spacing +9 added lines, -9 removed lines

@@ -227,10 +227,10 @@ 
 				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
 				continue;
 			}
-			if (isset($val['enabled']) && ! (int) dol_eval($val['enabled'], 1, 1, '1')) {
+			if (isset($val['enabled']) && !(int) dol_eval($val['enabled'], 1, 1, '1')) {
 				continue;
 			}
-			if (isset($val['visible']) && ! (int) dol_eval($val['visible'], 1, 1, '1')) {
+			if (isset($val['visible']) && !(int) dol_eval($val['visible'], 1, 1, '1')) {
 				continue;
 			}
 			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
@@ -392,10 +392,10 @@ 
 				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
 				continue;
 			}
-			if (isset($val['enabled']) && ! (int) dol_eval($val['enabled'], 1, 1, '1')) {
+			if (isset($val['enabled']) && !(int) dol_eval($val['enabled'], 1, 1, '1')) {
 				continue;
 			}
-			if (isset($val['visible']) && ! (int) dol_eval($val['visible'], 1, 1, '1')) {
+			if (isset($val['visible']) && !(int) dol_eval($val['visible'], 1, 1, '1')) {
 				continue;
 			}
 			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
@@ -470,7 +470,7 @@ 
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>', // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -478,7 +478,7 @@ 
 				);
 			} else {
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),  // @phan-suppress-current-line PhanUndeclaredProperty
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val), // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 					'table' => $object->table_element,
@@ -550,10 +550,10 @@ 
 				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
 				continue;
 			}
-			if (isset($val['enabled']) && ! (int) dol_eval($val['enabled'], 1, 1, '1')) {
+			if (isset($val['enabled']) && !(int) dol_eval($val['enabled'], 1, 1, '1')) {
 				continue;
 			}
-			if (isset($val['visible']) && ! (int) dol_eval($val['visible'], 1, 1, '1')) {
+			if (isset($val['visible']) && !(int) dol_eval($val['visible'], 1, 1, '1')) {
 				continue;
 			}
 			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
@@ -589,7 +589,7 @@ 
 			}
 
 			$arrayoffields[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),  // @phan-suppress-current-line PhanUndeclaredProperty
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val), // @phan-suppress-current-line PhanUndeclaredProperty
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 				'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 				'table' => $object->table_element,

htdocs/core/lib/images.lib.php

Spacing +3 added lines, -3 removed lines

@@ -213,7 +213,7 @@ 
 
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
-	$infoImg = getimagesize($filetoread); 			// Get data about src image
+	$infoImg = getimagesize($filetoread); // Get data about src image
 	$imgWidth = $infoImg[0]; // Largeur de l'image
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
@@ -334,7 +334,7 @@ 
 	}
 
 	// Set transparent color according to image extension
-	$trans_colour = -1;	// By default, undefined
+	$trans_colour = -1; // By default, undefined
 	switch ($newExt) {
 		case 'gif':	// Gif
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // The method is different for the GIF format
@@ -801,7 +801,7 @@ 
 			imagejpeg($imgThumb, $imgThumbName, $newquality); // @phan-suppress-current-line PhanTypeMismatchArgumentNullableInternal,PhanPossiblyUndeclaredVariable
 			break;
 		case IMAGETYPE_PNG:	    // 3
-			imagepng($imgThumb, $imgThumbName, $newquality);  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			imagepng($imgThumb, $imgThumbName, $newquality); // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
 			break;
 		case IMAGETYPE_BMP:	    // 6
 			// Not supported by PHP GD

htdocs/core/lib/functionsnumtoword.lib.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 	// Get 2 decimals to cents, another functions round or truncate
 	$strnumber = number_format($numero, 10);
 	$len = strlen($strnumber);
-	$parte_decimal = '00';  // For static analysis, strnumber should contain '.'
+	$parte_decimal = '00'; // For static analysis, strnumber should contain '.'
 	for ($i = 0; $i < $len; $i++) {
 		if ($strnumber[$i] == '.') {
 			$parte_decimal = $strnumber[$i + 1].$strnumber[$i + 2];

htdocs/core/lib/price.lib.php

Spacing +6 added lines, -6 removed lines

@@ -142,8 +142,8 @@ 
 	// Now we search localtaxes information ourself (rates and types).
 	$localtax1_type = 0;
 	$localtax2_type = 0;
-	$localtax1_rate = 1000;  // For static analysis, exaggerated value to help detect bugs
-	$localtax2_rate = 1000;  // For static analysis, exaggerated value to help detect bugs
+	$localtax1_rate = 1000; // For static analysis, exaggerated value to help detect bugs
+	$localtax2_rate = 1000; // For static analysis, exaggerated value to help detect bugs
 
 	if (is_array($localtaxes_array) && count($localtaxes_array)) {
 		$localtax1_type = $localtaxes_array[0];
@@ -412,13 +412,13 @@ 
 		}
 
 		// Recall function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
-		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0, '');  // pu_devise is normally arg#15, here as arg#2 @phan-suppress-current-line PhanPluginSuspiciousParamPosition
+		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0, ''); // pu_devise is normally arg#15, here as arg#2 @phan-suppress-current-line PhanPluginSuspiciousParamPosition
 
 		if ($multicurrency_code) {
 			// Restore setup of currency accurency
-			$conf->global->MAIN_MAX_DECIMALS_UNIT = $savMAIN_MAX_DECIMALS_UNIT;  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
-			$conf->global->MAIN_MAX_DECIMALS_TOT = $savMAIN_MAX_DECIMALS_TOT;  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
-			$conf->global->MAIN_ROUNDING_RULE_TOT = $savMAIN_ROUNDING_RULE_TOT;  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			$conf->global->MAIN_MAX_DECIMALS_UNIT = $savMAIN_MAX_DECIMALS_UNIT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			$conf->global->MAIN_MAX_DECIMALS_TOT = $savMAIN_MAX_DECIMALS_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			$conf->global->MAIN_ROUNDING_RULE_TOT = $savMAIN_ROUNDING_RULE_TOT; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
 		}
 
 		$result[16] = $newresult[0];

htdocs/core/lib/agenda.lib.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 
 	// Hooks
 	$parameters = array('canedit' => $canedit, 'pid' => $pid, 'socid' => $socid);
-	$object = null;  // Null on purpose: @phan-suppress-next-line PhanPluginConstantVariableNull
+	$object = null; // Null on purpose: @phan-suppress-next-line PhanPluginConstantVariableNull
 	$reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
 	print '<div class="clearboth"></div>';