Skip to content
Snippets Groups Projects
Commit e82be6c8 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

replace neomerx/json-api 4.0.1 with laravel-json-api/neomerx-json-api 5.0.2, fixes #4212 

Closes #4212

Merge request studip/studip!3041
parent c25ceca9
No related branches found
No related tags found
No related merge requests found
Pipeline #23784 passed
Stage: build
Stage: checks
Stage: analyse
Stage: test
Hide whitespace changes
Inline Side-by-side
composer.json
+ 2
− 2
View file @ e82be6c8
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"guzzlehttp/psr7": "2.6.2", "guzzlehttp/psr7": "2.6.2",
"neomerx/json-api": "4.0.1",
"spomky-labs/otphp": "11.2.2", "spomky-labs/otphp": "11.2.2",
"tuupola/cors-middleware": "^1.2.1", "tuupola/cors-middleware": "^1.2.1",
"tecnickcom/tcpdf": "6.7.5", "tecnickcom/tcpdf": "6.7.5",
...@@ -61,7 +60,8 @@ ...@@ -61,7 +60,8 @@
"okvpn/clock-lts": "^1.0", "okvpn/clock-lts": "^1.0",
"vlucas/phpdotenv": "^5.6", "vlucas/phpdotenv": "^5.6",
"edu-sharing/auth-plugin": "8.0.x-dev", "edu-sharing/auth-plugin": "8.0.x-dev",
"psr/cache": "3.0.0" "psr/cache": "3.0.0",
"laravel-json-api/neomerx-json-api": "5.0.2"
}, },
"replace": { "replace": {
"symfony/polyfill-php73": "*", "symfony/polyfill-php73": "*",
......
composer.lock
+ 71
− 61
View file @ e82be6c8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "ce45f97b00f8fa90b09d0b907b3a4f53", "content-hash": "7b19d8591a65485c94fb1794c93eef90",
"packages": [ "packages": [
{ {
"name": "algo26-matthias/idna-convert", "name": "algo26-matthias/idna-convert",
...@@ -739,6 +739,76 @@ ...@@ -739,6 +739,76 @@
}, },
"time": "2022-11-12T10:09:40+00:00" "time": "2022-11-12T10:09:40+00:00"
}, },
{
"name": "laravel-json-api/neomerx-json-api",
"version": "v5.0.2",
"source": {
"type": "git",
"url": "https://github.com/laravel-json-api/neomerx-json-api.git",
"reference": "00841feae83ab95f4490c6f2086f02f298293381"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel-json-api/neomerx-json-api/zipball/00841feae83ab95f4490c6f2086f02f298293381",
"reference": "00841feae83ab95f4490c6f2086f02f298293381",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.4|^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.17",
"mockery/mockery": "^1.4.4",
"phpmd/phpmd": "^2.11.1",
"phpunit/phpunit": "^9.5.10",
"scrutinizer/ocular": "^1.8",
"squizlabs/php_codesniffer": "^3.6.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "5.x-dev"
}
},
"autoload": {
"files": [
"src/I18n/format.php"
],
"psr-4": {
"Neomerx\\JsonApi\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "neomerx",
"email": "info@neomerx.com"
},
{
"name": "Christopher Gammie",
"email": "contact@gammie.co.uk"
}
],
"description": "Framework agnostic JSON API (jsonapi.org) implementation",
"homepage": "https://github.com/neomerx/json-api",
"keywords": [
"JSON-API",
"api",
"json",
"jsonapi",
"jsonapi.org",
"neomerx"
],
"support": {
"issues": "https://github.com/neomerx/json-api/issues",
"source": "https://github.com/laravel-json-api/neomerx-json-api/tree/v5.0.2"
},
"time": "2023-05-29T14:50:09+00:00"
},
{ {
"name": "laravel/serializable-closure", "name": "laravel/serializable-closure",
"version": "v1.3.3", "version": "v1.3.3",
...@@ -1593,66 +1663,6 @@ ...@@ -1593,66 +1663,6 @@
}, },
"time": "2019-02-14T10:35:50+00:00" "time": "2019-02-14T10:35:50+00:00"
}, },
{
"name": "neomerx/json-api",
"version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/neomerx/json-api.git",
"reference": "0e45254a4574a3118e0ed663312b43aca23b89c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/neomerx/json-api/zipball/0e45254a4574a3118e0ed663312b43aca23b89c7",
"reference": "0e45254a4574a3118e0ed663312b43aca23b89c7",
"shasum": ""
},
"require": {
"php": ">=7.1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
"mockery/mockery": "^1.0",
"phpmd/phpmd": "^2.6",
"phpunit/phpunit": "^7.0",
"scrutinizer/ocular": "^1.4",
"squizlabs/php_codesniffer": "^2.9"
},
"type": "library",
"autoload": {
"files": [
"src/I18n/format.php"
],
"psr-4": {
"Neomerx\\JsonApi\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "neomerx",
"email": "info@neomerx.com"
}
],
"description": "Framework agnostic JSON API (jsonapi.org) implementation",
"homepage": "https://github.com/neomerx/json-api",
"keywords": [
"JSON-API",
"api",
"json",
"jsonapi",
"jsonapi.org",
"neomerx"
],
"support": {
"issues": "https://github.com/neomerx/json-api/issues",
"source": "https://github.com/neomerx/json-api/tree/develop"
},
"time": "2020-03-03T05:56:54+00:00"
},
{ {
"name": "nikic/fast-route", "name": "nikic/fast-route",
"version": "v1.3.0", "version": "v1.3.0",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment