Fix stack cleanup and performance in MiddlewareDispatcher (#37)

devanych · web-flow · commit 8b5b8e2f432e · 2021-07-15T10:44:27.000+03:00
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -73,6 +73,9 @@ public function withMiddlewares(array $middlewareDefinitions): self
     {
         $new = clone $this;
         $new->middlewareDefinitions = $middlewareDefinitions;
+
+        // Fixes a memory leak.
+        unset($new->stack);
         $new->stack = null;
 
         return $new;
@@ -92,8 +95,10 @@ public function hasMiddlewares(): bool
     private function buildMiddlewares(): array
     {
         $middlewares = [];
+        $factory = $this->middlewareFactory;
+
         foreach ($this->middlewareDefinitions as $middlewareDefinition) {
-            $middlewares[] = fn (): MiddlewareInterface => $this->middlewareFactory->create($middlewareDefinition);
+            $middlewares[] = static fn (): MiddlewareInterface => $factory->create($middlewareDefinition);
         }
 
         return $middlewares;

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ public function withMiddlewares(array $middlewareDefinitions): self`
`73`	`73`	`{`
`74`	`74`	`$new = clone $this;`
`75`	`75`	`$new->middlewareDefinitions = $middlewareDefinitions;`
	`76`	`+`
	`77`	`+ // Fixes a memory leak.`
	`78`	`+ unset($new->stack);`
`76`	`79`	`$new->stack = null;`
`77`	`80`
`78`	`81`	`return $new;`
`@@ -92,8 +95,10 @@ public function hasMiddlewares(): bool`
`92`	`95`	`private function buildMiddlewares(): array`
`93`	`96`	`{`
`94`	`97`	`$middlewares = [];`
	`98`	`+ $factory = $this->middlewareFactory;`
	`99`	`+`
`95`	`100`	`foreach ($this->middlewareDefinitions as $middlewareDefinition) {`
`96`		`- $middlewares[] = fn (): MiddlewareInterface => $this->middlewareFactory->create($middlewareDefinition);`
	`101`	`+ $middlewares[] = static fn (): MiddlewareInterface => $factory->create($middlewareDefinition);`
`97`	`102`	`}`
`98`	`103`
`99`	`104`	`return $middlewares;`