Some fixes for Scrutinizer

Author: Swader

scrutinizer.yml .scrutinizer.yml

@@ -20,6 +20,7 @@ tools:
     external_code_coverage:
         timeout: 600
         runs: 3
+    php_analyzer: true
     php_code_coverage: false
     php_code_sniffer:
         config:

.travis.yml

@@ -4,8 +4,13 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
+matrix:
+  allow_failures:
+    - php: 7.0
+
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source

CONTRIBUTING.md

@@ -3,6 +3,8 @@
 Contributions are **welcome** and will be fully **credited**.
 Send Pull Requests or open issues please.
 
+Active TODOs can be seen [here](TODO.md).
+
 ## Pull Requests
 
 - **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).

README.md

@@ -1,4 +1,6 @@
-![Travis Build Badge](https://travis-ci.org/Swader/diffbot-php-client.svg?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/?branch=master)
+[![Build Status](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/badges/build.png?b=master)](https://scrutinizer-ci.com/g/Swader/diffbot-php-client/build-status/master)
 
 # Diffbot PHP API Wrapper
 

TODO.md

@@ -0,0 +1,20 @@
+# Active TODOs
+
+Active todos, ordered by priority
+
+## High
+
+- implement Discussion API
+- implement Crawlbot
+- implement Search API
+
+## Medium
+
+- add streaming to Crawlbot - make it stream the result (it constantly grows)
+- implement Video API (currently beta)
+- improve Custom API
+- improve Wildcard Entity - apply to Custom API
+
+## Low
+
+- get more mock responses and test against them

composer.json

@@ -4,7 +4,7 @@
     "keywords": [
         "diffbot", "api", "wrapper", "client"
     ],
-    "homepage": "https://github.com/swader/diffbot_client",
+    "homepage": "https://github.com/swader/diffbot-php-client",
     "license": "MIT",
     "authors": [
         {

src/Abstracts/Api.php

@@ -31,21 +31,20 @@ abstract class Api implements \Swader\Diffbot\Interfaces\Api
 
     public function __construct($url)
     {
-        if (!is_string($url)) {
-            throw new \InvalidArgumentException('URL param must be a string.');
-        }
-        $url = trim($url);
+        $url = trim((string)$url);
         if (strlen($url) < 4) {
-            throw new \InvalidArgumentException('URL must be at least four characters in length');
-        }
-        if ($parts = parse_url($url)) {
-            if (!isset($parts["scheme"])) {
-                $url = "http://$url";
-            }
+            throw new \InvalidArgumentException(
+                'URL must be a string of at least four characters in length'
+            );
         }
+
+        $url = (isset(parse_url($url)['scheme'])) ? $url : "http://$url";
+
         $filtered_url = filter_var($url, FILTER_VALIDATE_URL);
-        if (false === $filtered_url) {
-            throw new \InvalidArgumentException('You provided an invalid URL: ' . $url);
+        if (!$filtered_url) {
+            throw new \InvalidArgumentException(
+                'You provided an invalid URL: ' . $url
+            );
         }
 
         $this->url = $filtered_url;
@@ -54,7 +53,8 @@ public function __construct($url)
     /**
      * Setting the timeout will define how long Diffbot will keep trying
      * to fetch the API results. A timeout can happen for various reasons, from
-     * Diffbot's failure, to the site being crawled being exceptionally slow, and more.
+     * Diffbot's failure, to the site being crawled being exceptionally slow,
+     * and more.
      *
      * @param int|null $timeout Defaults to 30000 even if not set
      *
@@ -69,17 +69,24 @@ public function setTimeout($timeout = null)
             throw new \InvalidArgumentException('Parameter is not an integer');
         }
         if ($timeout < 0) {
-            throw new \InvalidArgumentException('Parameter is negative. Only positive timeouts accepted.');
+            throw new \InvalidArgumentException(
+                'Parameter is negative. Only positive timeouts accepted.'
+            );
         }
 
         $this->timeout = $timeout;
+
         return $this;
     }
 
     public function call()
     {
         $response = $this->diffbot->getHttpClient()->get($this->buildUrl());
-        return $this->diffbot->getEntityFactory()->createAppropriateIterator($response);
+
+        return $this
+            ->diffbot
+            ->getEntityFactory()
+            ->createAppropriateIterator($response);
     }
 
     public function buildUrl()
@@ -106,7 +113,7 @@ public function buildUrl()
 
         // Add Other Options
         foreach ($this->otherOptions as $option => $value) {
-            $url .= '&'.$option . '=' . $value;
+            $url .= '&' . $option . '=' . $value;
         }
 
         return $url;
@@ -121,6 +128,7 @@ public function buildUrl()
     public function registerDiffbot(Diffbot $d)
     {
         $this->diffbot = $d;
+
         return $this;
     }
 

tests/Abstracts/ApiTest.php

@@ -96,7 +96,6 @@ public function invalidUrls()
         return [
             'bool' => [false],
             'null' => [null],
-            'number' => [12345],
             'abc' => ['abc'],
             'misc_string' => ['35tugz---sdf----?//*****/*//*']
         ];