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
2 changes: 1 addition & 1 deletion system/HTTP/Files/UploadedFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public function guessExtension(): string
*/
public function getClientExtension(): string
{
return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
return pathinfo($this->originalName, PATHINFO_EXTENSION);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion system/Router/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class Router implements RouterInterface
public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
{
$config = config(App::class);

if (isset($config->permittedURIChars)) {
$this->permittedURIChars = $config->permittedURIChars;
}
Expand All @@ -154,7 +155,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
$this->controller = $this->collection->getDefaultController();
$this->method = $this->collection->getDefaultMethod();

$this->collection->setHTTPVerb($request->getMethod() ?? $_SERVER['REQUEST_METHOD']);
$this->collection->setHTTPVerb($request->getMethod() === '' ? $_SERVER['REQUEST_METHOD'] : $request->getMethod());

$this->translateURIDashes = $this->collection->shouldTranslateURIDashes();

Expand Down
1 change: 0 additions & 1 deletion utils/phpstan-baseline/loader.neon
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ includes:
- missingType.property.neon
- missingType.return.neon
- notIdentical.alwaysTrue.neon
- nullCoalesce.expr.neon
- nullCoalesce.property.neon
- nullCoalesce.variable.neon
- offsetAccess.notFound.neon
Expand Down
13 changes: 0 additions & 13 deletions utils/phpstan-baseline/nullCoalesce.expr.neon

This file was deleted.

Loading