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

nibra · nibra · commit 32f3528d4ddf · 2020-11-29T15:41:12.000+01:00
# Conflicts:
#	Tests/GithubObjectTest.php
diff --git a/Tests/GithubObjectTest.php b/Tests/GithubObjectTest.php
@@ -135,7 +135,7 @@ public function testFetchUrlToken()
 		$this->options->set('gh.token', 'MyTestToken');
 
 		$this->assertThat(
-			$this->object->fetchUrl('/gists', 0, 0),
+			(string) $this->object->fetchUrl('/gists', 0, 0),
 			$this->equalTo('https://api.github.com/gists'),
 			'URL is not as expected.'
 		);
