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

fix phpstan is incompatible with

Browse Source
This commit is contained in:
Frédéric France
2024-03-14 18:40:31 +01:00
parent 45a68ba612
commit 4577a4d432
17 changed files with 88 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/modules/project/task/mod_task_simple.php
View File

@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -122,9 +123,9 @@ class mod_task_simple extends ModeleNumRefTask
/**
* Return next value
*
* @param Societe $objsoc Object third party
* @param Task $object Object Task
* @return string|-1 Value if OK, -1 if KO
* @param Societe|string $objsoc Object third party
* @param Task|string $object Object Task
* @return string|-1 Value if OK, -1 if KO
*/
public function getNextValue($objsoc, $object)
{
@@ -161,18 +162,4 @@ class mod_task_simple extends ModeleNumRefTask
dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next reference not yet used as a reference
*
* @param Societe $objsoc Object third party
* @param Task $object Object task
* @return string|-1 Next not used reference, -1 if KO
*/
public function task_get_num($objsoc = 0, $object = '')
{
return $this->getNextValue($objsoc, $object);
}
}

24
htdocs/core/modules/project/task/mod_task_universal.php
View File

@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -119,11 +120,11 @@ class mod_task_universal extends ModeleNumRefTask
/**
* Return next value
*
* @param Societe $objsoc Object third party
* @param Task $object Object task
* @return string|0 Value if OK, 0 if KO
* @param Societe|string $objsoc Object third party
* @param Task|string $object Object task
* @return string|0 Value if OK, 0 if KO
*/
public function getNextValue($objsoc, $object)
public function getNextValue($objsoc = '', $object = '')
{
global $db, $conf;
@@ -141,19 +142,4 @@ class mod_task_universal extends ModeleNumRefTask
return $numFinal;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next reference not yet used as a reference
*
* @param Societe $objsoc Object third party
* @param Task $object Object task
* @return string|0 Next not used reference, 0 if KO
*/
public function project_get_num($objsoc = 0, $object = '')
{
// phpcs:enable
return $this->getNextValue($objsoc, $object);
}
}