use fetcherConfig

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
nextcloud · Aug 24, 2023 · 6892492 · 6892492
1 parent 38af7d1
commit 6892492
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
@@ -26,7 +26,6 @@
 use Net_URL2;
 use OCP\IL10N;
 use OCP\ITempManager;
-use OCP\IConfig;
 
 use OCA\News\Db\Item;
 use OCA\News\Db\Feed;
@@ -75,9 +74,9 @@ class FeedFetcher implements IFeedFetcher
     private $logger;
 
     /**
-     * @var IConfig
+     * @var FetcherConfig
      */
-    private $iConfig;
+    private $fetcherConfig;
 
     public function __construct(
         FeedIo $fetcher,
@@ -87,7 +86,7 @@ public function __construct(
         ITempManager $ITempManager,
         Time $time,
         LoggerInterface $logger,
-        IConfig $iConfig
+        FetcherConfig $fetcherConfig
     ) {
         $this->reader         = $fetcher;
         $this->faviconFactory = $favicon;
@@ -96,7 +95,7 @@ public function __construct(
         $this->ITempManager   = $ITempManager;
         $this->time           = $time;
         $this->logger         = $logger;
-        $this->iConfig        = $iConfig;
+        $this->fetcherConfig  = $fetcherConfig;
     }
 
 
@@ -409,7 +408,6 @@ protected function getFavicon(FeedInterface $feed, string $url): ?string
         try {
             // Base_uri can only be set on creation, will be used when link is relative.
             $client = new Client(['base_uri' => $base_url]);
-            $fetcherConfig = new FetcherConfig($this->iConfig);
             $response = $client->request(
                 'GET',
                 $favicon,
@@ -419,7 +417,7 @@ protected function getFavicon(FeedInterface $feed, string $url): ?string
                         'User-Agent'        => FetcherConfig::DEFAULT_USER_AGENT,
                         'Accept'            => 'image/*',
                         'If-Modified-Since' => date(DateTime::RFC7231, $last_modified),
-                        'Accept-Encoding'   => $fetcherConfig->checkEncoding()
+                        'Accept-Encoding'   => $this->fetcherConfig->checkEncoding()
                     ]
                 ]
             );

diff --git a/tests/Unit/Fetcher/FeedFetcherTest.php b/tests/Unit/Fetcher/FeedFetcherTest.php
@@ -28,12 +28,12 @@
 use \OCA\News\Db\Item;
 use OCA\News\Scraper\Scraper;
 use OCA\News\Fetcher\FeedFetcher;
-use GuzzleHttp\Client;
+use OCA\News\Config\FetcherConfig;
 
 use OCA\News\Utility\Time;
 use OCP\IL10N;
 use OCP\ITempManager;
-use OCP\IConfig;
+
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -109,9 +109,9 @@ class FeedFetcherTest extends TestCase
     private $scraper;
 
     /**
-     * @var MockObject|iConfig
+     * @var MockObject|FetcherConfig
      */
-    private $iConfig;
+    private $fetcherConfig;
 
     //metadata
     /**
@@ -195,7 +195,7 @@ protected function setUp(): void
         $this->scraper = $this->getMockBuilder(Scraper::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->iConfig = $this->getMockBuilder(IConfig::class)
+        $this->fetcherConfig = $this->getMockBuilder(FetcherConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->fetcher = new FeedFetcher(
@@ -206,7 +206,7 @@ protected function setUp(): void
             $this->ITempManager,
             $timeFactory,
             $this->logger,
-            $this->iConfig
+            $this->fetcherConfig
         );
         $this->url = 'http://tests/';