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

Merge pull request #2560 from Dolibarr/scrutinizer-patch-2

Browse Source 
Scrutinizer Auto-Fixes
This commit is contained in:
Laurent Destailleur 2015-04-07 23:56:40 +02:00
commit f9c8b2e1cf
12 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/filemanagerdol/connectors/php/commands.php
View File

@ -22,6 +22,9 @@
* This is the File Manager Connector for PHP. * This is the File Manager Connector for PHP.
*/ */
/**
* @param string $currentFolder
*/
function GetFolders( $resourceType, $currentFolder ) function GetFolders( $resourceType, $currentFolder )
{ {
// Map the virtual path to the local server path. // Map the virtual path to the local server path.
@ -178,6 +181,9 @@ function CreateFolder( $resourceType, $currentFolder )
// DOL_CHANGE // DOL_CHANGE
//function FileUpload( $resourceType, $currentFolder, $sCommand ) //function FileUpload( $resourceType, $currentFolder, $sCommand )
/**
* @param string $currentFolder
*/
function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '') function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
{ {
if (!isset($_FILES)) { if (!isset($_FILES)) {

6
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -452,7 +452,7 @@ class pdf_strato extends ModelePDFContract
* Show top header of page. * Show top header of page.
* *
* @param PDF $pdf Object PDF * @param PDF $pdf Object PDF
* @param Object $object Object to show * @param CommonObject $object Object to show
* @param int $showaddress 0=no, 1=yes * @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
* @return void * @return void
@ -631,10 +631,10 @@ class pdf_strato extends ModelePDFContract
* Show footer of page. Need this->emetteur object * Show footer of page. Need this->emetteur object
* *
* @param PDF $pdf PDF * @param PDF $pdf PDF
* @param Object $object Object to show * @param CommonObject $object Object to show
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text * @param int $hidefreetext 1=Hide free text
* @return void * @return integer
*/ */
function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
{ {

2
htdocs/core/modules/import/modules_import.php
View File

@ -63,7 +63,7 @@ class ModeleImports
* Charge en memoire et renvoie la liste des modeles actifs * Charge en memoire et renvoie la liste des modeles actifs
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of templates * @return array List of templates
*/ */
function liste_modeles($db,$maxfilenamelength=0) function liste_modeles($db,$maxfilenamelength=0)

2
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -60,7 +60,7 @@ class mailing_contacts1 extends MailingTargets
* array of SQL request that returns two field: * array of SQL request that returns two field:
* One called "label", One called "nb". * One called "label", One called "nb".
* *
* @return array Array with SQL requests * @return string[] Array with SQL requests
*/ */
function getSqlArrayForStats() function getSqlArrayForStats()
{ {

2
htdocs/core/modules/mailings/fraise.modules.php
View File

@ -63,7 +63,7 @@ class mailing_fraise extends MailingTargets
* array of SQL request that returns two field: * array of SQL request that returns two field:
* One called "label", One called "nb". * One called "label", One called "nb".
* *
* @return array Array with SQL requests * @return string[] Array with SQL requests
*/ */
function getSqlArrayForStats() function getSqlArrayForStats()
{ {

2
htdocs/core/modules/product/modules_product.class.php
View File

@ -105,7 +105,7 @@ abstract class ModeleProductCode
* Renvoi la liste des modeles de numérotation * Renvoi la liste des modeles de numérotation
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of numbers * @return array List of numbers
*/ */
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)

2
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -105,7 +105,7 @@ class doc_generic_project_odt extends ModelePDFProjects
/** /**
* Define array with couple substitution key => substitution value * Define array with couple substitution key => substitution value
* *
* @param Object $object Main object to use as data source * @param Project $object Main object to use as data source
* @param Translate $outputlangs Lang object to use for output * @param Translate $outputlangs Lang object to use for output
* @return array Array of substitution * @return array Array of substitution
*/ */

4
htdocs/core/modules/propale/modules_propale.php
View File

@ -43,7 +43,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
* Return list of active generation modules * Return list of active generation modules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of templates * @return array List of templates
*/ */
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)
@ -149,7 +149,7 @@ abstract class ModeleNumRefPropales
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param object $object Object proposal * @param Propal $object Object proposal
* @param string $modele Force model to use ('' to not force) * @param string $modele Force model to use ('' to not force)
* @param Translate $outputlangs Object langs to use for output * @param Translate $outputlangs Object langs to use for output
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines

4
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -39,7 +39,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
* Return list of active generation modules * Return list of active generation modules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of templates * @return array List of templates
*/ */
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)
@ -142,7 +142,7 @@ abstract class ModeleThirdPartyCode
* Renvoi la liste des modeles de numéroation * Renvoi la liste des modeles de numéroation
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of numbers * @return array List of numbers
*/ */
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)

2
htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
View File

@ -41,7 +41,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
* Return list of active generation models * Return list of active generation models
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show * @param integer $maxfilenamelength Max length of value to show
* @return array List of numbers * @return array List of numbers
*/ */
static function liste_modeles($db,$maxfilenamelength=0) static function liste_modeles($db,$maxfilenamelength=0)

10
htdocs/paypal/lib/paypal.lib.php
View File

@ -436,6 +436,16 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
' desc: Product description ' desc: Product description
'-------------------------------------------------------------------------------------------------------------------------------------------- '--------------------------------------------------------------------------------------------------------------------------------------------
*/ */
/**
* @param double $paymentAmount
* @param string $currencyCodeType
* @param string $paymentType
* @param string $returnURL
* @param string $cancelURL
* @param string $tag
* @param string $solutionType
* @param string $landingPage
*/
function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='') function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='')
{ {
//------------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------------

4
htdocs/projet/class/task.class.php
View File

@ -1331,7 +1331,7 @@ class Task extends CommonObject
/** /**
* Return status label of object * Return status label of object
* *
* @param string $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @param integer $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Label * @return string Label
*/ */
function getLibStatut($mode=0) function getLibStatut($mode=0)
@ -1343,7 +1343,7 @@ class Task extends CommonObject
* Return status label for an object * Return status label for an object
* *
* @param int $statut Id statut * @param int $statut Id statut
* @param string $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @param integer $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @return string Label * @return string Label
*/ */
function LibStatut($statut,$mode=0) function LibStatut($statut,$mode=0)