From 9cb5b125acd19055695765839fde92e8e3d34ff6 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 6 Nov 2023 15:38:29 +0100 Subject: [PATCH] Update --- CHANGELOG.md | 6 ++++++ .../Adminhtml/TestConnection/TestConnectionTest.php | 4 +++- .../Adminhtml/TestConnection/TestFtpConnectionTest.php | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c7da5bd..f27610c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased +### Add +- Add campaigns to category view page +- Improve logging system + ## [v4.2.1] - 2023.09.25 +### Fix - Fix problem with ssr/record-list.phtml template ## [v4.2.0] - 2023.09.18 diff --git a/src/Test/Unit/Controller/Adminhtml/TestConnection/TestConnectionTest.php b/src/Test/Unit/Controller/Adminhtml/TestConnection/TestConnectionTest.php index 60217bf6..796dccde 100644 --- a/src/Test/Unit/Controller/Adminhtml/TestConnection/TestConnectionTest.php +++ b/src/Test/Unit/Controller/Adminhtml/TestConnection/TestConnectionTest.php @@ -11,6 +11,7 @@ use Omikron\FactFinder\Communication\Client\ClientBuilder; use Omikron\FactFinder\Communication\Client\ClientInterface; use Omikron\FactFinder\Communication\Credentials; +use Omikron\Factfinder\Logger\FactFinderLogger; use Omikron\Factfinder\Model\Api\CredentialsFactory; use Omikron\Factfinder\Model\Config\AuthConfig; use PHPUnit\Framework\MockObject\MockObject; @@ -63,7 +64,8 @@ protected function setUp(): void $this->createConfiguredMock(JsonFactory::class, ['create' => $this->createMock(JsonResult::class)]), $credentialsFactory, $this->createMock(AuthConfig::class), - $this->builderMock + $this->builderMock, + $this->createMock(FactFinderLogger::class) ); } } diff --git a/src/Test/Unit/Controller/Adminhtml/TestConnection/TestFtpConnectionTest.php b/src/Test/Unit/Controller/Adminhtml/TestConnection/TestFtpConnectionTest.php index b7195213..84db86f1 100644 --- a/src/Test/Unit/Controller/Adminhtml/TestConnection/TestFtpConnectionTest.php +++ b/src/Test/Unit/Controller/Adminhtml/TestConnection/TestFtpConnectionTest.php @@ -8,6 +8,7 @@ use Magento\Framework\App\RequestInterface; use Magento\Framework\Controller\Result\Json as JsonResult; use Magento\Framework\Controller\Result\JsonFactory; +use Omikron\Factfinder\Logger\FactFinderLogger; use Omikron\Factfinder\Model\Config\FtpConfig; use Omikron\Factfinder\Model\FtpUploader; use PHPUnit\Framework\MockObject\MockObject; @@ -77,7 +78,8 @@ protected function setUp(): void $this->createConfiguredMock(Context::class, ['getRequest' => $this->request]), $this->createConfiguredMock(JsonFactory::class, ['create' => $this->jsonResult]), $this->ftpUploader, - $this->createMock(FtpConfig::class) + $this->createMock(FtpConfig::class), + $this->createMock(FactFinderLogger::class) ); } }