minor symfony#28441 [Messenger] simple refactoring to have a more readable code (ronfroy)

nicolas-grekas · nicolas-grekas · commit 36be979aac7e · 2018-09-18T18:40:47.000+02:00
This PR was squashed before being merged into the 4.2-dev branch (closes symfony#28441). Discussion ---------- [Messenger] simple refactoring to have a more readable code | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT  Commits ------- 5f61a27 [Messenger] simple refactoring to have a more readable code
diff --git a/src/Symfony/Component/Messenger/Handler/Locator/AbstractHandlerLocator.php b/src/Symfony/Component/Messenger/Handler/Locator/AbstractHandlerLocator.php
@@ -21,17 +21,8 @@ abstract class AbstractHandlerLocator implements HandlerLocatorInterface
 {
     public function resolve($message): callable
     {
-        $messageClass = \get_class($message);
+        $class = \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;
         }
@@ -48,7 +39,7 @@ private function resolveFromClass(string $class): ?callable
             }
         }
 
-        return null;
+        throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $class));
     }
 
     abstract protected function getHandler(string $class);

Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,8 @@ abstract class AbstractHandlerLocator implements HandlerLocatorInterface`
`21`	`21`	`{`
`22`	`22`	`public function resolve($message): callable`
`23`	`23`	`{`
`24`		`- $messageClass = \get_class($message);`
	`24`	`+ $class = \get_class($message);`
`25`	`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`	`26`	`if ($handler = $this->getHandler($class)) {`
`36`	`27`	`return $handler;`
`37`	`28`	`}`
`@@ -48,7 +39,7 @@ private function resolveFromClass(string $class): ?callable`
`48`	`39`	`}`
`49`	`40`	`}`
`50`	`41`
`51`		`- return null;`
	`42`	`+ throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $class));`
`52`	`43`	`}`
`53`	`44`
`54`	`45`	`abstract protected function getHandler(string $class);`