remove tests bootstrap file

Author: Tobion

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
+<phpunit bootstrap="vendor/autoload.php"
          colors="true">
   <testsuites>
     <testsuite>
@@ -9,9 +9,6 @@
   <filter>
     <whitelist>
       <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
     </whitelist>
   </filter>
 </phpunit>

src/Uri.php

@@ -185,8 +185,8 @@ public static function isRelativePathReference(UriInterface $uri)
      */
     public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null)
     {
-        if ($base) {
-            $uri = self::resolve($base, $uri);
+        if ($base !== null) {
+            $uri = UriResolver::resolve($base, $uri);
 
             return ($uri->getScheme() === $base->getScheme())
                 && ($uri->getAuthority() === $base->getAuthority())

tests/FunctionsTest.php

@@ -638,3 +638,10 @@ public function testModifyRequestKeepInstanceOfRequest()
         $this->assertTrue($r2 instanceof \Psr\Http\Message\ServerRequestInterface);
     }
 }
+
+class HasToString
+{
+    public function __toString() {
+        return 'foo';
+    }
+}