Merge branch 'pull/50' into develop

Author: vredeling

.scrutinizer.yml

@@ -2,12 +2,22 @@ checks:
     php:
         code_rating: true
         duplication: true
+build:
+    tests:
+        before:
+            - 'composer install --dev --prefer-source'
+        override:
+            -
+                command: 'vendor/bin/phpunit -c /home/scrutinizer/build/phpunit.xml --coverage-clover=clover-file'
+                coverage:
+                    file: 'clover-file'
+                    format: 'clover'
 filter:
     excluded_paths: [vendor/*, tests/*]
 before_commands:
     - 'composer install --dev --prefer-source'
 tools:
-    external_code_coverage: true
+    external_code_coverage: false
     php_mess_detector: true
     php_code_sniffer: true
     sensiolabs_security_checker: true

phpunit.xml

@@ -9,6 +9,21 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false">
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+            <exclude>
+                <directory suffix=".php">./vendor</directory>
+                <directory suffix=".php">./tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <!-- this is the path of the files included in your clover report -->
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory>./tests/</directory>

src/Strava/API/OAuth.php

@@ -1,7 +1,6 @@
 <?php
 namespace Strava\API;
 
-use League\OAuth2\Client\Entity\User;
 use League\OAuth2\Client\Token\AccessToken as AccessToken;
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait as BearerAuthorizationTrait;
 use League\OAuth2\Client\Provider\AbstractProvider as AbstractProvider;
@@ -41,15 +40,15 @@ public function urlAccessToken()
     /**
      * @see AbstractProvider::urlUserDetails
      */
-    public function urlUserDetails(AccessToken $token)
+    public function urlUserDetails()
     {
         return 'https://www.strava.com/api/v3/athlete';
     }
 
     /**
      * @see AbstractProvider::userDetails
      */
-    public function userDetails($response, AccessToken $token)
+    public function userDetails($response)
     {
         $user = new stdClass;
 
@@ -68,23 +67,23 @@ public function userDetails($response, AccessToken $token)
     /**
      * @see AbstractProvider::userUid
      */
-    public function userUid($response, AccessToken $token)
+    public function userUid($response)
     {
         return $response->id;
     }
 
     /**
      * @see AbstractProvider::userEmail
      */
-    public function userEmail($response, AccessToken $token)
+    public function userEmail($response)
     {
         return isset($response->email) && $response->email ? $response->email : null;
     }
 
     /**
      * @see AbstractProvider::userScreenName
      */
-    public function userScreenName($response, AccessToken $token)
+    public function userScreenName($response)
     {
         return implode(' ', [$response->firstname, $response->lastname]);
     }

src/Strava/API/Service/Stub.php

@@ -258,6 +258,7 @@ public function getStreamsRoute($id)
 
     /**
      * @param string $result
+     * @return mixed
      */
     private function format($result)
     {