Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update friendsofphp/php-cs-fixer requirement from ~3.11.0 to ~3.12.0 #6674

Merged
merged 3 commits into from
Oct 14, 2022
+6 −16
Merged

chore: update friendsofphp/php-cs-fixer requirement from ~3.11.0 to ~3.12.0 #6674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f42177
Updates the requirements on friendsofphp/php-cs-fixer to permit the l…
paulbalandan Oct 13, 2022
616a4cc
Apply linting fixes
paulbalandan Oct 13, 2022
f0a6761
Fix parameter types
paulbalandan Oct 13, 2022
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 admin/framework/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"require-dev": {
"codeigniter/coding-standard": "^1.5",
"fakerphp/faker": "^1.9",
"friendsofphp/php-cs-fixer": "~3.11.0",
"friendsofphp/php-cs-fixer": "~3.12.0",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
"phpunit/phpunit": "^9.1",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"require-dev": {
"codeigniter/coding-standard": "^1.5",
"fakerphp/faker": "^1.9",
"friendsofphp/php-cs-fixer": "~3.11.0",
"friendsofphp/php-cs-fixer": "~3.12.0",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
"nexusphp/tachycardia": "^1.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/_support/Log/Handlers/TestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public function __construct(array $config)
* will stop. Any handlers that have not run, yet, will not
* be run.
*
* @param $level
* @param $message
* @param string $level
* @param string $message
kenjis marked this conversation as resolved.
Show resolved Hide resolved
*/
public function handle($level, $message): bool
{
Expand Down
11 changes: 2 additions & 9 deletions tests/system/Config/MimesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ public function extensionsList()

/**
* @dataProvider extensionsList
*
* @param $expected
* @param $ext
* @param mixed $mime
*/
public function testGuessExtensionFromType($expected, $mime)
public function testGuessExtensionFromType(?string $expected, string $mime)
{
$this->assertSame($expected, Mimes::guessExtensionFromType($mime));
}
Expand Down Expand Up @@ -85,11 +81,8 @@ public function mimesList()

/**
* @dataProvider mimesList
*
* @param mixed $expected
* @param mixed $ext
*/
public function testGuessTypeFromExtension($expected, $ext)
public function testGuessTypeFromExtension(?string $expected, string $ext)
{
$this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
}
Expand Down
3 changes: 0 additions & 3 deletions tests/system/Validation/FormatRulesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,6 @@ public function stringProvider(): Generator

/**
* @dataProvider alphaProvider
*
* @param $str
* @param $expected
*/
public function testAlpha(?string $str, bool $expected): void
{
Expand Down