Skip to content

Commit

Permalink
Merge pull request #8422 from kenjis/update-cs-fixer-3.47.1
Browse files Browse the repository at this point in the history
chore: update php-cs-fixer to v3.47.1
  • Loading branch information
kenjis authored Jan 17, 2024
2 parents fa6fc02 + 4fc5e1c commit 9582c8f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion admin/framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require-dev": {
"codeigniter/coding-standard": "^1.7",
"fakerphp/faker": "^1.9",
"friendsofphp/php-cs-fixer": "~3.46.0",
"friendsofphp/php-cs-fixer": "^3.47.1",
"kint-php/kint": "^5.0.4",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"codeigniter/phpstan-codeigniter": "^1.4",
"ergebnis/composer-normalize": "^2.28",
"fakerphp/faker": "^1.9",
"friendsofphp/php-cs-fixer": "~3.46.0",
"friendsofphp/php-cs-fixer": "^3.47.1",
"kint-php/kint": "^5.0.4",
"mikey179/vfsstream": "^1.6",
"nexusphp/cs-config": "^3.6",
Expand Down
5 changes: 0 additions & 5 deletions phpstan-baseline.php
Original file line number Diff line number Diff line change
Expand Up @@ -1666,11 +1666,6 @@
'count' => 1,
'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php',
];
$ignoreErrors[] = [
'message' => '#^Class stdClass referenced with incorrect case\\: stdclass\\.$#',
'count' => 2,
'path' => __DIR__ . '/system/Database/SQLite3/Table.php',
];
$ignoreErrors[] = [
'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
'count' => 2,
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLite3/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace CodeIgniter\Database\SQLite3;

use CodeIgniter\Database\Exceptions\DataException;
use stdclass;
use stdClass;

/**
* Class Table
Expand Down
6 changes: 3 additions & 3 deletions tests/system/Database/Live/SQLite/GetIndexDataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ public function testGetIndexData(): void

$expectedIndexes = [];

$row = new stdclass();
$row = new stdClass();
$row->name = 'PRIMARY';
$row->fields = ['id'];
$row->type = 'PRIMARY';
$expectedIndexes['PRIMARY'] = $row;

$row = new stdclass();
$row = new stdClass();
$row->name = 'testuser_email';
$row->fields = ['email'];
$row->type = 'UNIQUE';
$expectedIndexes['testuser_email'] = $row;

$row = new stdclass();
$row = new stdClass();
$row->name = 'testuser_country';
$row->fields = ['country'];
$row->type = 'INDEX';
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Debug/ExceptionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class ExceptionsTest extends CIUnitTestCase
{
use ReflectionHelper;

private \CodeIgniter\Debug\Exceptions $exception;
private Exceptions $exception;

public static function setUpBeforeClass(): void
{
Expand Down
2 changes: 1 addition & 1 deletion tests/system/View/ViewTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class ViewTest extends CIUnitTestCase
{
private FileLocator $loader;
private string $viewsDir;
private \Config\View $config;
private Config\View $config;

protected function setUp(): void
{
Expand Down

0 comments on commit 9582c8f

Please sign in to comment.