Commit a6f810b9 authored by TheBigB's avatar TheBigB
Browse files

Merge branch 'release/0.2.6'

parents 0d60ddd6 e80d2487
......@@ -7,6 +7,7 @@
{
"php": ">=5.5.0",
"psr/http-message": "^1.0",
"1of0/streams": "^0.1.3",
"zendframework/zend-diactoros": "^1.1.0"
},
"require-dev":
......
......@@ -4,9 +4,43 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "fbb926fe523ee5742d1344b5d3886923",
"content-hash": "371d7b7e2fd1b879ad337e7b28e0d200",
"hash": "7383168118d5c54917c7fc6ddc5ad813",
"content-hash": "55cb647c226eed0c85c49afd236e318f",
"packages": [
{
"name": "1of0/streams",
"version": "0.1.3",
"source": {
"type": "git",
"url": "https://bitbucket.org/1of0/streams.git",
"reference": "e3c47ae77731c37a6a6415b10e9f13902d792b29"
},
"dist": {
"type": "zip",
"url": "https://bitbucket.org/1of0/streams/get/e3c47ae77731c37a6a6415b10e9f13902d792b29.zip",
"reference": "e3c47ae77731c37a6a6415b10e9f13902d792b29",
"shasum": ""
},
"require": {
"php": ">=5.5.0",
"psr/http-message": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0.0"
},
"type": "library",
"autoload": {
"psr-4": {
"OneOfZero\\Streams\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Simple stream wrapper library",
"time": "2016-02-26 13:28:14"
},
{
"name": "psr/http-message",
"version": "1.0",
......@@ -255,22 +289,24 @@
},
{
"name": "phpspec/prophecy",
"version": "v1.5.0",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
"reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "~2.0",
"sebastian/comparator": "~1.1"
"sebastian/comparator": "~1.1",
"sebastian/recursion-context": "~1.0"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
......@@ -278,7 +314,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
"dev-master": "1.5.x-dev"
}
},
"autoload": {
......@@ -311,27 +347,28 @@
"spy",
"stub"
],
"time": "2015-08-13 10:07:40"
"time": "2016-02-15 07:46:21"
},
{
"name": "phpunit/php-code-coverage",
"version": "3.1.1",
"version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "92f5c61b5c64159faec5298325ffab0c7e59dcc8"
"reference": "a58f95ae76fe201b571fad3e8370a50c4368678c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/92f5c61b5c64159faec5298325ffab0c7e59dcc8",
"reference": "92f5c61b5c64159faec5298325ffab0c7e59dcc8",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a58f95ae76fe201b571fad3e8370a50c4368678c",
"reference": "a58f95ae76fe201b571fad3e8370a50c4368678c",
"shasum": ""
},
"require": {
"php": ">=5.6",
"php": "^5.6 || ^7.0",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3",
"phpunit/php-token-stream": "^1.4.2",
"sebastian/code-unit-reverse-lookup": "~1.0",
"sebastian/environment": "^1.3.2",
"sebastian/version": "~1.0|~2.0"
},
......@@ -347,7 +384,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev"
"dev-master": "3.2.x-dev"
}
},
"autoload": {
......@@ -373,7 +410,7 @@
"testing",
"xunit"
],
"time": "2016-02-04 13:05:19"
"time": "2016-02-18 07:31:12"
},
{
"name": "phpunit/php-file-iterator",
......@@ -555,16 +592,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.2.3",
"version": "5.2.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "6fdb1d3004ebc7071c4ac62f2881d67c5c11fb59"
"reference": "b12b9c37e382c096b93c3f26e7395775f59a5eea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fdb1d3004ebc7071c4ac62f2881d67c5c11fb59",
"reference": "6fdb1d3004ebc7071c4ac62f2881d67c5c11fb59",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b12b9c37e382c096b93c3f26e7395775f59a5eea",
"reference": "b12b9c37e382c096b93c3f26e7395775f59a5eea",
"shasum": ""
},
"require": {
......@@ -574,9 +611,9 @@
"ext-reflection": "*",
"ext-spl": "*",
"myclabs/deep-copy": "~1.3",
"php": ">=5.6",
"php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "~3.0",
"phpunit/php-code-coverage": "^3.2.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": ">=1.0.6",
......@@ -625,7 +662,7 @@
"testing",
"xunit"
],
"time": "2016-02-08 12:15:53"
"time": "2016-02-19 11:43:07"
},
{
"name": "phpunit/phpunit-mock-objects",
......@@ -683,6 +720,51 @@
],
"time": "2015-12-08 08:47:06"
},
{
"name": "sebastian/code-unit-reverse-lookup",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "~5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
}
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2016-02-13 06:45:14"
},
{
"name": "sebastian/comparator",
"version": "1.2.0",
......@@ -801,16 +883,16 @@
},
{
"name": "sebastian/environment",
"version": "1.3.3",
"version": "1.3.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "6e7133793a8e5a5714a551a8324337374be209df"
"reference": "22aa49baa48886f40b060e061a7967436f44a249"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
"reference": "6e7133793a8e5a5714a551a8324337374be209df",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/22aa49baa48886f40b060e061a7967436f44a249",
"reference": "22aa49baa48886f40b060e061a7967436f44a249",
"shasum": ""
},
"require": {
......@@ -847,7 +929,7 @@
"environment",
"hhvm"
],
"time": "2015-12-02 08:37:27"
"time": "2016-02-26 11:40:57"
},
{
"name": "sebastian/exporter",
......
......@@ -6,7 +6,7 @@ use InvalidArgumentException;
use OneOfZero\Curly\BinarySafe;
use OneOfZero\Curly\CancellationCallbackInterface;
use OneOfZero\Curly\CurlyOptions;
use OneOfZero\Curly\SharedStreamInterface;
use OneOfZero\Streams\SharedStreamInterface;
/**
* Class StreamHandler
......
......@@ -9,6 +9,7 @@
namespace OneOfZero\Curly;
use OneOfZero\Streams\SharedStreamInterface;
use Zend\Diactoros\Stream;
/**
......
<?php
/**
* Copyright (c) 2015 Bernardo van der Wal
* MIT License
*
* Refer to the LICENSE file for the full copyright notice.
*/
namespace OneOfZero\Curly;
use Psr\Http\Message\StreamInterface;
/**
* Interface SharedStreamInterface
*
* Extends the PSR-7 StreamInterface by providing an additional method that allows to retrieve the inner stream resource
* without detaching it.
*
* @package OneOfZero\Curly
*/
interface SharedStreamInterface extends StreamInterface
{
/**
* Returns the inner stream resource, without disposing the stream.
*
* @return Resource
*/
public function getResource();
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment