use psr http message 0.2 package

apioo · Oct 11, 2014 · a708210 · a708210
1 parent e79e328
commit a708210
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 412 deletions.
diff --git a/composer.json b/composer.json
@@ -13,10 +13,11 @@
   "require": {
     "php": ">=5.4",
     "psr/log": "~1.0",
+    "psr/http-message": "0.2@dev",
     "monolog/monolog": "~1.0",
     "symfony/event-dispatcher": "~2.0",
     "symfony/dependency-injection": "~2.0",
-    "doctrine/dbal": "2.5.0-RC2"
+    "doctrine/dbal": "~2.5@RC"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.1",
@@ -26,7 +27,7 @@
   "autoload": {
     "psr-0": {
       "PSX\\": "library/",
-      "Psr\\": "library/"
+      "Psr\\Cache\\": "library/"
     }
   }
 }
diff --git a/library/PSX/ControllerAbstract.php b/library/PSX/ControllerAbstract.php
@@ -28,7 +28,7 @@
 use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Data\NotFoundException;
 use PSX\Data\ReaderFactory;
 use PSX\Data\RecordInterface;
@@ -401,7 +401,7 @@ protected function setBody($data, $writerType = null)
 		{
 			$this->response->getBody()->write($data);
 		}
-		else if($data instanceof StreamInterface)
+		else if($data instanceof StreamableInterface)
 		{
 			$this->response->setBody($data);
 		}

diff --git a/library/PSX/Http/DeleteRequest.php b/library/PSX/Http/DeleteRequest.php
@@ -23,7 +23,7 @@
 
 namespace PSX\Http;
 
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Url;
 
 /**
@@ -40,7 +40,7 @@ class DeleteRequest extends Request
 	 *
 	 * @param PSX\Url|string $url
 	 * @param array $header
-	 * @param Psr\Http\Message\StreamInterface|string|array $body
+	 * @param Psr\Http\Message\StreamableInterface|string|array $body
 	 */
 	public function __construct($url, array $header = array(), $body = null)
 	{

diff --git a/library/PSX/Http/Message.php b/library/PSX/Http/Message.php
@@ -25,7 +25,7 @@
 
 use InvalidArgumentException;
 use Psr\Http\Message\MessageInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Http\Stream\StringStream;
 
 /**
@@ -43,7 +43,7 @@ class Message implements MessageInterface
 
 	/**
 	 * @param array $header
-	 * @param Psr\Http\Message\StreamInterface|string $body
+	 * @param Psr\Http\Message\StreamableInterface|string $body
 	 * @param string $scheme
 	 */
 	public function __construct(array $header = array(), $body = null, $scheme = null)
@@ -133,7 +133,7 @@ public function removeHeader($name)
 	/**
 	 * Returns the message body
 	 *
-	 * @return Psr\Http\StreamInterface
+	 * @return Psr\Http\StreamableInterface
 	 */
 	public function getBody()
 	{
@@ -143,17 +143,17 @@ public function getBody()
 	/**
 	 * Sets the message body
 	 *
-	 * @param Psr\Http\StreamInterface $body
+	 * @param Psr\Http\StreamableInterface $body
 	 * @return void
 	 */
-	public function setBody(StreamInterface $body = null)
+	public function setBody(StreamableInterface $body = null)
 	{
 		$this->body = $body;
 	}
 
 	protected function prepareBody($body)
 	{
-		if($body === null || $body instanceof StreamInterface)
+		if($body === null || $body instanceof StreamableInterface)
 		{
 			return $body;
 		}
@@ -163,7 +163,7 @@ protected function prepareBody($body)
 		}
 		else
 		{
-			throw new InvalidArgumentException('Body must be either an Psr\Http\Message\StreamInterface or string');
+			throw new InvalidArgumentException('Body must be either an Psr\Http\Message\StreamableInterface or string');
 		}
 	}
 }

