Skip to content

Commit e424098

Browse files
kenjiskenjis
authored
Merge pull request #8384 from kenjis/update-cs-fixer-v3.43.0
style: update coding style by php-cs-fixer v3.43.0
2 parents 95d4a8b + f514d3b commit e424098

File tree

7 files changed

+51
-26
lines changed

7 files changed

+51
-26
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,31 @@
6767
'use',
6868
],
6969
],
70+
'fully_qualified_strict_types' => [
71+
'import_symbols' => false,
72+
'leading_backslash_in_global_namespace' => false,
73+
'phpdoc_tags' => [
74+
'param',
75+
'phpstan-param',
76+
'phpstan-property',
77+
'phpstan-property-read',
78+
'phpstan-property-write',
79+
'phpstan-return',
80+
'phpstan-var',
81+
'property',
82+
'property-read',
83+
'property-write',
84+
'psalm-param',
85+
'psalm-property',
86+
'psalm-property-read',
87+
'psalm-property-write',
88+
'psalm-return',
89+
'psalm-var',
90+
'return',
91+
'throws',
92+
'var',
93+
],
94+
],
7095
];
7196

7297
$options = [

‎admin/framework/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"require-dev": {
2121
"codeigniter/coding-standard": "^1.5",
2222
"fakerphp/faker": "^1.9",
23-
"friendsofphp/php-cs-fixer": "~3.41.0",
23+
"friendsofphp/php-cs-fixer": "^3.43",
2424
"kint-php/kint": "^5.0.4",
2525
"mikey179/vfsstream": "^1.6",
2626
"nexusphp/cs-config": "^3.6",

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"codeigniter/phpstan-codeigniter": "^1.4",
2323
"ergebnis/composer-normalize": "^2.28",
2424
"fakerphp/faker": "^1.9",
25-
"friendsofphp/php-cs-fixer": "~3.41.0",
25+
"friendsofphp/php-cs-fixer": "^3.43",
2626
"kint-php/kint": "^5.0.4",
2727
"mikey179/vfsstream": "^1.6",
2828
"nexusphp/cs-config": "^3.6",

‎system/Debug/Toolbar/Views/toolbar.tpl.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?php
22
/**
3-
* @var \CodeIgniter\Debug\Toolbar $this
4-
* @var int $totalTime
5-
* @var int $totalMemory
6-
* @var string $url
7-
* @var string $method
8-
* @var bool $isAJAX
9-
* @var int $startTime
10-
* @var int $totalTime
11-
* @var int $totalMemory
12-
* @var float $segmentDuration
13-
* @var int $segmentCount
14-
* @var string $CI_VERSION
15-
* @var array $collectors
16-
* @var array $vars
17-
* @var array $styles
18-
* @var \CodeIgniter\View\Parser $parser
3+
* @var CodeIgniter\Debug\Toolbar $this
4+
* @var int $totalTime
5+
* @var int $totalMemory
6+
* @var string $url
7+
* @var string $method
8+
* @var bool $isAJAX
9+
* @var int $startTime
10+
* @var int $totalTime
11+
* @var int $totalMemory
12+
* @var float $segmentDuration
13+
* @var int $segmentCount
14+
* @var string $CI_VERSION
15+
* @var array $collectors
16+
* @var array $vars
17+
* @var array $styles
18+
* @var CodeIgniter\View\Parser $parser
1919
*/
2020
?>
2121
<style>

‎system/Exceptions/FrameworkException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static function forMissingExtension(string $extension)
6666
'The framework needs the following extension(s) installed and loaded: %s.',
6767
$extension
6868
);
69-
// @codeCoverageIgnoreEnd
69+
// @codeCoverageIgnoreEnd
7070
} else {
7171
$message = lang('Core.missingExtension', [$extension]);
7272
}

‎tests/system/Router/AutoRouterImprovedTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function testAutoRouteFindsControllerWithSubfolder(): void
177177
= $router->getRoute('subfolder/mycontroller/somemethod', 'get');
178178

179179
$this->assertSame('Subfolder/', $directory);
180-
$this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
180+
$this->assertSame('\\' . Controllers\Subfolder\Mycontroller::class, $controller);
181181
$this->assertSame('getSomemethod', $method);
182182
$this->assertSame([], $params);
183183
$this->assertSame([
@@ -195,7 +195,7 @@ public function testAutoRouteFindsControllerWithSubSubfolder()
195195
= $router->getRoute('subfolder/sub/mycontroller/somemethod', 'get');
196196

197197
$this->assertSame('Subfolder/Sub/', $directory);
198-
$this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
198+
$this->assertSame('\\' . Controllers\Subfolder\Sub\Mycontroller::class, $controller);
199199
$this->assertSame('getSomemethod', $method);
200200
$this->assertSame([], $params);
201201
}
@@ -209,7 +209,7 @@ public function testAutoRouteFindsDashedSubfolder(): void
209209

210210
$this->assertSame('Dash_folder/', $directory);
211211
$this->assertSame(
212-
'\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
212+
'\\' . Controllers\Dash_folder\Mycontroller::class,
213213
$controller
214214
);
215215
$this->assertSame('getSomemethod', $method);
@@ -281,7 +281,7 @@ public function testAutoRouteFallbackToDefaultControllerOneParam()
281281
= $router->getRoute('subfolder/15', 'get');
282282

283283
$this->assertSame('Subfolder/', $directory);
284-
$this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
284+
$this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
285285
$this->assertSame('getIndex', $method);
286286
$this->assertSame(['15'], $params);
287287
$this->assertSame([
@@ -299,7 +299,7 @@ public function testAutoRouteFallbackToDefaultControllerTwoParams()
299299
= $router->getRoute('subfolder/15/20', 'get');
300300

301301
$this->assertSame('Subfolder/', $directory);
302-
$this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
302+
$this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
303303
$this->assertSame('getIndex', $method);
304304
$this->assertSame(['15', '20'], $params);
305305
$this->assertSame([
@@ -317,7 +317,7 @@ public function testAutoRouteFallbackToDefaultControllerNoParams()
317317
= $router->getRoute('subfolder', 'get');
318318

319319
$this->assertSame('Subfolder/', $directory);
320-
$this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
320+
$this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
321321
$this->assertSame('getIndex', $method);
322322
$this->assertSame([], $params);
323323
$this->assertSame([

‎user_guide_src/source/models/entities/018.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MyEntity extends Entity
1313

1414
// Bind the type to the handler
1515
protected $castHandlers = [
16-
'base64' => \App\Entities\Cast\CastBase64::class,
16+
'base64' => Cast\CastBase64::class,
1717
];
1818
}
1919

0 commit comments

Comments
 (0)