Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
- Requires `innmind/time:~1.0`
- `Innmind\Http\TimeContinuum\Format\Http` has been moved to `Innmind\Http\Time\Format\Http`

### Removed

- `Innmind\Http\ServerRequest::environment()`
- `Innmind\Http\ServerRequest\Environment`
- `Innmind\Http\Factory\EnvironmentFactory`

## 8.0.0 - 2025-04-20

### Added
Expand Down
39 changes: 0 additions & 39 deletions src/Factory/Environment/Native.php

This file was deleted.

46 changes: 0 additions & 46 deletions src/Factory/EnvironmentFactory.php

This file was deleted.

5 changes: 0 additions & 5 deletions src/Factory/ServerRequestFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ final class ServerRequestFactory
private function __construct(
private HeadersFactory $headersFactory,
private \Closure $bodyFactory,
private EnvironmentFactory $environmentFactory,
private CookiesFactory $cookiesFactory,
private QueryFactory $queryFactory,
private FormFactory $formFactory,
Expand Down Expand Up @@ -84,7 +83,6 @@ public function __invoke(): ServerRequest
),
($this->headersFactory)(),
($this->bodyFactory)(),
($this->environmentFactory)(),
($this->cookiesFactory)(),
($this->queryFactory)(),
($this->formFactory)(),
Expand Down Expand Up @@ -112,7 +110,6 @@ public static function native(
->streams()
->acquire(\fopen('php://input', 'r')),
),
EnvironmentFactory::native(),
CookiesFactory::native(),
QueryFactory::native(),
FormFactory::native(),
Expand All @@ -131,7 +128,6 @@ public static function native(
public static function of(
HeadersFactory $headersFactory,
\Closure $bodyFactory,
EnvironmentFactory $environmentFactory,
CookiesFactory $cookiesFactory,
QueryFactory $queryFactory,
FormFactory $formFactory,
Expand All @@ -141,7 +137,6 @@ public static function of(
return new self(
$headersFactory,
$bodyFactory,
$environmentFactory,
$cookiesFactory,
$queryFactory,
$formFactory,
Expand Down
10 changes: 0 additions & 10 deletions src/ServerRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
namespace Innmind\Http;

use Innmind\Http\{
ServerRequest\Environment,
ServerRequest\Cookies,
ServerRequest\Query,
ServerRequest\Form,
Expand All @@ -24,7 +23,6 @@ private function __construct(
private ProtocolVersion $protocolVersion,
private Headers $headers,
private Content $body,
private Environment $environment,
private Cookies $cookies,
private Query $query,
private Form $form,
Expand All @@ -42,7 +40,6 @@ public static function of(
ProtocolVersion $protocolVersion,
?Headers $headers = null,
?Content $body = null,
?Environment $environment = null,
?Cookies $cookies = null,
?Query $query = null,
?Form $form = null,
Expand All @@ -54,7 +51,6 @@ public static function of(
$protocolVersion,
$headers ?? Headers::of(),
$body ?? Content::none(),
$environment ?? Environment::of(),
$cookies ?? Cookies::of(),
$query ?? Query::of([]),
$form ?? Form::of([]),
Expand Down Expand Up @@ -92,12 +88,6 @@ public function method(): Method
return $this->method;
}

#[\NoDiscard]
public function environment(): Environment
{
return $this->environment;
}

#[\NoDiscard]
public function cookies(): Cookies
{
Expand Down
79 changes: 0 additions & 79 deletions src/ServerRequest/Environment.php

This file was deleted.

22 changes: 0 additions & 22 deletions tests/Factory/Environment/EnvironmentFactoryTest.php

This file was deleted.

5 changes: 0 additions & 5 deletions tests/Factory/ServerRequest/ServerRequestFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Innmind\Http\{
Factory\ServerRequestFactory,
Factory\HeadersFactory,
Factory\EnvironmentFactory,
Factory\CookiesFactory,
Factory\QueryFactory,
Factory\FormFactory,
Expand All @@ -15,7 +14,6 @@
ServerRequest\Query,
ServerRequest\Form,
ServerRequest\Files,
ServerRequest\Environment,
ServerRequest\Cookies,
Headers,
};
Expand All @@ -34,7 +32,6 @@ public function testMake()
$f = ServerRequestFactory::of(
HeadersFactory::of(static fn() => Headers::of()),
static fn() => Content::none(),
EnvironmentFactory::of(static fn() => Environment::of()),
CookiesFactory::of(static fn() => Cookies::of()),
QueryFactory::of(static fn() => Query::of([])),
FormFactory::of(static fn() => Form::of([])),
Expand All @@ -58,7 +55,6 @@ public function testMakeWithUser()
$factory = ServerRequestFactory::of(
HeadersFactory::of(static fn() => Headers::of()),
static fn() => Content::none(),
EnvironmentFactory::of(static fn() => Environment::of()),
CookiesFactory::of(static fn() => Cookies::of()),
QueryFactory::of(static fn() => Query::of([])),
FormFactory::of(static fn() => Form::of([])),
Expand All @@ -83,7 +79,6 @@ public function testMakeWithUserAndPassword()
$factory = ServerRequestFactory::of(
HeadersFactory::of(static fn() => Headers::of()),
static fn() => Content::none(),
EnvironmentFactory::of(static fn() => Environment::of()),
CookiesFactory::of(static fn() => Cookies::of()),
QueryFactory::of(static fn() => Query::of([])),
FormFactory::of(static fn() => Form::of([])),
Expand Down
Loading
Loading