8000 [Messenger] Add interfaces to be type-hinted even when not using a Container by fabpot · Pull Request #28394 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Messenger] Add interfaces to be type-hinted even when not using a Container #28394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2018
Merged

[Messenger] Add interfaces to be type-hinted even when not using a Container #28394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions src/Symfony/Component/Messenger/Handler/Locator/AbstractHandlerLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Messenger\Handler\Locator;

use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;

/**
* @author Miha Vrhovnik <miha.vrhovnik@gmail.com>
* @author Samuel Roze <samuel.roze@gmail.com>
*/
abstract class AbstractHandlerLocator implements HandlerLocatorInterface
{
public function resolve($message): callable
{
$messageClass = \get_class($message);

if (null === $handler = $this->resolveFromClass($messageClass)) {
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));
}

return $handler;
}

private function resolveFromClass(string $class): ?callable
{
if ($handler = $this->getHandler($class)) {
return $handler;
}

foreach (class_implements($class, false) as $interface) {
if ($handler = $this->getHandler($interface)) {
return $handler;
}
}

foreach (class_parents($class, false) as $parent) {
if ($handler = $this->getHandler($parent)) {
return $handler;
}
}

return null;
}

abstract protected function getHandler(string $class);
}
37 changes: 2 additions & 35 deletions src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
namespace Symfony\Component\Messenger\Handler\Locator;

use Psr\Container\ContainerInterface;
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;

/**
* @author Miha Vrhovnik <miha.vrhovnik@gmail.com>
* @author Samuel Roze <samuel.roze@gmail.com>
*/
class ContainerHandlerLocator implements HandlerLocatorInterface
class ContainerHandlerLocator extends AbstractHandlerLocator
{
private $container;

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

public function resolve($message): callable
{
$messageClass = \get_class($message);

if (null === $handler = $this->resolveFromClass($messageClass)) {
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));
}

return $handler;
}

private function resolveFromClass($class): ?callable
{
if ($handler = $this->getHandler($class)) {
return $handler;
}

foreach (class_implements($class, false) as $interface) {
if ($handler = $this->getHandler($interface)) {
return $handler;
}
}

foreach (class_parents($class, false) as $parent) {
if ($handler = $this->getHandler($parent)) {
return $handler;
}
}

return null;
}

private function getHandler($class)
protected function getHandler(string $class)
{
$handlerKey = 'handler.'.$class;

Expand Down
14 changes: 3 additions & 11 deletions src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@

namespace Symfony\Component\Messenger\Handler\Locator;

use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;

/**
* @author Samuel Roze <samuel.roze@gmail.com>
*/
class HandlerLocator implements HandlerLocatorInterface
class HandlerLocator extends AbstractHandlerLocator
{
/**
* Maps a message (its class) to a given handler.
Expand All @@ -28,14 +26,8 @@ public function __construct(array $messageToHandlerMapping = array())
$this->messageToHandlerMapping = $messageToHandlerMapping;
}

public function resolve($message): callable
protected function getHandler(string $class)
{
$messageKey = \get_class($message);

if (!isset($this->messageToHandlerMapping[$messageKey])) {
throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));
}

return $this->messageToHandlerMapping[$messageKey];
return $this->messageToHandlerMapping[$class] ?? null;
}
}
0