From 61d7945a3d3867fa1acad01d9dc5f9fdd81f1e75 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Mon, 13 Nov 2023 14:27:59 +0000
Subject: [PATCH] Resolve "Fehlermeldungen mit PHP 8 in der SOAP-Schnittstelle"
Closes #3454
Merge request studip/studip!2349
---
vendor/studip_ws/dispatcher.php | 1 +
vendor/studip_ws/type.php | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/vendor/studip_ws/dispatcher.php b/vendor/studip_ws/dispatcher.php
index d472a5905b9..e7a3caa0655 100644
--- a/vendor/studip_ws/dispatcher.php
+++ b/vendor/studip_ws/dispatcher.php
@@ -125,6 +125,7 @@ class Studip_Ws_Dispatcher {
return $this->throw_exception('No service responds to "%s".', $method0);
$service = $this->api_methods[$method0]->service;
+ $argument_array = array_values($argument_array);
# calling before filter
$before = $service->before_filter($method0, $argument_array);
diff --git a/vendor/studip_ws/type.php b/vendor/studip_ws/type.php
index 0085e4f2316..7fe226408da 100644
--- a/vendor/studip_ws/type.php
+++ b/vendor/studip_ws/type.php
@@ -142,7 +142,7 @@ class Studip_Ws_Type {
*
* @todo name ist falsch
*/
- function get_element_type($type) {
+ public static function get_element_type($type) {
if (is_array($type))
return current($type);
trigger_error(sprintf('\$type has to be an array, but is: "%s"',
@@ -159,7 +159,7 @@ class Studip_Ws_Type {
*
* @return type <description>
*/
- function is_complex_type($type0) {
+ public static function is_complex_type($type0) {
$type = Studip_Ws_Type::get_type($type0);
return $type === STUDIP_WS_TYPE_ARRAY || $type === STUDIP_WS_TYPE_STRUCT;
}
@@ -172,7 +172,7 @@ class Studip_Ws_Type {
*
* @return type <description>
*/
- function is_primitive_type($type) {
+ public static function is_primitive_type($type) {
return !Studip_Ws_Type::is_complex_type($type);
}
@@ -184,7 +184,7 @@ class Studip_Ws_Type {
*
* @return type <description>
*/
- function get_struct_elements($struct) {
+ public static function get_struct_elements($struct) {
# check argument; has to be a class
if (!class_exists($struct)) {
--
GitLab