Merge pull request DesignPatternsPHP#360 from guilhermesiani/patch-1

Dominik Liebler · web-flow · commit 2f28ceb94886 · 2019-08-17T21:16:47.000+02:00
Keep one level of conditions
diff --git a/Behavioral/ChainOfResponsibilities/Handler.php b/Behavioral/ChainOfResponsibilities/Handler.php
@@ -29,11 +29,9 @@ final public function handle(RequestInterface $request)
     {
         $processed = $this->processing($request);
 
-        if ($processed === null) {
+        if ($processed === null && $this->successor !== null) {
             // the request has not been processed by this handler => see the next
-            if ($this->successor !== null) {
-                $processed = $this->successor->handle($request);
-            }
+            $processed = $this->successor->handle($request);
         }
 
         return $processed;

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,9 @@ final public function handle(RequestInterface $request)`
`29`	`29`	`{`
`30`	`30`	`$processed = $this->processing($request);`
`31`	`31`
`32`		`- if ($processed === null) {`
	`32`	`+ if ($processed === null && $this->successor !== null) {`
`33`	`33`	`// the request has not been processed by this handler => see the next`
`34`		`- if ($this->successor !== null) {`
`35`		`- $processed = $this->successor->handle($request);`
`36`		`- }`
	`34`	`+ $processed = $this->successor->handle($request);`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`return $processed;`