Minor code cleanup, add newer php version for travis tests

.travis.yml

@@ -6,6 +6,8 @@ install:
 php:
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
   - hhvm
   - nightly
 

src/Controller.php

@@ -154,7 +154,7 @@ class Controller {
 		if (null === $url)
 		{
 			$url = $util->isViewPage()
-				? $this->request->getUri()->__toString()
+				? (string) $this->request->getUri()
 				: $serverParams['HTTP_REFERER'];
 		}
 
@@ -245,7 +245,7 @@ class Controller {
 		$csp = [
 			"default-src 'self'",
 			"object-src 'none'",
-			"frame-src *.youtube.com",
+			'frame-src *.youtube.com',
 		];
 
 		$view->addHeader('Content-Security-Policy', implode('; ', $csp));

src/Model/API.php

@@ -44,7 +44,7 @@ class API {
 		array_multisort($sort, SORT_ASC, $array);
 
 		// Re-key array items by their ids
-		if (array_key_exists('id', $array[0]))
+		if (array_key_exists('id', (array)$array[0]))
 		{
 			$keyed = [];