From 7e7ed801a62a433255c71716e5686dbf81358b84 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 17 Feb 2023 10:51:58 +0000
Subject: [PATCH] use php 7.2 for tests and fix error in jsonapi, fixes #2166
Closes #2166
Merge request studip/studip!1400
---
.gitlab-ci.yml | 2 +-
lib/classes/JsonApi/Routes/Files/FileRefsCreate.php | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1aa885c09a..0fb6f732f71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: studip/studip:tests
+image: studip/studip:tests-php7.2
variables:
MYSQL_RANDOM_ROOT_PASSWORD: "true"
diff --git a/lib/classes/JsonApi/Routes/Files/FileRefsCreate.php b/lib/classes/JsonApi/Routes/Files/FileRefsCreate.php
index 940e197b154..e878c4925e1 100644
--- a/lib/classes/JsonApi/Routes/Files/FileRefsCreate.php
+++ b/lib/classes/JsonApi/Routes/Files/FileRefsCreate.php
@@ -14,7 +14,10 @@ use JsonApi\Schemas\File as FileSchema;
class FileRefsCreate extends JsonApiController
{
- use RangeHelperTrait, RoutesHelperTrait, ValidationTrait;
+ use RangeHelperTrait, RoutesHelperTrait, ValidationTrait {
+ ValidationTrait::arrayGet insteadof RoutesHelperTrait;
+ ValidationTrait::arrayHas insteadof RoutesHelperTrait;
+ }
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameters)
--
GitLab