Skip to content

Commit 63c3b5e

Browse files
Fix
1 parent 91711b7 commit 63c3b5e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private function getRequirements(HttpOperation $operation): array
122122
continue;
123123
}
124124
$identifiers = $uriVariable->getIdentifiers();
125-
if (count($identifiers) !== 1) {
125+
if (1 !== count($identifiers)) {
126126
continue;
127127
}
128128

src/Serializer/Tests/AbstractItemNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ public function testDenormalizeWritableLinks(): void
10081008
'name' => 'foo',
10091009
'relatedDummy' => ['foo' => 'bar'],
10101010
'relatedDummies' => [['bar' => 'baz']],
1011-
'relatedDummiesWithUnionTypes' => [0 => ['bar' => 'qux'], 1. => ['bar' => 'quux']],
1011+
'relatedDummiesWithUnionTypes' => [0 => ['bar' => 'qux'], 1 => ['bar' => 'quux']],
10121012
];
10131013

10141014
$relatedDummy1 = new RelatedDummy();
@@ -1072,7 +1072,7 @@ public function testDenormalizeWritableLinks(): void
10721072
$propertyAccessorProphecy->setValue($actual, 'name', 'foo')->shouldHaveBeenCalled();
10731073
$propertyAccessorProphecy->setValue($actual, 'relatedDummy', $relatedDummy1)->shouldHaveBeenCalled();
10741074
$propertyAccessorProphecy->setValue($actual, 'relatedDummies', [$relatedDummy2])->shouldHaveBeenCalled();
1075-
$propertyAccessorProphecy->setValue($actual, 'relatedDummiesWithUnionTypes', [0 => $relatedDummy3, 1. => $relatedDummy4])->shouldHaveBeenCalled();
1075+
$propertyAccessorProphecy->setValue($actual, 'relatedDummiesWithUnionTypes', [0 => $relatedDummy3, 1 => $relatedDummy4])->shouldHaveBeenCalled();
10761076
}
10771077

10781078
public function testBadRelationType(): void

src/State/Tests/Provider/SecurityParameterProviderTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testIsGrantedLink(): void
3030
$obj = new \stdClass();
3131
$barObj = new \stdClass();
3232
$operation = new GetCollection(uriVariables: [
33-
'barId' => new Link(toProperty: 'bar', fromClass: 'Bar', security: 'is_granted("some_voter", "bar")'),
33+
'barId' => new Link(toProperty: 'bar', fromClass: $barObj::class, security: 'is_granted("some_voter", "bar")'),
3434
], class: \stdClass::class);
3535
$decorated = $this->createMock(ProviderInterface::class);
3636
$decorated->method('provide')->willReturn($obj);
@@ -39,7 +39,7 @@ public function testIsGrantedLink(): void
3939
$request->attributes = $parameterBag;
4040
$request->attributes->set('bar', $barObj);
4141
$resourceAccessChecker = $this->createMock(ResourceAccessCheckerInterface::class);
42-
$resourceAccessChecker->expects($this->once())->method('isGranted')->with('Bar', 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(true);
42+
$resourceAccessChecker->expects($this->once())->method('isGranted')->with($barObj::class, 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(true);
4343
$accessChecker = new SecurityParameterProvider($decorated, $resourceAccessChecker);
4444
$accessChecker->provide($operation, ['barId' => 1], ['request' => $request]);
4545
}
@@ -51,7 +51,7 @@ public function testIsNotGrantedLink(): void
5151
$obj = new \stdClass();
5252
$barObj = new \stdClass();
5353
$operation = new GetCollection(uriVariables: [
54-
'barId' => new Link(toProperty: 'bar', fromClass: 'Bar', security: 'is_granted("some_voter", "bar")'),
54+
'barId' => new Link(toProperty: 'bar', fromClass: $barObj::class, security: 'is_granted("some_voter", "bar")'),
5555
], class: \stdClass::class);
5656
$decorated = $this->createMock(ProviderInterface::class);
5757
$decorated->method('provide')->willReturn($obj);
@@ -60,7 +60,7 @@ public function testIsNotGrantedLink(): void
6060
$request->attributes = $parameterBag;
6161
$request->attributes->set('bar', $barObj);
6262
$resourceAccessChecker = $this->createMock(ResourceAccessCheckerInterface::class);
63-
$resourceAccessChecker->expects($this->once())->method('isGranted')->with('Bar', 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(false);
63+
$resourceAccessChecker->expects($this->once())->method('isGranted')->with($barObj::class, 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(false);
6464
$accessChecker = new SecurityParameterProvider($decorated, $resourceAccessChecker);
6565
$accessChecker->provide($operation, ['barId' => 1], ['request' => $request]);
6666
}
@@ -73,7 +73,7 @@ public function testSecurityMessageLink(): void
7373
$obj = new \stdClass();
7474
$barObj = new \stdClass();
7575
$operation = new GetCollection(uriVariables: [
76-
'barId' => new Link(toProperty: 'bar', fromClass: 'Bar', security: 'is_granted("some_voter", "bar")', securityMessage: 'You are not admin.'),
76+
'barId' => new Link(toProperty: 'bar', fromClass: $barObj::class, security: 'is_granted("some_voter", "bar")', securityMessage: 'You are not admin.'),
7777
], class: \stdClass::class);
7878
$decorated = $this->createMock(ProviderInterface::class);
7979
$decorated->method('provide')->willReturn($obj);
@@ -82,7 +82,7 @@ public function testSecurityMessageLink(): void
8282
$request->attributes = $parameterBag;
8383
$request->attributes->set('bar', $barObj);
8484
$resourceAccessChecker = $this->createMock(ResourceAccessCheckerInterface::class);
85-
$resourceAccessChecker->expects($this->once())->method('isGranted')->with('Bar', 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(false);
85+
$resourceAccessChecker->expects($this->once())->method('isGranted')->with($barObj::class, 'is_granted("some_voter", "bar")', ['object' => $obj, 'previous_object' => null, 'request' => $request, 'bar' => $barObj, 'barId' => 1, 'operation' => $operation])->willReturn(false);
8686
$accessChecker = new SecurityParameterProvider($decorated, $resourceAccessChecker);
8787
$accessChecker->provide($operation, ['barId' => 1], ['request' => $request]);
8888
}

0 commit comments

Comments
 (0)