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

Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-08-20 16:52:22 +02:00
parent ac17198af6 45cff5ad90
commit ef5f825667
11 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/lib/admin.lib.php
View File

@@ -52,8 +52,10 @@ function versiontostring($versionarray)
}
/**
* Compare 2 versions (stored into 2 arrays).
* To check if Dolibarr version is lower than (x,y,z), do "if versioncompare(versiondolibarrarray(), array(x.y.z)) <= 0"
* Compare 2 versions (stored into 2 arrays), to know if a version (a,b,c) is lower than (x,y,z)
* To check using a string version do a preg_split('/[\.\-]/', strinversion) to convert the string into an array.
* To check with Dolibarr version use versiondolibarrarray() to get the array of Dolibarr current version
*
* For example: if (versioncompare(versiondolibarrarray(),array(4,0,-5)) >= 0) is true if version is 4.0 alpha or higher.
* For example: if (versioncompare(versiondolibarrarray(),array(4,0,0)) >= 0) is true if version is 4.0 final or higher.
* For example: if (versioncompare(versiondolibarrarray(),array(4,0,1)) >= 0) is true if version is 4.0.1 or higher.
@@ -61,9 +63,9 @@ function versiontostring($versionarray)
*
* @param array<int|string> $versionarray1 Array of version (vermajor,verminor,patch)
* @param array<int|string> $versionarray2 Array of version (vermajor,verminor,patch)
* @return int<-4,4> -4,-3,-2,-1 if versionarray1<versionarray2 (value depends on level of difference)
* 0 if same
* 1,2,3,4 if versionarray1>versionarray2 (value depends on level of difference)
* @return int<-4,4> -4,-3,-2,-1 if versionarray1<versionarray2 (value depends on level of difference)
* 0 if same
* 1,2,3,4 if versionarray1>versionarray2 (value depends on level of difference)
* @see versiontostring()
*/
function versioncompare($versionarray1, $versionarray2)
@@ -118,7 +120,7 @@ function versioncompare($versionarray1, $versionarray2)
}
}
//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
return $ret;
return $ret; // return level=1 if difference is on the main version, level=2 on minor version, level=3 on maintenance version, level=4 on development phase version
}
@@ -136,12 +138,12 @@ function versionphparray()
/**
* Return version Dolibarr
*
* @return array<int<0,2>,string> Tableau de version (vermajeur,vermineur,autre)
* @return array<int<0,2>,string> Array of version (vermajor,verminor,vermaintenance,other)
* @see versioncompare()
*/
function versiondolibarrarray()
{
return explode('.', DOL_VERSION);
return preg_split('/[\-\.]/', DOL_VERSION);
}