lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: replace siezof by count

Browse Source 
Fix: update exclude dir
This commit is contained in:
Regis Houssin 2011-09-20 14:36:57 +00:00
parent 25cf224f0b
commit ebfc56e75f
5 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
build.xml
View File

@ -2,7 +2,7 @@
<project name="dolibarr" default="hudson" basedir="."> <project name="dolibarr" default="hudson" basedir=".">
<!-- Exclude/ignore paths --> <!-- Exclude/ignore paths -->
<property name="ignorepaths" value="${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdf,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/iwebkit,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" /> <property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" />
<target name="clean"> <target name="clean">
<!-- Clean up --> <!-- Clean up -->
@ -41,46 +41,44 @@
<!-- Generate pmd-cpd.xml --> <!-- Generate pmd-cpd.xml -->
<target name="phpcpd"> <target name="phpcpd">
<exec executable="phpcpd"> <exec executable="phpcpd">
<arg line="--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml' <arg line=" --log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
--exclude '${basedir}/htdocs/includes/adodbtime' --exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes/artichow' --exclude '${basedir}/htdocs/includes/adodbtime'
--exclude '${basedir}/htdocs/includes/barcode/php-barcode' --exclude '${basedir}/htdocs/includes/artichow'
--exclude '${basedir}/htdocs/includes/ckeditor' --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
--exclude '${basedir}/htdocs/includes/fpdf' --exclude '${basedir}/htdocs/includes/ckeditor'
--exclude '${basedir}/htdocs/includes/fpdfi' --exclude '${basedir}/htdocs/includes/fpdfi'
--exclude '${basedir}/htdocs/includes/geoip' --exclude '${basedir}/htdocs/includes/geoip'
--exclude '${basedir}/htdocs/includes/iwebkit' --exclude '${basedir}/htdocs/includes/jquery'
--exclude '${basedir}/htdocs/includes/jquery' --exclude '${basedir}/htdocs/includes/jsgantt'
--exclude '${basedir}/htdocs/includes/jsgantt' --exclude '${basedir}/htdocs/includes/nusoap'
--exclude '${basedir}/htdocs/includes/nusoap' --exclude '${basedir}/htdocs/includes/odtphp'
--exclude '${basedir}/htdocs/includes/odtphp' --exclude '${basedir}/htdocs/includes/phpexcel'
--exclude '${basedir}/htdocs/includes/phpexcel' --exclude '${basedir}/htdocs/includes/tcpdf'
--exclude '${basedir}/htdocs/includes/tcpdf' htdocs
htdocs " />
" />
</exec> </exec>
</target> </target>
<!-- Generate phploc.csv --> <!-- Generate phploc.csv -->
<target name="phploc"> <target name="phploc">
<exec executable="phploc"> <exec executable="phploc">
<arg line="--log-csv '${basedir}/hudson/logs/phploc.csv' <arg line=" --log-csv '${basedir}/hudson/logs/phploc.csv'
--exclude '${basedir}/htdocs/includes/adodbtime' --exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes/artichow' --exclude '${basedir}/htdocs/includes/adodbtime'
--exclude '${basedir}/htdocs/includes/barcode/php-barcode' --exclude '${basedir}/htdocs/includes/artichow'
--exclude '${basedir}/htdocs/includes/ckeditor' --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
--exclude '${basedir}/htdocs/includes/fpdf' --exclude '${basedir}/htdocs/includes/ckeditor'
--exclude '${basedir}/htdocs/includes/fpdfi' --exclude '${basedir}/htdocs/includes/fpdfi'
--exclude '${basedir}/htdocs/includes/geoip' --exclude '${basedir}/htdocs/includes/geoip'
--exclude '${basedir}/htdocs/includes/iwebkit' --exclude '${basedir}/htdocs/includes/jquery'
--exclude '${basedir}/htdocs/includes/jquery' --exclude '${basedir}/htdocs/includes/jsgantt'
--exclude '${basedir}/htdocs/includes/jsgantt' --exclude '${basedir}/htdocs/includes/nusoap'
--exclude '${basedir}/htdocs/includes/nusoap' --exclude '${basedir}/htdocs/includes/odtphp'
--exclude '${basedir}/htdocs/includes/odtphp' --exclude '${basedir}/htdocs/includes/phpexcel'
--exclude '${basedir}/htdocs/includes/phpexcel' --exclude '${basedir}/htdocs/includes/tcpdf'
--exclude '${basedir}/htdocs/includes/tcpdf' htdocs
htdocs " />
" />
</exec> </exec>
</target> </target>

2
build/doxygen/hudson-doxygen.doxyfile
View File

@ -611,7 +611,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded # directories that are symbolic links (a Unix filesystem feature) are excluded

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1695,7 +1695,7 @@ class Propal extends CommonObject
} }
$this->db->free($resql); $this->db->free($resql);
$nump = sizeOf($tab_sqlobj); $nump = count($tab_sqlobj);
if ($nump) if ($nump)
{ {

2
htdocs/compta/bank/treso.php
View File

@ -240,7 +240,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$tab_sqlobj[$key] = unserialize(trim($value, "'")); $tab_sqlobj[$key] = unserialize(trim($value, "'"));
} }
$num = sizeOf($tab_sqlobj); $num = count($tab_sqlobj);
//$num = $db->num_rows($result); //$num = $db->num_rows($result);
$i = 0; $i = 0;

6
test/phpunit/hudson_phpunittest.xml
View File

@ -15,10 +15,9 @@
<directory suffix=".php">../../build/</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../dev/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../doc/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/CVS/</directory>
<directory suffix=".php">../../test/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
<directory suffix=".php">../../htdocs/custom/</directory> <directory suffix=".php">../../htdocs/custom/</directory>
<directory suffix=".php">../../htdocs/custom2/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
@ -53,10 +52,9 @@
<directory suffix=".php">../../build/</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../dev/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../doc/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/CVS/</directory>
<directory suffix=".php">../../test/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
<directory suffix=".php">../../htdocs/custom/</directory> <directory suffix=".php">../../htdocs/custom/</directory>
<directory suffix=".php">../../htdocs/custom2/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>