From 1d4c3274374defeb5ae349a278abee23bf92cda0 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 20 Oct 2017 12:18:12 +0200 Subject: [PATCH] Use Psr\Http\Message\StreamInterface instead of Icinga\Data\StreamInterface refs #2655 --- library/Icinga/Data/StreamInterface.php | 2 ++ library/Icinga/File/Csv.php | 2 +- library/Icinga/File/Json.php | 2 +- library/Icinga/Util/StreamWrapper.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/Icinga/Data/StreamInterface.php b/library/Icinga/Data/StreamInterface.php index 98beeafaa..8b340bd4d 100644 --- a/library/Icinga/Data/StreamInterface.php +++ b/library/Icinga/Data/StreamInterface.php @@ -32,6 +32,8 @@ namespace Icinga\Data; * Typically, an instance will wrap a PHP stream; this interface provides * a wrapper around the most common operations, including serialization of * the entire stream to a string. + * + * @deprecated Use {@link \Psr\Http\Message\StreamInterface} instead */ interface StreamInterface { diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php index 686076681..4a715138e 100644 --- a/library/Icinga/File/Csv.php +++ b/library/Icinga/File/Csv.php @@ -3,7 +3,7 @@ namespace Icinga\File; -use Icinga\Data\StreamInterface; +use Psr\Http\Message\StreamInterface; use Traversable; /** diff --git a/library/Icinga/File/Json.php b/library/Icinga/File/Json.php index b0a5f6c5d..1613baadf 100644 --- a/library/Icinga/File/Json.php +++ b/library/Icinga/File/Json.php @@ -3,9 +3,9 @@ namespace Icinga\File; -use Icinga\Data\StreamInterface; use Icinga\Exception\IcingaException; use Icinga\Util\Buffer; +use Psr\Http\Message\StreamInterface; use stdClass; use Traversable; diff --git a/library/Icinga/Util/StreamWrapper.php b/library/Icinga/Util/StreamWrapper.php index f86bfd30c..d557b73a9 100644 --- a/library/Icinga/Util/StreamWrapper.php +++ b/library/Icinga/Util/StreamWrapper.php @@ -4,7 +4,7 @@ namespace Icinga\Util; use Exception; -use Icinga\Data\StreamInterface; +use Psr\Http\Message\StreamInterface; use RuntimeException; /**