Adds missing tests and behavior

Author: sagikazarmark

spec/UriFactory/DiactorosFactorySpec.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace spec\Http\Discovery\UriFactory;
+
+use Psr\Http\Message\UriInterface;
+use PhpSpec\ObjectBehavior;
+
+class DiactorosFactorySpec extends ObjectBehavior
+{
+    function let()
+    {
+        if (!class_exists('Zend\Diactoros\Uri')) {
+            throw new SkippingException('Diactoros is not available');
+        }
+    }
+
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Http\Discovery\UriFactory\DiactorosFactory');
+    }
+
+    function it_is_a_uri_factory()
+    {
+        $this->shouldImplement('Http\Message\UriFactory');
+    }
+
+    function it_creates_a_uri_from_string()
+    {
+        $this->createUri('http://php-http.org')->shouldHaveType('Psr\Http\Message\UriInterface');
+    }
+
+    function it_creates_a_uri_from_uri(UriInterface $uri)
+    {
+        $this->createUri($uri)->shouldReturn($uri);
+    }
+
+    function it_throws_an_exception_when_uri_is_invalid()
+    {
+        $this->shouldThrow('InvalidArgumentException')->duringCreateUri(null);
+    }
+}

spec/UriFactory/GuzzleFactorySpec.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace spec\Http\Discovery\UriFactory;
+
+use Psr\Http\Message\UriInterface;
+use PhpSpec\ObjectBehavior;
+
+class GuzzleFactorySpec extends ObjectBehavior
+{
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Http\Discovery\UriFactory\GuzzleFactory');
+    }
+
+    function it_is_a_uri_factory()
+    {
+        $this->shouldImplement('Http\Message\UriFactory');
+    }
+
+    function it_creates_a_uri_from_string()
+    {
+        $this->createUri('http://php-http.org')->shouldHaveType('Psr\Http\Message\UriInterface');
+    }
+
+    function it_creates_a_uri_from_uri(UriInterface $uri)
+    {
+        $this->createUri($uri)->shouldReturn($uri);
+    }
+
+    function it_throws_an_exception_when_uri_is_invalid()
+    {
+        $this->shouldThrow('InvalidArgumentException')->duringCreateUri(null);
+    }
+}

src/UriFactory/DiactorosFactory.php

@@ -12,6 +12,7 @@
 namespace Http\Discovery\UriFactory;
 
 use Http\Message\UriFactory;
+use Psr\Http\Message\UriInterface;
 use Zend\Diactoros\Uri;
 
 /**
@@ -26,6 +27,12 @@ class DiactorosFactory implements UriFactory
      */
     public function createUri($uri)
     {
-        return new Uri($uri);
+        if ($uri instanceof UriInterface) {
+            return $uri;
+        } elseif (is_string($uri)) {
+            return new Uri($uri);
+        }
+
+        throw new \InvalidArgumentException('URI must be a string or UriInterface');
     }
 }