Merge remote-tracking branch 'origin/master' into upstream_docker_image

This commit is contained in:
Daniil Gentili 2024-07-13 15:24:30 +02:00
commit 19ccf73d9e
2 changed files with 6 additions and 10 deletions

12
composer.lock generated
View File

@ -4700,16 +4700,16 @@
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
"version": "3.4.0", "version": "3.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/semver.git", "url": "https://github.com/composer/semver.git",
"reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
"reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4761,7 +4761,7 @@
"support": { "support": {
"irc": "ircs://irc.libera.chat:6697/composer", "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues", "issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/3.4.0" "source": "https://github.com/composer/semver/tree/3.4.2"
}, },
"funding": [ "funding": [
{ {
@ -4777,7 +4777,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-08-31T09:50:34+00:00" "time": "2024-07-12T11:35:52+00:00"
}, },
{ {
"name": "composer/xdebug-handler", "name": "composer/xdebug-handler",

View File

@ -215,10 +215,6 @@ abstract class AbstractApiController
return $this->page['response']; return $this->page['response'];
} }
if (!\is_array($this->page['response']) && !\is_scalar($this->page['response'])) {
$this->page['response'] = null;
}
$data = [ $data = [
'success' => $this->page['success'], 'success' => $this->page['success'],
'errors' => $this->page['errors'], 'errors' => $this->page['errors'],