- Fix conflicts

This commit is contained in:
mcndave authored and Dave Mc Nicoll committed 2026-10-19 19:52:24 +00:00
1 parent ec59a36afb
commit a903153fe2
8 files changed
+39 -15

No files matched your search

+7
View File
@@ -82,6 +82,13 @@ trait ControllerTrait {
return HttpFactory::createRedirectResponse($url, $code, $headers);
}
#[Ignore]
protected function refresh(int $code = 204, array $headers = []) {
return static::renderNothing($code, [
'Refresh' => 0
] + $headers);
}
#[Ignore]
public static function renderNothing(int $code = 204, array $headers = []) : ResponseInterface
{
+2 -2
View File
@@ -11,9 +11,9 @@ use Psr\Http\Message\StreamInterface;
class HttpFactory implements HttpFactoryInterface
{
public static function createResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
public static function createResponse(mixed $body = 'php://memory', int $code = 200, array $headers = []) : ResponseInterface
{
return new Response($url, $code, $headers);
return new Response($body, $code, $headers);
}
public static function createRedirectResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
+11
View File
@@ -244,4 +244,15 @@ class Lean
return call_user_func($func);
}
public static function path(...$parts) : string
{
return implode(DIRECTORY_SEPARATOR, $parts);
}
public static function rawPath(...$parts) : string
{
return implode(DIRECTORY_SEPARATOR, $parts);
}
}
-1
View File
@@ -43,7 +43,6 @@ class FileDownloadResponse extends Response
else {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime = finfo_file($finfo, $filepath);
finfo_close($finfo);
}
parent::__construct(