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 php-cs-fixer to v3.47.1 #8422

Merged
merged 4 commits into from
Jan 17, 2024
Merged

chore: update php-cs-fixer to v3.47.1 #8422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fce7c6
chore: update php-cs-fixer vertion to ^3.47.1
kenjis Jan 16, 2024
1d8eb00
style: fix stdclass -> stdClass
kenjis Jan 16, 2024
8b2a991
test: composer cs-fix
kenjis Jan 16, 2024
4fc5e1c
chore: remove ignoreErrors
kenjis Jan 16, 2024
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 @@ -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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading