From b015b65baa6d54dbffd85f11e37d62ca1a28d5da Mon Sep 17 00:00:00 2001 From: aleromano89 Date: Sat, 4 Jan 2020 23:20:19 +0100 Subject: [PATCH 1/2] fix issue #23521 --- .../Downloadable/Test/Unit/Helper/DownloadTest.php | 6 +++++- .../Downloadable/Test/Unit/_files/download_mock.php | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php index 9551cfe982bd5..d4ebf0a7e3fb9 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php @@ -17,7 +17,10 @@ */ class DownloadTest extends \PHPUnit\Framework\TestCase { - /** @var DownloadHelper */ + /** @var array Result of get_headers() function */ + public static $headers; + + /** @var DownloadHelper */ protected $_helper; /** @var Filesystem|\PHPUnit_Framework_MockObject_MockObject */ @@ -230,6 +233,7 @@ protected function _setupUrlMocks($size = self::FILE_SIZE, $url = self::URL, $ad $this->returnValue($this->_handleMock) ); + self::$headers = ['200 OK']; $this->_helper->setResource($url, DownloadHelper::LINK_TYPE_URL); } diff --git a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php index e634f0ffa341d..bb3c4715a48e4 100644 --- a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php +++ b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php @@ -22,3 +22,13 @@ function mime_content_type() { return DownloadTest::$mimeContentType; } + +/** + * Override standard function + * + * @return array + */ +function get_headers() +{ + return DownloadTest::$headers; +} From 05ecfda9c34698c670ff8fc302632e52fe82f9de Mon Sep 17 00:00:00 2001 From: aleromano89 Date: Sun, 5 Jan 2020 16:57:41 +0100 Subject: [PATCH 2/2] fix indentation --- .../Downloadable/Test/Unit/Helper/DownloadTest.php | 8 ++++---- .../Downloadable/Test/Unit/_files/download_mock.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php index d4ebf0a7e3fb9..f90c3f27b27c7 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php @@ -17,10 +17,10 @@ */ class DownloadTest extends \PHPUnit\Framework\TestCase { - /** @var array Result of get_headers() function */ - public static $headers; + /** @var array Result of get_headers() function */ + public static $headers; - /** @var DownloadHelper */ + /** @var DownloadHelper */ protected $_helper; /** @var Filesystem|\PHPUnit_Framework_MockObject_MockObject */ @@ -233,7 +233,7 @@ protected function _setupUrlMocks($size = self::FILE_SIZE, $url = self::URL, $ad $this->returnValue($this->_handleMock) ); - self::$headers = ['200 OK']; + self::$headers = ['200 OK']; $this->_helper->setResource($url, DownloadHelper::LINK_TYPE_URL); } diff --git a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php index bb3c4715a48e4..7ab3bc939f4d0 100644 --- a/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php +++ b/app/code/Magento/Downloadable/Test/Unit/_files/download_mock.php @@ -30,5 +30,5 @@ function mime_content_type() */ function get_headers() { - return DownloadTest::$headers; + return DownloadTest::$headers; }