Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 963fde9

Browse filesBrowse files
fabpotfabpot
committed
[Messenger] added interfaces to be type-hinted even when not using a Container
1 parent 373dad3 commit 963fde9
Copy full SHA for 963fde9

File tree

Expand file treeCollapse file tree

3 files changed

+60
-46
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+60
-46
lines changed

‎src/Symfony/Component/Messenger/Handler/Locator/AbstractHandlerLocator.php

Copy file name to clipboard
+55Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Messenger\Handler\Locator;
13+
14+
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
15+
16+
/**
17+
* @author Miha Vrhovnik <miha.vrhovnik@gmail.com>
18+
* @author Samuel Roze <samuel.roze@gmail.com>
19+
*/
20+
abstract class AbstractHandlerLocator implements HandlerLocatorInterface
21+
{
22+
public function resolve($message): callable
23+
{
24+
$messageClass = \get_class($message);
25+
26+
if (null === $handler = $this->resolveFromClass($messageClass)) {
27+
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));
28+
}
29+
30+
return $handler;
31+
}
32+
33+
private function resolveFromClass(string $class): ?callable
34+
{
35+
if ($handler = $this->getHandler($class)) {
36+
return $handler;
37+
}
38+
39+
foreach (class_implements($class, false) as $interface) {
40+
if ($handler = $this->getHandler($interface)) {
41+
return $handler;
42+
}
43+
}
44+
45+
foreach (class_parents($class, false) as $parent) {
46+
if ($handler = $this->getHandler($parent)) {
47+
return $handler;
48+
}
49+
}
50+
51+
return null;
52+
}
53+
54+
abstract protected function getHandler(string $class);
55+
}

‎src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php
+2-35Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
namespace Symfony\Component\Messenger\Handler\Locator;
1313

1414
use Psr\Container\ContainerInterface;
15-
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
1615

1716
/**
1817
* @author Miha Vrhovnik <miha.vrhovnik@gmail.com>
1918
* @author Samuel Roze <samuel.roze@gmail.com>
2019
*/
21-
class ContainerHandlerLocator implements HandlerLocatorInterface
20+
class ContainerHandlerLocator extends AbstractHandlerLocator
2221
{
2322
private $container;
2423

@@ -27,39 +26,7 @@ public function __construct(ContainerInterface $container)
2726
$this->container = $container;
2827
}
2928

30-
public function resolve($message): callable
31-
{
32-
$messageClass = \get_class($message);
33-
34-
if (null === $handler = $this->resolveFromClass($messageClass)) {
35-
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));
36-
}
37-
38-
return $handler;
39-
}
40-
41-
private function resolveFromClass($class): ?callable
42-
{
43-
if ($handler = $this->getHandler($class)) {
44-
return $handler;
45-
}
46-
47-
foreach (class_implements($class, false) as $interface) {
48-
if ($handler = $this->getHandler($interface)) {
49-
return $handler;
50-
}
51-
}
52-
53-
foreach (class_parents($class, false) as $parent) {
54-
if ($handler = $this->getHandler($parent)) {
55-
return $handler;
56-
}
57-
}
58-
59-
return null;
60-
}
61-
62-
private function getHandler($class)
29+
protected function getHandler(string $class)
6330
{
6431
$handlerKey = 'handler.'.$class;
6532

‎src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php
+3-11Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111

1212
namespace Symfony\Component\Messenger\Handler\Locator;
1313

14-
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
15-
1614
/**
1715
* @author Samuel Roze <samuel.roze@gmail.com>
1816
*/
19-
class HandlerLocator implements HandlerLocatorInterface
17+
class HandlerLocator extends AbstractHandlerLocator
2018
{
2119
/**
2220
* Maps a message (its class) to a given handler.
@@ -28,14 +26,8 @@ public function __construct(array $messageToHandlerMapping = array())
2826
$this->messageToHandlerMapping = $messageToHandlerMapping;
2927
}
3028

31-
public function resolve($message): callable
29+
protected function getHandler(string $class)
3230
{
33-
$messageKey = \get_class($message);
34-
35-
if (!isset($this->messageToHandlerMapping[$messageKey])) {
36-
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));
37-
}
38-
39-
return $this->messageToHandlerMapping[$messageKey];
31+
return $this->messageToHandlerMapping[$class] ?? null;
4032
}
4133
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.