More cleanup

j0k3r · Nov 11, 2017 · 356c44d · 356c44d
1 parent 7b1bc39
commit 356c44d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/src/Extractor/ContentExtractor.php b/src/Extractor/ContentExtractor.php
@@ -435,7 +435,7 @@ public function process($html, $url, SiteConfig $siteConfig = null, $smartTidy =
         // If there's more than one, it could indicate more than
         // one author, but it could also indicate that we're processing
         // a page listing different articles with different authors.
-        $detectAuthor = $this->extractEntityFromQuery(
+        $this->extractEntityFromQuery(
             'authors',
             $detectAuthor,
             "//a[contains(concat(' ',normalize-space(@rel),' '),' author ')]",
@@ -449,7 +449,7 @@ function ($element, $currentEntity) {
         // Find date in pubdate marked time element
         // For the same reason given above, we only use this
         // if there's exactly one element.
-        $detectDate = $this->extractEntityFromQuery(
+        $this->extractEntityFromQuery(
             'date',
             $detectDate,
             '//time[@pubdate or @pubDate]',

diff --git a/src/SiteConfig/ConfigBuilder.php b/src/SiteConfig/ConfigBuilder.php
@@ -73,7 +73,7 @@ public function addToCache($key, SiteConfig $config)
      *
      * @param string $key Key for the cache
      *
-     * @return bool|SiteConfig
+     * @return false|SiteConfig
      */
     public function getCachedVersion($key)
     {
@@ -113,7 +113,7 @@ public function buildFromUrl($url, $addToCache = true)
         // extract host name
         $host = parse_url($url, PHP_URL_HOST);
 
-        return $this->buildForHost($host, $addToCache);
+        return $this->buildForHost((string) $host, $addToCache);
     }
 
     /**

diff --git a/tests/Extractor/ContentExtractorTest.php b/tests/Extractor/ContentExtractorTest.php
@@ -763,7 +763,7 @@ public function testLogMessage()
 
         $config = new SiteConfig();
 
-        $res = $contentExtractor->process(
+        $contentExtractor->process(
             '<html>&lt;iframe &gt;&lt;/iframe&gt;</html>',
             'https://vimeo.com/35941909',
             $config

diff --git a/tests/Extractor/HttpClientTest.php b/tests/Extractor/HttpClientTest.php
@@ -453,10 +453,6 @@ public function testWith404ResponseWithoutResponse()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $response = $this->getMockBuilder('GuzzleHttp\Message\Response')
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $client = $this->getMockBuilder('GuzzleHttp\Client')
             ->disableOriginalConstructor()
             ->getMock();
@@ -787,7 +783,7 @@ public function testUserAgent($url, $httpHeader, $expectedUa)
         ]);
         $http->setLogger($logger);
 
-        $res = $http->fetch($url, false, $httpHeader);
+        $http->fetch($url, false, $httpHeader);
 
         $records = $handler->getRecords();
 
@@ -863,7 +859,7 @@ public function testReferer($url, $httpHeader, $expectedReferer)
         ]);
         $http->setLogger($logger);
 
-        $res = $http->fetch($url, false, $httpHeader);
+        $http->fetch($url, false, $httpHeader);
 
         $records = $handler->getRecords();
 

diff --git a/tests/Ring/Client/SafeCurlHandlerTest.php b/tests/Ring/Client/SafeCurlHandlerTest.php
@@ -49,9 +49,4 @@ public function testReusesHandles()
         $a($request);
         $a($request);
     }
-
-    protected function getHandler($factory = null, $options = [])
-    {
-        return new SafeCurlHandler($options);
-    }
 }
diff --git a/tests/SiteConfig/ConfigBuilderTest.php b/tests/SiteConfig/ConfigBuilderTest.php
@@ -11,7 +11,7 @@ class ConfigBuilderTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructDefault()
     {
-        $configBuilder = new ConfigBuilder(['site_config' => [__DIR__]]);
+        new ConfigBuilder(['site_config' => [__DIR__]]);
     }
 
     public function testBuildFromArrayNoLines()
@@ -210,6 +210,8 @@ public function testLogMessage()
 
         $res = $configBuilder->buildFromUrl('https://fr.wikipedia.org/wiki/Wikip%C3%A9dia:Accueil_principal');
 
+        $this->assertInstanceOf('Graby\SiteConfig\SiteConfig', $res);
+
         $records = $handler->getRecords();
 
         $this->assertGreaterThan(5, $records);
@@ -219,4 +221,15 @@ public function testLogMessage()
         $this->assertSame('.wikipedia.org.txt', $records[1]['context']['host']);
         $this->assertSame('Appending site config settings from global.txt', $records[2]['message']);
     }
+
+    public function testWithBadHost()
+    {
+        $configBuilder = new ConfigBuilder([
+            'site_config' => [__DIR__ . '/../fixtures/site_config'],
+        ]);
+
+        $res = $configBuilder->buildFromUrl('http://user@:80/test');
+
+        $this->assertInstanceOf('Graby\SiteConfig\SiteConfig', $res);
+    }
 }