Merge remote-tracking branch 'joomla/master' into 2.0-dev

# Conflicts:
#	.drone.jsonnet
#	.drone.yml
#	.gitignore
#	README.md
#	Tests/GithubObjectTest.php
#	src/AbstractGithubObject.php

Author: nibra

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: joomla
+custom: https://community.joomla.org/sponsorship-campaigns.html

Tests/GithubObjectTest.php

@@ -47,11 +47,33 @@ protected function setUp(): void
 	public function fetchUrlData()
 	{
 		return array(
-			'Standard github - no pagination data' => array('https://api.github.com', '/gists', 0, 0, 'https://api.github.com/gists'),
-			'Enterprise github - no pagination data' => array('https://mygithub.com', '/gists', 0, 0, 'https://mygithub.com/gists'),
-			'Standard github - page 3' => array('https://api.github.com', '/gists', 3, 0, 'https://api.github.com/gists?page=3'),
+			'Standard github - no pagination data'    => array(
+				'https://api.github.com',
+				'/gists',
+				0,
+				0,
+				'https://api.github.com/gists'
+			),
+			'Enterprise github - no pagination data'  => array(
+				'https://mygithub.com',
+				'/gists',
+				0,
+				0,
+				'https://mygithub.com/gists'
+			),
+			'Standard github - page 3'                => array(
+				'https://api.github.com',
+				'/gists',
+				3,
+				0,
+				'https://api.github.com/gists?page=3'
+			),
 			'Enterprise github - page 3, 50 per page' => array(
-				'https://mygithub.com', '/gists', 3, 50, 'https://mygithub.com/gists?page=3&per_page=50'
+				'https://mygithub.com',
+				'/gists',
+				3,
+				50,
+				'https://mygithub.com/gists?page=3&per_page=50'
 			),
 		);
 	}
@@ -96,7 +118,8 @@ public function testFetchUrlBasicAuth()
 
 		$this->assertThat(
 			$this->object->fetchUrl('/gists', 0, 0),
-			$this->equalTo('https://MyTestUser:MyTestPass@api.github.com/gists')
+			$this->equalTo('https://MyTestUser:MyTestPass@api.github.com/gists'),
+			'URL is not as expected.'
 		);
 	}
 
@@ -113,7 +136,14 @@ public function testFetchUrlToken()
 
 		$this->assertThat(
 			$this->object->fetchUrl('/gists', 0, 0),
-			$this->equalTo('https://api.github.com/gists?access_token=MyTestToken')
+			$this->equalTo('https://api.github.com/gists'),
+			'URL is not as expected.'
+		);
+
+		$this->assertThat(
+			$this->client->getOption('headers'),
+			$this->equalTo(['Authorization' => 'token MyTestToken']),
+			'Token should be propagated as a header.'
 		);
 	}
 }

Tests/bootstrap.php

@@ -0,0 +1,6 @@
+<?php
+require_once 'vendor/autoload.php';
+
+// Turn off E_DEPRECATED caused by outdated PHPUnit
+$errorReporting = error_reporting();
+error_reporting($errorReporting & ~E_DEPRECATED);

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php" colors="false">
+<phpunit bootstrap="Tests/bootstrap.php" colors="false">
 	<testsuites>
 		<testsuite name="Unit">
 			<directory>Tests</directory>

src/AbstractGithubObject.php

@@ -9,8 +9,7 @@
 namespace Joomla\Github;
 
 use Joomla\Http\Exception\UnexpectedResponseException;
-use Joomla\Http\Http;
-use Joomla\Http\HttpFactory;
+use Joomla\Http\Http as BaseHttp;
 use Joomla\Http\Response;
 use Joomla\Registry\Registry;
 use Joomla\Uri\Uri;
@@ -33,7 +32,7 @@ abstract class AbstractGithubObject
 	/**
 	 * The HTTP client object to use in sending HTTP requests.
 	 *
-	 * @var    Http
+	 * @var    BaseHttp
 	 * @since  1.0
 	 */
 	protected $client;
@@ -83,11 +82,11 @@ abstract class AbstractGithubObject
 	 * Constructor.
 	 *
 	 * @param   Registry  $options  GitHub options object.
-	 * @param   Http      $client   The HTTP client object.
+	 * @param   BaseHttp  $client   The HTTP client object.
 	 *
 	 * @since   1.0
 	 */
-	public function __construct(Registry $options = null, Http $client = null)
+	public function __construct(Registry $options = null, BaseHttp $client = null)
 	{
 		$this->options = $options ?: new Registry;
 		$this->client  = $client ?: (new HttpFactory)->getHttp($this->options);