Skip to content
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.

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

Fixing memory leaks when fractal used in daemons #563

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Resource/ResourceAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function getTransformer()
/**
* Set the transformer.
*
* @param callable|TransformerAbstract $transformer
* @param callable|TransformerAbstract|null $transformer
*/
public function setTransformer($transformer): self
{
Expand Down
17 changes: 15 additions & 2 deletions src/Scope.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public function transformPrimitiveResource()
} elseif (is_callable($transformer)) {
$transformedData = call_user_func($transformer, $data);
} else {
$transformer->setCurrentScope($this);
$transformer->setCurrentScope($this->getCurrentScopeWithoutTransformer());
$transformedData = $transformer->transform($data);
}

Expand Down Expand Up @@ -353,7 +353,7 @@ protected function fireTransformer($transformer, $data): array
if (is_callable($transformer)) {
$transformedData = call_user_func($transformer, $data);
} else {
$transformer->setCurrentScope($this);
$transformer->setCurrentScope($this->getCurrentScopeWithoutTransformer());
$transformedData = $transformer->transform($data);
}

Expand Down Expand Up @@ -462,4 +462,17 @@ protected function getResourceType(): string
{
return $this->resource->getResourceKey();
}

/**
* Return current scope with null transformer (due to memory leak)
*
* @return Scope
*/
private function getCurrentScopeWithoutTransformer(): Scope
{
$scopeWithoutTransformer = clone $this;
$scopeWithoutTransformer->getResource()->setTransformer(null);

return $scopeWithoutTransformer;
}
}