2
0
forked from Wavyzz/dolibarr

Qual: Fix phan notices (modulebuilder)

This commit is contained in:
MDW
2025-02-05 22:59:37 +01:00
parent d01274ef4c
commit f05bc70b2e
11 changed files with 71 additions and 98 deletions

View File

@@ -38,7 +38,7 @@ dol_include_once('/mymodule/class/myobject.class.php');
class MyModuleApi extends DolibarrApi
{
/**
* @var MyObject $myobject {@type MyObject}
* @var MyObject {@type MyObject}
*/
public $myobject;
@@ -46,7 +46,6 @@ class MyModuleApi extends DolibarrApi
* Constructor
*
* @url GET /
*
*/
public function __construct()
{
@@ -194,8 +193,8 @@ class MyModuleApi extends DolibarrApi
* Create myobject object
*
* @param array $request_data Request data
* @phan-param array{string,mixed} $request_data
* @phpstan-param array{string,mixed} $request_data
* @phan-param ?array<string,mixed> $request_data
* @phpstan-param ?array<string,mixed> $request_data
* @return int ID of myobject
*
* @throws RestException 403 Not allowed
@@ -215,7 +214,7 @@ class MyModuleApi extends DolibarrApi
foreach ($request_data as $field => $value) {
if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller @phan-suppress-next-line PhanTypeInvalidDimOffset
$this->myobject->context['caller'] = sanitizeVal($request_data['caller'], 'aZ09');
$this->myobject->context['caller'] = sanitizeVal((string) $request_data['caller'], 'aZ09');
continue;
}
@@ -243,8 +242,8 @@ class MyModuleApi extends DolibarrApi
*
* @param int $id Id of myobject to update
* @param array $request_data Data
* @phan-param mixed[] $request_data
* @phpstan-param mixed[] $request_data
* @phan-param ?array<string,mixed> $request_data
* @phpstan-param ?array<string,mixed> $request_data
* @return Object Object after update
* @phan-return MyObject
* @phpstan-return MyObject
@@ -301,7 +300,7 @@ class MyModuleApi extends DolibarrApi
// Clean data
// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0) {
if ($this->myobject->update(DolibarrApiAccess::$user, 0) > 0) {
return $this->get($id);
} else {
throw new RestException(500, $this->myobject->error);
@@ -356,16 +355,19 @@ class MyModuleApi extends DolibarrApi
* Validate fields before creating or updating object
*
* @param array $data Array of data to validate
* @phan-param array<string,null|int|float|string> $data
* @phpstan-param array<string,null|int|float|string> $data
* @phan-param ?array<string,null|int|float|string> $data
* @phpstan-param ?array<string,null|int|float|string> $data
* @return array
* @phan-return array<string,null|int|float|string>|array{}
* @phpstan-return array<string,null|int|float|string>|array{}
* @phan-return array<string,null|int|float|string>|array{}
* @phpstan-return array<string,null|int|float|string>|array{}
*
* @throws RestException
*/
private function _validateMyObject($data)
{
if (!is_array($data)) {
$data = array();
}
$myobject = array();
foreach ($this->myobject->fields as $field => $propfield) {
if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {