Skip to content

Delete CallExit function for After/Around plugin logic execution in FileFactory #11029

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

Closed
wants to merge 3 commits into from
Closed

Delete CallExit function for After/Around plugin logic execution in FileFactory #11029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ccd90e
Delete CallExit function for After plugin logic execution
osrecio Sep 25, 2017
a6efe74
SetMethods to null in MockBuilder
osrecio Sep 25, 2017
dada23b
Add @deprecated annotation
osrecio Sep 26, 2017
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
3 changes: 1 addition & 2 deletions lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,13 @@ public function create(
if (!empty($content['rm'])) {
$dir->delete($file);
}
$this->callExit();
}
return $this->_response;
}

/**
* Call exit
*
* @deprecated Use of exit language construct is discouraged.
* @return void
* @SuppressWarnings(PHPMD.ExitExpression)
*/
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,12 @@ private function getModel()
/**
* Get model mock
*
* @return \Magento\Framework\App\Response\Http\FileFactory | \PHPUnit\Framework_MockObject_MockBuilder
* @return \Magento\Framework\App\Response\Http\FileFactory | \PHPUnit_Framework_MockObject_MockObject
*/
private function getModelMock()
{
$modelMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
->setMethods(['callExit'])
->setMethods(null)
->setConstructorArgs(
[
'response' => $this->responseMock,
Expand Down