Skip to content

Commit

Permalink
Merge pull request #6674 from codeigniter4/dependabot/composer/friend…
Browse files Browse the repository at this point in the history
…sofphp/php-cs-fixer-approx-3.12.0

chore: update friendsofphp/php-cs-fixer requirement from ~3.11.0 to ~3.12.0
  • Loading branch information
kenjis authored Oct 14, 2022
2 parents 2e02e4d + f0a6761 commit a3eedf4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 16 deletions.
2 changes: 1 addition & 1 deletion admin/framework/composer.json
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
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
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
*/
public function handle($level, $message): bool
{
Expand Down
11 changes: 2 additions & 9 deletions tests/system/Config/MimesTest.php
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
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

0 comments on commit a3eedf4

Please sign in to comment.