diff --git a/library/PSX/Http/PostRequest.php b/library/PSX/Http/PostRequest.php
@@ -23,7 +23,7 @@
 
 namespace PSX\Http;
 
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Url;
 
 /**
@@ -40,7 +40,7 @@ class PostRequest extends Request
 	 *
 	 * @param PSX\Url|string $url
 	 * @param array $header
-	 * @param Psr\Http\Message\StreamInterface|string|array $body
+	 * @param Psr\Http\Message\StreamableInterface|string|array $body
 	 */
 	public function __construct($url, array $header = array(), $body = null)
 	{

diff --git a/library/PSX/Http/PutRequest.php b/library/PSX/Http/PutRequest.php
@@ -23,7 +23,7 @@
 
 namespace PSX\Http;
 
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Url;
 
 /**
@@ -40,7 +40,7 @@ class PutRequest extends Request
 	 *
 	 * @param PSX\Url|string $url
 	 * @param array $header
-	 * @param Psr\Http\Message\StreamInterface|string|array $body
+	 * @param Psr\Http\Message\StreamableInterface|string|array $body
 	 */
 	public function __construct($url, array $header = array(), $body = null)
 	{

diff --git a/library/PSX/Http/Request.php b/library/PSX/Http/Request.php
@@ -24,7 +24,7 @@
 namespace PSX\Http;
 
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Http;
 use PSX\Url;
 

diff --git a/library/PSX/Http/Response.php b/library/PSX/Http/Response.php
@@ -24,7 +24,7 @@
 namespace PSX\Http;
 
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 use PSX\Http;
 use PSX\Exception;
 

diff --git a/library/PSX/Http/Stream/FileStream.php b/library/PSX/Http/Stream/FileStream.php
@@ -23,9 +23,6 @@
 
 namespace PSX\Http\Stream;
 
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-
 /**
  * FileStream
  *

diff --git a/library/PSX/Http/Stream/MultipartStream.php b/library/PSX/Http/Stream/MultipartStream.php
@@ -24,7 +24,7 @@
 namespace PSX\Http\Stream;
 
 use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 
 /**
  * MultipartStream
@@ -33,7 +33,7 @@
  * @license http://www.gnu.org/licenses/gpl.html GPLv3
  * @link    http://phpsx.org
  */
-class MultipartStream implements StreamInterface, \Iterator, \Countable
+class MultipartStream implements StreamableInterface, \Iterator, \Countable
 {
 	protected $streams;
 
@@ -54,6 +54,11 @@ public function detach()
 		return $this->current()->detach();
 	}
 
+	public function attach($stream)
+	{
+		return $this->current()->attach($stream);
+	}
+
 	public function getSize()
 	{
 		return $this->current()->getSize();
@@ -104,6 +109,11 @@ public function getContents($length = -1)
 		return $this->current()->getContents($length);
 	}
 
+	public function getMetadata($key = null)
+	{
+		return $this->current()->getMetadata($key);
+	}
+
 	public function __toString()
 	{
 		return $this->current()->__toString();

diff --git a/library/PSX/Http/Stream/SocksStream.php b/library/PSX/Http/Stream/SocksStream.php
@@ -24,7 +24,7 @@
 namespace PSX\Http\Stream;
 
 use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 
 /**
  * The socks stream is used by the socks http handler. When you read data from 
@@ -57,6 +57,10 @@ public function detach()
 		return parent::detach();
 	}
 
+	public function attach($stream)
+	{
+	}
+
 	public function getSize()
 	{
 		return $this->contentLength;
@@ -96,6 +100,11 @@ public function getContents($length = -1)
 		}
 	}
 
+	public function getMetadata($key = null)
+	{
+		return null;
+	}
+
 	public function isChunkEncoded()
 	{
 		return $this->chunkedEncoding;

diff --git a/library/PSX/Http/Stream/StringStream.php b/library/PSX/Http/Stream/StringStream.php
@@ -23,7 +23,7 @@
 
 namespace PSX\Http\Stream;
 
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 
 /**
  * Stream wich works on an string therefore the size of the stream is limited to
@@ -33,7 +33,7 @@
  * @license http://www.gnu.org/licenses/gpl.html GPLv3
  * @link    http://phpsx.org
  */
-class StringStream implements StreamInterface
+class StringStream implements StreamableInterface
 {
 	protected $data;
 	protected $length;
@@ -68,6 +68,10 @@ public function detach()
 		return null;
 	}
 
+	public function attach($stream)
+	{
+	}
+
 	public function getSize()
 	{
 		return $this->length;
@@ -179,6 +183,11 @@ public function getContents($maxLength = -1)
 		return $data;
 	}
 
+	public function getMetadata($key = null)
+	{
+		return null;
+	}
+
 	public function __toString()
 	{
 		return $this->data === null ? '' : $this->data;

diff --git a/library/PSX/Http/Stream/TempStream.php b/library/PSX/Http/Stream/TempStream.php
@@ -24,7 +24,7 @@
 namespace PSX\Http\Stream;
 
 use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\StreamableInterface;
 
 /**
  * The curl handler writes the http body response into an php://temp stream 
@@ -36,7 +36,7 @@
  * @license http://www.gnu.org/licenses/gpl.html GPLv3
  * @link    http://phpsx.org
  */
-class TempStream implements StreamInterface
+class TempStream implements StreamableInterface
 {
 	protected $resource;
 	protected $seekable;
@@ -79,6 +79,10 @@ public function detach()
 		return $handle;
 	}
 
+	public function attach($stream)
+	{
+	}
+
 	public function getSize()
 	{
 		if($this->resource)
@@ -166,6 +170,11 @@ public function getContents($length = -1)
 		return null;
 	}
 
+	public function getMetadata($key = null)
+	{
+		return null;
+	}
+
 	public function __toString()
 	{
 		if($this->resource)