Skip to content

Commit

Permalink
Merge branch 'master' of github.com:FriendsOfSymfony/FOSJsRoutingBundle
Browse files Browse the repository at this point in the history
� Conflicts:
�	Extractor/ExposedRoutesExtractor.php
�	Extractor/ExposedRoutesExtractorInterface.php
  • Loading branch information
Tobias Feijten committed Dec 15, 2021
2 parents 3d4f112 + e6cbaf9 commit 2ea2e00
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Extractor/ExposedRoutesExtractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function getHost(): string
/**
* {@inheritDoc}
*/
public function getPort(): ?string
public function getPort(): string
{
$requestContext = $this->router->getContext();

Expand Down
2 changes: 1 addition & 1 deletion Extractor/ExposedRoutesExtractorInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getHost(): string;
/**
* Get the port from RequestContext, only if non standard port (Eg: "8080")
*/
public function getPort(): ?string;
public function getPort(): string;

/**
* Get the scheme from RequestContext
Expand Down

0 comments on commit 2ea2e00

Please # to comment.