MAGETWO-79427: Delete CallExit function for After/Around plugin logic execution in FileFactory #11029

miguelbalparda · miguelbalparda · commit 6c0c451f84af · 2017-09-25T14:01:18.000-05:00
- Merge Pull Request #11029 from osrecio/magento2:PR#DeleteExitFileFactory - Merged commits: 1. 6ccd90e 2. a6efe74
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -99,19 +99,7 @@ public function create(
             if (!empty($content['rm'])) {
                 $dir->delete($file);
             }
-            $this->callExit();
         }
         return $this->_response;
     }
-
-    /**
-     * Call exit
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
-     */
-    protected function callExit()
-    {
-        exit(0);
-    }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -99,19 +99,7 @@ public function create(`
`99`	`99`	`if (!empty($content['rm'])) {`
`100`	`100`	`$dir->delete($file);`
`101`	`101`	`}`
`102`		`- $this->callExit();`
`103`	`102`	`}`
`104`	`103`	`return $this->_response;`
`105`	`104`	`}`
`106`		`-`
`107`		`- /**`
`108`		`- * Call exit`
`109`		`- *`
`110`		`- * @return void`
`111`		`- * @SuppressWarnings(PHPMD.ExitExpression)`
`112`		`- */`
`113`		`- protected function callExit()`
`114`		`- {`
`115`		`- exit(0);`
`116`		`- }`
`117`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,12 +230,12 @@ private function getModel()`
`230`	`230`	`/**`
`231`	`231`	`* Get model mock`
`232`	`232`	`*`
`233`		`- * @return \Magento\Framework\App\Response\Http\FileFactory \| \PHPUnit\Framework_MockObject_MockBuilder`
	`233`	`+ * @return \Magento\Framework\App\Response\Http\FileFactory \| \PHPUnit_Framework_MockObject_MockObject`
`234`	`234`	`*/`
`235`	`235`	`private function getModelMock()`
`236`	`236`	`{`
`237`	`237`	`$modelMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)`
`238`		`- ->setMethods(['callExit'])`
	`238`	`+ ->setMethods(null)`
`239`	`239`	`->setConstructorArgs(`
`240`	`240`	`[`
`241`	`241`	`'response' => $this->responseMock,`