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
13 changes: 8 additions & 5 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
jobs:
code-style:
name: Code Style & Static Analysis
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.1
php-version: 8.4
extensions: mbstring, pcntl

- name: Validate composer.json and composer.lock
Expand All @@ -32,7 +32,7 @@ jobs:

tests:
name: Test Suite
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
max-parallel: 10
matrix:
Expand All @@ -43,10 +43,13 @@ jobs:
- 7.4
- 8.0
- 8.1
- 8.2
- 8.3
- 8.4

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion src/Pairs.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(
string $queryString,
bool $decodeKeys = false,
bool $decodeValues = false,
string $separator = null
?string $separator = null
) {

$this->queryString = $queryString;
Expand Down
4 changes: 2 additions & 2 deletions src/QueryString.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static function createFromString(string $string, QueryStringParserInterf
* @return QueryString
* @throws \RuntimeException
*/
public static function createFromCurrentLocation(QueryStringParserInterface $queryStringParser = null): self
public static function createFromCurrentLocation(?QueryStringParserInterface $queryStringParser = null): self
{
if (!isset($_SERVER['REQUEST_URI'])) {
throw new \RuntimeException('$_SERVER[\'REQUEST_URI\'] has not been set.');
Expand All @@ -102,7 +102,7 @@ public function withCurrentLocation(): self
* @throws \InvalidArgumentException
* @throws \TypeError
*/
public static function factory($input = null, QueryStringParserInterface $queryStringParser = null): self
public static function factory($input = null, ?QueryStringParserInterface $queryStringParser = null): self
{
if (is_array($input)) {
return self::createFromParams($input);
Expand Down
4 changes: 2 additions & 2 deletions src/Renderer/ArrayValuesNormalizerRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ final class ArrayValuesNormalizerRenderer implements QueryStringRendererInterfac
/**
* ArrayValuesStringifier constructor.
*/
protected function __construct(QueryStringRendererInterface $renderer = null)
protected function __construct(?QueryStringRendererInterface $renderer = null)
{
$this->renderer = $renderer;
}

public static function factory(QueryStringRendererInterface $renderer = null)
public static function factory(?QueryStringRendererInterface $renderer = null)
{
return new self($renderer ?? NativeRenderer::factory());
}
Expand Down
4 changes: 2 additions & 2 deletions src/Renderer/FlatRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ final class FlatRenderer implements QueryStringRendererInterface
*/
private $renderer;

protected function __construct(QueryStringRendererInterface $renderer = null)
protected function __construct(?QueryStringRendererInterface $renderer = null)
{
$this->renderer = $renderer;
}

public static function factory(QueryStringRendererInterface $renderer = null)
public static function factory(?QueryStringRendererInterface $renderer = null)
{
return new self($renderer ?? NativeRenderer::factory());
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @return QueryString
* @throws \InvalidArgumentException
*/
function query_string($input = null, QueryStringParserInterface $queryStringParser = null): QueryString
function query_string($input = null, ?QueryStringParserInterface $queryStringParser = null): QueryString
{
return QueryString::factory($input, $queryStringParser);
}
Expand All @@ -21,7 +21,7 @@ function query_string($input = null, QueryStringParserInterface $queryStringPars
* @param QueryStringRendererInterface|null $renderer
* @return ArrayValuesNormalizerRenderer
*/
function withoutNumericIndices(QueryStringRendererInterface $renderer = null): ArrayValuesNormalizerRenderer
function withoutNumericIndices(?QueryStringRendererInterface $renderer = null): ArrayValuesNormalizerRenderer
{
return ArrayValuesNormalizerRenderer::factory($renderer);
}
Expand All @@ -30,7 +30,7 @@ function withoutNumericIndices(QueryStringRendererInterface $renderer = null): A
* @param QueryStringRendererInterface|null $renderer
* @return FlatRenderer
*/
function flat(QueryStringRendererInterface $renderer = null): FlatRenderer
function flat(?QueryStringRendererInterface $renderer = null): FlatRenderer
{
return FlatRenderer::factory($renderer);
}
Expand All @@ -42,7 +42,7 @@ function flat(QueryStringRendererInterface $renderer = null): FlatRenderer
* @param string|null $separator
* @return Pairs
*/
function pairs(string $queryString, bool $decodeKeys = false, bool $decodeValues = false, string $separator = null): Pairs
function pairs(string $queryString, bool $decodeKeys = false, bool $decodeValues = false, ?string $separator = null): Pairs
{
return new Pairs($queryString, $decodeKeys, $decodeValues, $separator);
}
Loading