Make the tests happy

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index bb6f12e10c292c4c62bd36bb73c2cb559d90953a..38ec423e89cf2794b9389ca2e7b980aa6743da15 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -383,11 +383,11 @@ class APContact
                if (strlen($apcontact['photo']) > 255) {
                        $parts = parse_url($apcontact['photo']);
                        unset($parts['fragment']);
-                       $apcontact['photo'] = Uri::fromParts($parts);
+                       $apcontact['photo'] = (string)Uri::fromParts($parts);
 
                        if (strlen($apcontact['photo']) > 255) {
                                unset($parts['query']);
-                               $apcontact['photo'] = Uri::fromParts($parts);
+                               $apcontact['photo'] = (string)Uri::fromParts($parts);
                        }
 
                        if (strlen($apcontact['photo']) > 255) {

diff --git a/src/Model/Item.php b/src/Model/Item.php
index e0ca507174f4bd45ba71565e5a133f9a01552be4..73a6e65c577ba6c37c9367df518a8f0769bdc526 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2948,7 +2948,7 @@ class Item
                if (!empty($urlparts)) {
                        unset($urlparts['query']);
                        unset($urlparts['fragment']);
-                       $url = Uri::fromParts($urlparts);
+                       $url = (string)Uri::fromParts($urlparts);
                } else {
                        return false;
                }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7593711e56364289a8e288c0029af53d12c98661..89ffca153a12756bed27d1ecb61d5c70b8437a93 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -998,7 +998,7 @@ class DFRN
                        $path_parts = explode('/', $parts['path']);
                        array_pop($path_parts);
                        $parts['path'] =  implode('/', $path_parts);
-                       $contact['batch'] = Uri::fromParts($parts);
+                       $contact['batch'] = (string)Uri::fromParts($parts);
                }
 
                $dest_url = ($public_batch ? $contact['batch'] : $contact['notify']);

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index cc029366958f65981ec080fe1b062e3f833e5fa3..c5ad51215b72bdd134bae6b367daa777140f169a 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1419,7 +1419,7 @@ class Diaspora
 
                        $parts = parse_url($person['url']);
                        unset($parts['path']);
-                       $host_url = Uri::fromParts($parts);
+                       $host_url = (string)Uri::fromParts($parts);
 
                        return $host_url . '/objects/' . $guid;
                }

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 23def7e57f58a55392168e8f6061e50348d7688c..63cc67f4c9b51609df658e62d41c98e454dc7cb3 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -497,7 +497,7 @@ class Network
                $parts = parse_url($uri);
                if (!empty($parts['scheme']) && !empty($parts['host'])) {
                        $parts['host'] = idn_to_ascii($parts['host']);
-                       $uri = Uri::fromParts($parts);
+                       $uri = (string)Uri::fromParts($parts);
                } else {
                        $parts = explode('@', $uri);
                        if (count($parts) == 2) {