Skip to content

Commit 339d527

Browse files
paulbalandanpaulbalandan
committed
Use native PHPDocs instead of @phpstan- 
1 parent 94e13a4 commit 339d527

42 files changed

Lines changed: 94 additions & 148 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Config/App.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class App extends BaseConfig
2727
* 'http://accounts.example.com/':
2828
* ['media.example.com', 'accounts.example.com']
2929
*
30-
* @var string[]
31-
* @phpstan-var list<string>
30+
* @var list<string>
3231
*/
3332
public array $allowedHostnames = [];
3433

‎app/Config/Autoload.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class Autoload extends AutoloadConfig
4141
* 'App' => APPPATH
4242
* ];
4343
*
44-
* @var array<string, array<int, string>|string>
45-
* @phpstan-var array<string, string|list<string>>
44+
* @var array<string, list<string>|string>
4645
*/
4746
public $psr4 = [
4847
APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -81,8 +80,7 @@ class Autoload extends AutoloadConfig
8180
* '/path/to/my/file.php',
8281
* ];
8382
*
84-
* @var string[]
85-
* @phpstan-var list<string>
83+
* @var list<string>
8684
*/
8785
public $files = [];
8886

@@ -95,8 +93,7 @@ class Autoload extends AutoloadConfig
9593
* 'form',
9694
* ];
9795
*
98-
* @var string[]
99-
* @phpstan-var list<string>
96+
* @var list<string>
10097
*/
10198
public $helpers = [];
10299
}

‎app/Config/Cache.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ class Cache extends BaseConfig
158158
* This is an array of cache engine alias' and class names. Only engines
159159
* that are listed here are allowed to be used.
160160
*
161-
* @var array<string, string>
162-
* @phpstan-var array<string, class-string<CacheInterface>>
161+
* @var array<string, class-string<CacheInterface>>
163162
*/
164163
public array $validHandlers = [
165164
'dummy' => DummyHandler::class,

‎app/Config/Filters.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ class Filters extends BaseConfig
1515
* Configures aliases for Filter classes to
1616
* make reading things nicer and simpler.
1717
*
18-
* @var array<string, array<int, string>|string> [filter_name => classname]
19-
* or [filter_name => [classname1, classname2, ...]]
20-
* @phpstan-var array<string, class-string|list<class-string>>
18+
* @var array<string, class-string|list<class-string>> [filter_name => classname]
19+
* or [filter_name => [classname1, classname2, ...]]
2120
*/
2221
public array $aliases = [
2322
'csrf' => CSRF::class,
@@ -31,8 +30,7 @@ class Filters extends BaseConfig
3130
* List of filter aliases that are always
3231
* applied before and after every request.
3332
*
34-
* @var array<string, array<string, array<string, string>>>|array<string, array<string>>
35-
* @phpstan-var array<string, list<string>>|array<string, array<string, array<string, string>>>
33+
* @var array<string, array<string, array<string, string>>>|array<string, list<string>>
3634
*/
3735
public array $globals = [
3836
'before' => [

‎app/Config/Kint.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class Kint extends BaseConfig
2727
*/
2828

2929
/**
30-
* @var array<int, ConstructablePluginInterface|string>
31-
* @phpstan-var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
30+
* @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
3231
*/
3332
public $plugins;
3433

@@ -46,14 +45,12 @@ class Kint extends BaseConfig
4645
public int $richSort = AbstractRenderer::SORT_FULL;
4746

4847
/**
49-
* @var array<string, string>
50-
* @phpstan-var array<string, class-string<ValuePluginInterface>>
48+
* @var array<string, class-string<ValuePluginInterface>>
5149
*/
5250
public $richObjectPlugins;
5351

5452
/**
55-
* @var array<string, string>
56-
* @phpstan-var array<string, class-string<TabPluginInterface>>
53+
* @var array<string, class-string<TabPluginInterface>>
5754
*/
5855
public $richTabPlugins;
5956

‎app/Config/Session.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Session extends BaseConfig
1919
* - `CodeIgniter\Session\Handlers\MemcachedHandler`
2020
* - `CodeIgniter\Session\Handlers\RedisHandler`
2121
*
22-
* @phpstan-var class-string<BaseHandler>
22+
* @var class-string<BaseHandler>
2323
*/
2424
public string $driver = FileHandler::class;
2525

‎phpstan-baseline.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
'count' => 1,
1717
'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
1818
];
19+
$ignoreErrors[] = [
20+
'message' => '#^Property Config\\\\Autoload\\:\\:\\$helpers \\(array\\<int, string\\>\\) in isset\\(\\) is not nullable\\.$#',
21+
'count' => 1,
22+
'path' => __DIR__ . '/system/Autoloader/Autoloader.php',
23+
];
1924
$ignoreErrors[] = [
2025
'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
2126
'count' => 13,

‎system/Autoloader/Autoloader.php‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,15 @@ class Autoloader
7575
/**
7676
* Stores files as a list.
7777
*
78-
* @var string[]
79-
* @phpstan-var list<string>
78+
* @var list<string>
8079
*/
8180
protected $files = [];
8281

8382
/**
8483
* Stores helper list.
8584
* Always load the URL helper, it should be used in most apps.
8685
*
87-
* @var string[]
88-
* @phpstan-var list<string>
86+
* @var list<string>
8987
*/
9088
protected $helpers = ['url'];
9189

@@ -119,7 +117,7 @@ public function initialize(Autoload $config, Modules $modules)
119117
$this->files = $config->files;
120118
}
121119

122-
if (isset($config->helpers)) { // @phpstan-ignore-line
120+
if (isset($config->helpers)) {
123121
$this->helpers = [...$this->helpers, ...$config->helpers];
124122
}
125123

@@ -185,8 +183,7 @@ public function unregister(): void
185183
/**
186184
* Registers namespaces with the autoloader.
187185
*
188-
* @param array<string, array<int, string>|string>|string $namespace
189-
* @phpstan-param array<string, list<string>|string>|string $namespace
186+
* @param array<string, list<string>|string>|string $namespace
190187
*
191188
* @return $this
192189
*/

‎system/BaseModel.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ abstract class BaseModel
6363
* The Database connection group that
6464
* should be instantiated.
6565
*
66-
* @var string|null
67-
* @phpstan-var non-empty-string|null
66+
* @var non-empty-string|null
6867
*/
6968
protected $DBGroup;
7069

‎system/Cache/Handlers/BaseHandler.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,9 @@ public static function validateKey($key, $prefix = ''): string
7676
/**
7777
* Get an item from the cache, or execute the given Closure and store the result.
7878
*
79-
* @param string $key Cache item name
80-
* @param int $ttl Time to live
81-
* @param Closure $callback Callback return value
82-
* @phpstan-param Closure(): mixed $callback
79+
* @param string $key Cache item name
80+
* @param int $ttl Time to live
81+
* @param Closure(): mixed $callback Callback return value
8382
*
8483
* @return array|bool|float|int|object|string|null
8584
*/

0 commit comments

Comments
 (0)