Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix CI: Do not require some fields in the 'title' definition of $cols (#33399)

Browse Source 
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols
This commit is contained in:
MDW
2025-03-11 01:42:49 +01:00
committed by GitHub
parent ec904bd1db
commit c0f533865f
10 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev/tools/phan/baseline.txt
View File

@@ -266,7 +266,6 @@ return [
'htdocs/core/class/canvas.class.php' => ['PhanParamTooMany', 'PhanUndeclaredMethod'],
'htdocs/core/class/ccountry.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
'htdocs/core/class/cgenericdic.class.php' => ['PhanUndeclaredProperty'],
'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeMismatchArgument'],
'htdocs/core/class/commoninvoice.class.php' => ['PhanTypeMismatchArgument'],
'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
'htdocs/core/class/commonpeople.class.php' => ['PhanUndeclaredProperty'],

4
htdocs/core/class/commondocgenerator.class.php
View File

@@ -219,7 +219,7 @@ abstract class CommonDocGenerator
public $phpmin = array(7, 1);
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;
@@ -1586,7 +1586,7 @@ abstract class CommonDocGenerator
$curentCellPaddinds = $pdf->getCellPaddings();
// set cell padding with column content definition
$pdf->setCellPaddings(isset($colDef['content']['padding'][3]) ? $colDef['content']['padding'][3] : 0, isset($colDef['content']['padding'][0]) ? $colDef['content']['padding'][0] : 0, isset($colDef['content']['padding'][1]) ? $colDef['content']['padding'][1] : 0, isset($colDef['content']['padding'][2]) ? $colDef['content']['padding'][2] : 0);
$pdf->writeHTMLCell($colDef['width'], 2, isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0, $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
$pdf->writeHTMLCell($colDef['width'], 2, isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0, $curY, $columnText, 0, 1, false, true, $colDef['content']['align']);
$this->setAfterColsLinePositionsData($colKey, $pdf->GetY(), $pdf->getPage());
// restore cell padding

2
htdocs/core/lib/functions.lib.php
View File

@@ -13157,7 +13157,7 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
foreach ($attr as $key => $value) {
if (!empty($params['use_unsecured_unescapedattr']) && is_array($params['use_unsecured_unescapedattr']) && in_array($key, $params['use_unsecured_unescapedattr'])) {
// Not recommended
$value = dol_htmlentities($attrV, ENT_QUOTES | ENT_SUBSTITUTE);
$value = dol_htmlentities($value, ENT_QUOTES | ENT_SUBSTITUTE);
} elseif ($key == 'href') {
$value = dolPrintHTMLForAttributeUrl($value);
} else {

2
htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
View File

@@ -82,7 +82,7 @@ class pdf_standard_asset extends ModelePDFAsset
public $situationinvoice;
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;

2
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@@ -84,7 +84,7 @@ class pdf_eratosthene extends ModelePDFCommandes
public $version = 'dolibarr';
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;

4
htdocs/core/modules/facture/doc/pdf_octopus.modules.php
View File

@@ -118,7 +118,7 @@ class pdf_octopus extends ModelePDFFactures
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;
@@ -2614,7 +2614,7 @@ class pdf_octopus extends ModelePDFFactures
$rank += 10;
$this->cols['photo'] = array(
'rank' => $rank,
'width' => getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH', 20), // in mm
'width' => getDolGlobalInt('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH', 20), // in mm
'status' => false,
'title' => array(
'textkey' => 'Photo',

2
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@@ -111,7 +111,7 @@ class pdf_sponge extends ModelePDFFactures
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;

2
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@@ -77,7 +77,7 @@ class pdf_cyan extends ModelePDFPropales
public $version = 'dolibarr';
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
View File

@@ -95,7 +95,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
public $emetteur;
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols;

2
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@@ -109,7 +109,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
public $defaultTitlesFieldsStyle = array();
/**
* @var array<string,array{rank:int,width:float|int,status:bool,title:array{textkey:string,label:string,align:string,padding:array{0:float,1:float,2:float,3:float}},content:array{align:string,padding:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
* @var array<string,array{rank:int,width:float|false,status:bool|int<0,1>,border-left?:bool,title:array{textkey:string,label?:string,align?:string,padding?:array{0:float,1:float,2:float,3:float}},content?:array{align?:string,padding?:array{0:float,1:float,2:float,3:float}}}> Array of document table columns
*/
public $cols = array();