Skip to content
Snippets Groups Projects
Commit 71c8928b authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Update api-platform/core and make psalm happy

parent 6945e686
No related branches found
No related tags found
No related merge requests found
Pipeline #83631 failed
Stage: test
Show whitespace changes
Inline Side-by-side
composer.lock
+ 52
− 51
View file @ 71c8928b
......@@ -8,16 +8,16 @@
"packages": [
{
"name": "api-platform/core",
"version": "v2.6.6",
"version": "v2.6.8",
"source": {
"type": "git",
"url": "https://github.com/api-platform/core.git",
"reference": "25c71b216473844cdbe5bf284ccbeeb26acd76e7"
"reference": "ff3aab5b196709c721960c0bb4f1d52759af737d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/api-platform/core/zipball/25c71b216473844cdbe5bf284ccbeeb26acd76e7",
"reference": "25c71b216473844cdbe5bf284ccbeeb26acd76e7",
"url": "https://api.github.com/repos/api-platform/core/zipball/ff3aab5b196709c721960c0bb4f1d52759af737d",
"reference": "ff3aab5b196709c721960c0bb4f1d52759af737d",
"shasum": ""
},
"require": {
......@@ -25,13 +25,13 @@
"fig/link-util": "^1.0",
"php": ">=7.1",
"psr/cache": "^1.0 || ^2.0 || ^3.0",
"psr/container": "^1.0",
"symfony/http-foundation": "^4.4 || ^5.1",
"symfony/http-kernel": "^4.4 || ^5.1",
"symfony/property-access": "^3.4.19 || ^4.4 || ^5.1",
"symfony/property-info": "^3.4 || ^4.4 || ^5.2.1",
"symfony/serializer": "^4.4 || ^5.1",
"symfony/web-link": "^4.4 || ^5.1",
"psr/container": "^1.0 || ^2.0",
"symfony/http-foundation": "^4.4 || ^5.1 || ^6.0",
"symfony/http-kernel": "^4.4 || ^5.1 || ^6.0",
"symfony/property-access": "^3.4.19 || ^4.4 || ^5.1 || ^6.0",
"symfony/property-info": "^3.4 || ^4.4 || ^5.2.1 || ^6.0",
"symfony/serializer": "^4.4 || ^5.1 || ^6.0",
"symfony/web-link": "^4.4 || ^5.1 || ^6.0",
"willdurand/negotiation": "^2.0.3 || ^3.0"
},
"conflict": {
......@@ -42,60 +42,61 @@
},
"require-dev": {
"behat/behat": "^3.1",
"behat/mink": "^1.7",
"behat/mink": "^1.9@dev",
"doctrine/annotations": "^1.7",
"doctrine/cache": "^1.11",
"doctrine/cache": "^1.11 || ^2.1",
"doctrine/common": "^2.11 || ^3.0",
"doctrine/data-fixtures": "^1.2.2",
"doctrine/dbal": "^2.6 || ^3.0",
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
"doctrine/mongodb-odm": "^2.2",
"doctrine/mongodb-odm-bundle": "^4.0",
"doctrine/orm": "^2.6.4 || ^3.0",
"doctrine/orm": "^2.6.4",
"elasticsearch/elasticsearch": "^6.0 || ^7.0",
"friends-of-behat/mink-browserkit-driver": "^1.3.1",
"friends-of-behat/mink-extension": "^2.2",
"friends-of-behat/symfony-extension": "^2.1",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"jangregor/phpstan-prophecy": "^0.8",
"jangregor/phpstan-prophecy": "^1.0",
"justinrainbow/json-schema": "^5.2.1",
"phpdocumentor/reflection-docblock": "^3.0 || ^4.0 || ^5.1",
"phpdocumentor/type-resolver": "^0.3 || ^0.4 || ^1.4",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.65",
"phpstan/phpstan-doctrine": "^0.12.7",
"phpstan/phpstan-phpunit": "^0.12.4",
"phpstan/phpstan-symfony": "^0.12.4",
"psr/log": "^1.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-doctrine": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"ramsey/uuid": "^3.7 || ^4.0",
"ramsey/uuid-doctrine": "^1.4",
"soyuka/contexts": "^3.3.1",
"soyuka/contexts": "dev-main",
"soyuka/stubs-mongodb": "^1.0",
"symfony/asset": "^3.4 || ^4.4 || ^5.1",
"symfony/browser-kit": "^4.4 || ^5.1",
"symfony/cache": "^3.4 || ^4.4 || ^5.1",
"symfony/config": "^3.4 || ^4.4 || ^5.1",
"symfony/console": "^3.4 || ^4.4 || ^5.1",
"symfony/css-selector": "^3.4 || ^4.4 || ^5.1",
"symfony/debug": "^3.4 || ^4.4 || ^5.1",
"symfony/dependency-injection": "^3.4 || ^4.4 || ^5.1",
"symfony/doctrine-bridge": "^3.4 || ^4.4 || ^5.1",
"symfony/dom-crawler": "^3.4 || ^4.4 || ^5.1",
"symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.1",
"symfony/expression-language": "^3.4 || ^4.4 || ^5.1",
"symfony/finder": "^3.4 || ^4.4 || ^5.1",
"symfony/form": "^3.4 || ^4.4 || ^5.1",
"symfony/framework-bundle": "^4.4 || ^5.1",
"symfony/http-client": "^4.4 || ^5.1",
"symfony/asset": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
"symfony/cache": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/config": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/console": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/css-selector": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/debug": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/dependency-injection": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/doctrine-bridge": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/dom-crawler": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/expression-language": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/finder": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/form": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
"symfony/http-client": "^4.4 || ^5.1 || ^6.0",
"symfony/mercure-bundle": "*",
"symfony/messenger": "^4.4 || ^5.1",
"symfony/phpunit-bridge": "^5.1.7",
"symfony/routing": "^3.4 || ^4.4 || ^5.1",
"symfony/security-bundle": "^3.4 || ^4.4 || ^5.1",
"symfony/security-core": "^4.4 || ^5.1",
"symfony/twig-bundle": "^3.4 || ^4.4 || ^5.1",
"symfony/validator": "^3.4 || ^4.4 || ^5.1",
"symfony/web-profiler-bundle": "^4.4 || ^5.1",
"symfony/yaml": "^3.4 || ^4.4 || ^5.1",
"symfony/messenger": "^4.4 || ^5.1 || ^6.0",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/routing": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/security-bundle": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/security-core": "^4.4 || ^5.1 || ^6.0",
"symfony/twig-bundle": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/validator": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"symfony/web-profiler-bundle": "^4.4 || ^5.1 || ^6.0",
"symfony/yaml": "^3.4 || ^4.4 || ^5.1 || ^6.0",
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
"webonyx/graphql-php": "^14.0"
},
......@@ -119,10 +120,10 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.7.x-dev"
"dev-main": "2.6.x-dev"
},
"symfony": {
"require": "^3.4 || ^4.4 || ^5.1"
"require": "^3.4 || ^4.4 || ^5.1 || ^6.0"
}
},
"autoload": {
......@@ -156,7 +157,7 @@
],
"support": {
"issues": "https://github.com/api-platform/core/issues",
"source": "https://github.com/api-platform/core/tree/v2.6.6"
"source": "https://github.com/api-platform/core/tree/v2.6.8"
},
"funding": [
{
......@@ -164,7 +165,7 @@
"type": "tidelift"
}
],
"time": "2021-09-29T19:11:04+00:00"
"time": "2022-01-11T10:29:54+00:00"
},
{
"name": "dbp/relay-base-person-bundle",
......
src/DataPersister/CheckInActionDataPersister.php
+ 3
− 2
View file @ 71c8928b
......@@ -32,13 +32,14 @@ final class CheckInActionDataPersister extends AbstractController implements Dat
}
/**
* @param CheckInAction $data
* @param mixed $data
*
* @return CheckInAction
*/
public function persist($data)
{
$locationCheckInAction = $data;
assert($locationCheckInAction instanceof CheckInAction);
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
$this->denyAccessUnlessGranted('ROLE_SCOPE_LOCATION-CHECK-IN');
......@@ -71,7 +72,7 @@ final class CheckInActionDataPersister extends AbstractController implements Dat
}
/**
* @param CheckInAction $data
* @param mixed $data
*/
public function remove($data)
{
......
src/DataPersister/CheckOutActionDataPersister.php
+ 3
− 2
View file @ 71c8928b
......@@ -32,13 +32,14 @@ final class CheckOutActionDataPersister extends AbstractController implements Da
}
/**
* @param CheckOutAction $data
* @param mixed $data
*
* @return CheckOutAction
*/
public function persist($data)
{
$locationCheckOutAction = $data;
assert($locationCheckOutAction instanceof CheckOutAction);
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
$this->denyAccessUnlessGranted('ROLE_SCOPE_LOCATION-CHECK-IN');
......@@ -80,7 +81,7 @@ final class CheckOutActionDataPersister extends AbstractController implements Da
}
/**
* @param CheckOutAction $data
* @param mixed $data
*/
public function remove($data)
{
......
src/DataPersister/GuestCheckInActionDataPersister.php
+ 3
− 2
View file @ 71c8928b
......@@ -32,13 +32,14 @@ final class GuestCheckInActionDataPersister extends AbstractController implement
}
/**
* @param GuestCheckInAction $data
* @param mixed $data
*
* @return GuestCheckInAction
*/
public function persist($data)
{
$locationGuestCheckInAction = $data;
assert($locationGuestCheckInAction instanceof GuestCheckInAction);
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
$this->denyAccessUnlessGranted('ROLE_SCOPE_LOCATION-CHECK-IN');
$this->denyAccessUnlessGranted('ROLE_SCOPE_LOCATION-CHECK-IN-GUEST');
......@@ -89,7 +90,7 @@ final class GuestCheckInActionDataPersister extends AbstractController implement
}
/**
* @param GuestCheckInAction $data
* @param mixed $data
*/
public function remove($data)
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment