From 23ddf730d5ec9e297a0b8c8c6c3937e05442fdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gamez?= Date: Mon, 26 Jun 2023 14:37:25 +0200 Subject: [PATCH] Remove obsolete internal classes --- CHANGELOG.md | 5 + src/Firebase/Http/HasSubRequests.php | 13 --- src/Firebase/Http/HasSubResponses.php | 13 --- src/Firebase/Http/Requests.php | 53 --------- src/Firebase/Http/Responses.php | 35 ------ src/Firebase/Http/WrappedPsr7Request.php | 133 ----------------------- 6 files changed, 5 insertions(+), 247 deletions(-) delete mode 100644 src/Firebase/Http/HasSubRequests.php delete mode 100644 src/Firebase/Http/HasSubResponses.php delete mode 100644 src/Firebase/Http/Requests.php delete mode 100644 src/Firebase/Http/Responses.php delete mode 100644 src/Firebase/Http/WrappedPsr7Request.php diff --git a/CHANGELOG.md b/CHANGELOG.md index fab7e2836..497d9747d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,14 @@ ### Removed * Removed obsolete internal classes + * `Kreait\Firebase\Http\HasSubRequests` + * `Kreait\Firebase\Http\HasSubResponses` + * `Kreait\Firebase\Http\Requests` * `Kreait\Firebase\Http\RequestWithSubRequests` + * `Kreait\Firebase\Http\Responses` * `Kreait\Firebase\Http\ResponseWithSubResponses` * `Kreait\Firebase\Http\WrappedPsr7Response` + * `Kreait\Firebase\Http\WrappedPsr7Request` * `Kreait\Firebase\Messaging\Http\Request\MessageRequest` * `Kreait\Firebase\Messaging\Http\Request\SendMessage` * `Kreait\Firebase\Messaging\Http\Request\SendMessageToTokens` diff --git a/src/Firebase/Http/HasSubRequests.php b/src/Firebase/Http/HasSubRequests.php deleted file mode 100644 index 3b5f1ff97..000000000 --- a/src/Firebase/Http/HasSubRequests.php +++ /dev/null @@ -1,13 +0,0 @@ - - */ -final class Requests implements IteratorAggregate -{ - /** - * @var RequestInterface[] - */ - private readonly array $requests; - - public function __construct(RequestInterface ...$requests) - { - $this->requests = $requests; - } - - public function findByContentId(string $contentId): ?RequestInterface - { - foreach ($this->requests as $request) { - $contentIdHeader = $request->getHeaderLine('Content-ID'); - $contentIdHeaderParts = explode('-', $contentIdHeader); - $requestContentId = array_pop($contentIdHeaderParts); - - if ($contentId === $requestContentId) { - return $request; - } - } - - return null; - } - - /** - * @return Traversable|RequestInterface[] - */ - public function getIterator(): Traversable - { - yield from $this->requests; - } -} diff --git a/src/Firebase/Http/Responses.php b/src/Firebase/Http/Responses.php deleted file mode 100644 index b99ca40ef..000000000 --- a/src/Firebase/Http/Responses.php +++ /dev/null @@ -1,35 +0,0 @@ - - */ -final class Responses implements IteratorAggregate -{ - /** - * @var ResponseInterface[] - */ - private readonly array $responses; - - public function __construct(ResponseInterface ...$responses) - { - $this->responses = $responses; - } - - /** - * @return Traversable|ResponseInterface[] - */ - public function getIterator(): Traversable - { - yield from $this->responses; - } -} diff --git a/src/Firebase/Http/WrappedPsr7Request.php b/src/Firebase/Http/WrappedPsr7Request.php deleted file mode 100644 index 35a8f71b7..000000000 --- a/src/Firebase/Http/WrappedPsr7Request.php +++ /dev/null @@ -1,133 +0,0 @@ -wrappedRequest->getProtocolVersion(); - } - - public function withProtocolVersion($version): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withProtocolVersion($version); - - return $request; - } - - public function getHeaders(): array - { - return $this->wrappedRequest->getHeaders(); - } - - public function hasHeader($name): bool - { - return $this->wrappedRequest->hasHeader($name); - } - - public function getHeader($name): array - { - return $this->wrappedRequest->getHeader($name); - } - - public function getHeaderLine($name): string - { - return $this->wrappedRequest->getHeaderLine($name); - } - - public function withHeader($name, $value): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withHeader($name, $value); - - return $request; - } - - public function withAddedHeader($name, $value): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withAddedHeader($name, $value); - - return $request; - } - - public function withoutHeader($name): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withoutHeader($name); - - return $request; - } - - public function getBody(): StreamInterface - { - return $this->wrappedRequest->getBody(); - } - - public function withBody(StreamInterface $body): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withBody($body); - - return $request; - } - - public function getRequestTarget(): string - { - return $this->wrappedRequest->getRequestTarget(); - } - - public function withRequestTarget($requestTarget): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withRequestTarget($requestTarget); - - return $request; - } - - public function getMethod(): string - { - return $this->wrappedRequest->getMethod(); - } - - public function withMethod($method): self - { - $request = clone $this; - $request->wrappedRequest = $this->wrappedRequest->withMethod($method); - - return $request; - } - - public function getUri(): UriInterface - { - return $this->wrappedRequest->getUri(); - } - - public function withUri(UriInterface $uri, $preserveHost = false): self - { - $request = clone $this; - $request->wrappedRequest->withUri($uri, $preserveHost); - - return $request; - } - - public function subRequests(): Requests - { - return $this->wrappedRequest instanceof HasSubRequests - ? $this->wrappedRequest->subRequests() - : new Requests(); - } -}