From c20923f5ea9f500a41de2b3722f4b44fe3a45690 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 8 Oct 2014 14:33:20 +0200
Subject: more cleanup

---
 articleenhancer/xpatharticleenhancer.php                | 3 +--
 tests/unit/articleenhancer/XPathArticleEnhancerTest.php | 5 +----
 tests/unit/utility/FaviconFetcherTest.php               | 6 +-----
 utility/faviconfetcher.php                              | 5 +++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/articleenhancer/xpatharticleenhancer.php b/articleenhancer/xpatharticleenhancer.php
index 8681051d2..ec3b61525 100644
--- a/articleenhancer/xpatharticleenhancer.php
+++ b/articleenhancer/xpatharticleenhancer.php
@@ -100,8 +100,7 @@ class XPathArticleEnhancer implements ArticleEnhancer {
 
 	private function getFile($url) {
 		return $this->fileFactory->getFile(
-			$url, $this->maximumTimeout, 5, null, 'Mozilla/5.0 AppleWebKit',
-			false, null, null, null
+			$url, $this->maximumTimeout, 5, null, 'Mozilla/5.0 AppleWebKit'
 		);
 	}
 
diff --git a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
index e7b3d19dd..8a99e9d5a 100644
--- a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
+++ b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
@@ -84,10 +84,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase {
 				$this->equalTo($this->redirects),
 				$this->equalTo($this->headers),
 				$this->equalTo($this->userAgent),
-				$this->equalTo(false),
-				$this->equalTo(null),
-				$this->equalTo(null),
-				$this->equalTo(null))
+				$this->equalTo(false))
 			->will($this->returnValue($file));
 
 		$result = $this->testEnhancer->enhance($item);
diff --git a/tests/unit/utility/FaviconFetcherTest.php b/tests/unit/utility/FaviconFetcherTest.php
index a9c1416dc..3ed0d4dc8 100644
--- a/tests/unit/utility/FaviconFetcherTest.php
+++ b/tests/unit/utility/FaviconFetcherTest.php
@@ -89,11 +89,7 @@ class FaviconFetcherTest extends \PHPUnit_Framework_TestCase {
 				$this->equalTo(10),
 				$this->equalTo(5),
 				$this->equalTo(null),
-				$this->equalTo(null),
-				$this->equalTo(false),
-				$this->equalTo(null),
-				$this->equalTo(null),
-				$this->equalTo(null))
+				$this->equalTo('Mozilla/5.0 AppleWebKit'))
 			->will($this->returnValue($pngMock));
 
 		$favicon = $this->fetcher->fetch($url);
diff --git a/utility/faviconfetcher.php b/utility/faviconfetcher.php
index 7ffdad9d7..cf7eed32e 100644
--- a/utility/faviconfetcher.php
+++ b/utility/faviconfetcher.php
@@ -100,8 +100,9 @@ class FaviconFetcher {
 
 
 	private function getFile($url) {
-		return $this->apiFactory->getFile($url, 10, 5, null, null, false,
-				null, null, null);
+		return $this->apiFactory->getFile(
+			$url, 10, 5, null, 'Mozilla/5.0 AppleWebKit'
+		);
 	}
 
 
-- 
cgit v1.2.3