composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 19:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.5'

Browse Source 
# Conflicts:
#	application/applicationextension.inc.php
#	webservices/rest.php
This commit is contained in:
Pierre Goiffon
2019-03-08 14:35:02 +01:00
parent 856c037bb0 75a0979eee
commit 94092f445f
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webservices/rest.php
View File

@@ -83,7 +83,7 @@ class RestResultListOperations extends RestResult
$this->operations[] = array(
'verb' => $sVerb,
'description' => $sDescription,
'extension' => $sServiceProviderClass
'extension' => $sServiceProviderClass,
);
}
}
@@ -96,7 +96,7 @@ if (!function_exists('json_last_error_msg')) {
JSON_ERROR_STATE_MISMATCH => 'State mismatch (invalid or malformed JSON)',
JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded',
JSON_ERROR_SYNTAX => 'Syntax error',
JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded'
JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded',
);
$error = json_last_error();
@@ -186,6 +186,7 @@ try
}
$aOpToRestService = array(); // verb => $oRestServiceProvider
/** @var iRestServiceProvider $oRestSP */
foreach ($aProviders as $oRestSP)
{
$aOperations = $oRestSP->ListOperations($sVersion);

4
webservices/webservices.basic.php
View File

@@ -36,8 +36,8 @@ class BasicServices extends WebServicesBase
/**
* Get the server version (TODO: get it dynamically, where ?)
*
* @return WebServiceResult
*
* @return string WebServiceResult
*/
static public function GetVersion()
{