Skip to content

Commit bc2b316

Browse files
committed
Strip "@" from requested service name
1 parent 57f77e8 commit bc2b316

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

NotModified/Annotation/ReplaceWithNotModifiedResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private function initialiseLastModifiedDeterminators()
7979

8080
if (is_string($lastModifiedDeterminatorDescription)) {
8181
if ($lastModifiedDeterminatorDescription[0] === '@') {
82-
$lastModifiedDeterminator = $this->container->get($lastModifiedDeterminatorDescription);
82+
$lastModifiedDeterminator = $this->container->get(substr($lastModifiedDeterminatorDescription, 1));
8383
} else {
8484
$lastModifiedDeterminator = new $lastModifiedDeterminatorDescription;
8585
}

Tests/NotModified/Annotation/ReplaceWithNotModifiedResponseTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,14 @@ public function stringAsSimpleLastModifiedDescription()
4444
*/
4545
public function serviceNameAsLastModifiedDescription()
4646
{
47-
$lastModifiedDeterminatorServiceName = '@my.service';
48-
$lastModifiedDeterminatorServiceObject = new MyLastModifedDeterminator();
49-
5047
/** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject $container */
5148
$container = $this->getMock(ContainerInterface::class);
5249
$container->expects($this->once())
5350
->method('get')
54-
->with($lastModifiedDeterminatorServiceName)
55-
->willReturn($lastModifiedDeterminatorServiceObject);
51+
->with('my.service')
52+
->willReturn(new MyLastModifedDeterminator());
5653

57-
$annotation = new ReplaceWithNotModifiedResponse(['value' => [$lastModifiedDeterminatorServiceName]]);
54+
$annotation = new ReplaceWithNotModifiedResponse(['value' => ['@my.service']]);
5855
$annotation->setContainer($container);
5956

6057
$this->setExpectedException(null);

0 commit comments

Comments
 (0)