Skip to content

Commit 074222d

Browse files
trashertrasher
committed
Fix implicit nullables
1 parent 66aa6c7 commit 074222d

14 files changed

+51
-49
lines changed

‎lib/GaletteAuto/AbstractObject.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ abstract class AbstractObject
6262
* @param string $name name
6363
* @param ?integer $id id to load. Defaults to null
6464
*/
65-
public function __construct(Db $zdb, string $table, string $pk, string $field, string $name, int $id = null)
65+
public function __construct(Db $zdb, string $table, string $pk, string $field, string $name, ?int $id = null)
6666
{
6767
$this->zdb = $zdb;
6868
$this->table = AUTO_PREFIX . $table;

‎lib/GaletteAuto/Auto.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class Auto
166166
* @param Db $zdb Database instance
167167
* @param ?ArrayObject $args A resultset row to load
168168
*/
169-
public function __construct(Plugins $plugins, Db $zdb, ArrayObject $args = null)
169+
public function __construct(Plugins $plugins, Db $zdb, ?ArrayObject $args = null)
170170
{
171171
$this->plugins = $plugins;
172172
$this->zdb = $zdb;
@@ -691,9 +691,9 @@ public function check(array $post): bool
691691
'%cursize'
692692
),
693693
array(
694-
10,
694+
'10',
695695
$this->getPropName($prop),
696-
mb_strlen($value)
696+
(string)mb_strlen($value)
697697
),
698698
_T("- Maximum size for %field is %maxsize (current %cursize)!", "auto")
699699
);

‎lib/GaletteAuto/Body.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Body extends AbstractObject
4343
* @param Db $zdb Database instance
4444
* @param ?integer $id body's id to load. Defaults to null
4545
*/
46-
public function __construct(Db $zdb, int $id = null)
46+
public function __construct(Db $zdb, ?int $id = null)
4747
{
4848
parent::__construct(
4949
$zdb,

‎lib/GaletteAuto/Brand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Brand extends AbstractObject
5252
* @param Db $zdb Database instance
5353
* @param ?integer $id brand's id to load. Defaults to null
5454
*/
55-
public function __construct(Db $zdb, int $id = null)
55+
public function __construct(Db $zdb, ?int $id = null)
5656
{
5757
parent::__construct(
5858
$zdb,

‎lib/GaletteAuto/Color.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Color extends AbstractObject
4343
* @param Db $zdb Database instance
4444
* @param ?integer $id state's id to load. Defaults to null
4545
*/
46-
public function __construct(Db $zdb, int $id = null)
46+
public function __construct(Db $zdb, ?int $id = null)
4747
{
4848
parent::__construct(
4949
$zdb,

‎lib/GaletteAuto/Controllers/Controller.php

+15-13
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
use GaletteAuto\Auto;
2929
use GaletteAuto\Autos;
3030
use GaletteAuto\History;
31+
use GaletteAuto\Model;
3132
use GaletteAuto\Picture;
33+
use Laminas\Db\ResultSet\ResultSet;
3234
use Slim\Psr7\Request;
3335
use Slim\Psr7\Response;
3436
use Galette\Controllers\AbstractPluginController;
@@ -59,13 +61,13 @@ class Controller extends AbstractPluginController
5961
/**
6062
* Check ACLs for specific member
6163
*
62-
* @param Response $response Response
63-
* @param integer $id_adh Members id to check right for
64-
* @param string|false $redirect Path to redirect to (myVehiclesList per default)
64+
* @param Response $response Response
65+
* @param integer $id_adh Members id to check right for
66+
* @param string|false|null $redirect Path to redirect to (myVehiclesList per default)
6567
*
6668
* @return bool|Response
6769
*/
68-
protected function checkAclsFor(Response $response, int $id_adh, string|false $redirect = null): bool|Response
70+
protected function checkAclsFor(Response $response, int $id_adh, string|false|null $redirect = null): bool|Response
6971
{
7072
//maybe should this be a middleware... but I do not know how to pass redirect :/
7173
if (
@@ -78,7 +80,7 @@ protected function checkAclsFor(Response $response, int $id_adh, string|false $r
7880
'dues' => false
7981
);
8082
$member = new Adherent($this->zdb, $id_adh, $deps);
81-
if (!$this->login->isGroupManager($member->groups)) {
83+
if (!$this->login->isGroupManager(array_keys($member->groups))) {
8284
//no right to see requested member.
8385
if ($redirect === false) {
8486
return false;
@@ -109,7 +111,7 @@ protected function checkAclsFor(Response $response, int $id_adh, string|false $r
109111
*
110112
* @return Response
111113
*/
112-
public function vehiclePhoto(Request $request, Response $response, int $id = null): Response
114+
public function vehiclePhoto(Request $request, Response $response, ?int $id = null): Response
113115
{
114116
$picture = new Picture($this->plugins, $id);
115117

@@ -136,7 +138,7 @@ public function vehiclePhoto(Request $request, Response $response, int $id = nul
136138
*
137139
* @return Response
138140
*/
139-
public function publicVehiclesList(Request $request, Response $response, string $option = null, int $value = null): Response
141+
public function publicVehiclesList(Request $request, Response $response, ?string $option = null, ?int $value = null): Response
140142
{
141143
$this->public = true;
142144
return $this->vehiclesList($request, $response, $option, $value);
@@ -152,7 +154,7 @@ public function publicVehiclesList(Request $request, Response $response, string
152154
*
153155
* @return Response
154156
*/
155-
public function myVehiclesList(Request $request, Response $response, string $option = null, int $value = null): Response
157+
public function myVehiclesList(Request $request, Response $response, ?string $option = null, ?int $value = null): Response
156158
{
157159
$this->id_adh = $this->login->id;
158160
$this->mine = true;
@@ -170,7 +172,7 @@ public function myVehiclesList(Request $request, Response $response, string $opt
170172
*
171173
* @return Response
172174
*/
173-
public function memberVehiclesList(Request $request, Response $response, int $id, string $option = null, int $value = null): Response
175+
public function memberVehiclesList(Request $request, Response $response, int $id, ?string $option = null, ?int $value = null): Response
174176
{
175177
$this->id_adh = $id;
176178
return $this->vehiclesList($request, $response, $option, $value);
@@ -186,7 +188,7 @@ public function memberVehiclesList(Request $request, Response $response, int $id
186188
*
187189
* @return Response
188190
*/
189-
public function vehiclesList(Request $request, Response $response, string $option = null, int $value = null): Response
191+
public function vehiclesList(Request $request, Response $response, ?string $option = null, ?int $value = null): Response
190192
{
191193
$get = $request->getQueryParams();
192194
$id_adh = null;
@@ -287,7 +289,7 @@ public function showEditVehicle(Request $request, Response $response, int $id):
287289
*
288290
* @return Response
289291
*/
290-
public function showAddEditVehicle(Request $request, Response $response, string $action, int $id = null): Response
292+
public function showAddEditVehicle(Request $request, Response $response, string $action, ?int $id = null): Response
291293
{
292294
$is_new = ($action === 'add');
293295

@@ -411,7 +413,7 @@ public function doEditVehicle(Request $request, Response $response, int $id): Re
411413
*
412414
* @return Response
413415
*/
414-
public function doAddEditVehicle(Request $request, Response $response, string $action = 'edit', int $id = null): Response
416+
public function doAddEditVehicle(Request $request, Response $response, string $action = 'edit', ?int $id = null): Response
415417
{
416418
$post = $request->getParsedBody();
417419

@@ -535,7 +537,7 @@ public function ajaxModels(Request $request, Response $response): Response
535537
if (isset($post['brand']) && $post['brand'] != '') {
536538
$id_brand = (int)$post['brand'];
537539
}
538-
/** @var ArrayObject $list */
540+
/** @var array<int, Model>|ResultSet $list */
539541
$list = $models->getList($id_brand, false);
540542
//@phpstan-ignore-next-line
541543
return $this->withJson($response, $list->toArray());

‎lib/GaletteAuto/Controllers/Crud/ModelsController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function doAdd(Request $request, Response $response): Response
8787
*
8888
* @return Response
8989
*/
90-
public function list(Request $request, Response $response, string $option = null, string|int $value = null): Response
90+
public function list(Request $request, Response $response, ?string $option = null, string|int|null $value = null): Response
9191
{
9292
if (isset($this->session->filter_automodels)) {
9393
$mfilters = $this->session->filter_automodels;
@@ -183,7 +183,7 @@ public function filter(Request $request, Response $response): Response
183183
*
184184
* @return Response
185185
*/
186-
public function edit(Request $request, Response $response, int $id = null, string $action = 'edit'): Response
186+
public function edit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
187187
{
188188
$model = new Model($this->zdb);
189189

@@ -247,7 +247,7 @@ public function edit(Request $request, Response $response, int $id = null, strin
247247
*
248248
* @return Response
249249
*/
250-
public function doEdit(Request $request, Response $response, int $id = null, string $action = 'edit'): Response
250+
public function doEdit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response
251251
{
252252
$post = $request->getParsedBody();
253253
$is_new = ($action === 'add');

‎lib/GaletteAuto/Controllers/Crud/PropertiesController.php

+17-17
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class PropertiesController extends AbstractPluginController
6464
public function brandsList(
6565
Request $request,
6666
Response $response,
67-
string $option = null,
68-
string|int $value = null
67+
?string $option = null,
68+
string|int|null $value = null
6969
): Response {
7070
return $this->propertiesList($request, $response, 'brands', $option, $value);
7171
}
@@ -83,8 +83,8 @@ public function brandsList(
8383
public function colorsList(
8484
Request $request,
8585
Response $response,
86-
string $option = null,
87-
int|string $value = null
86+
?string $option = null,
87+
int|string|null $value = null
8888
): Response {
8989
return $this->propertiesList($request, $response, 'colors', $option, $value);
9090
}
@@ -102,8 +102,8 @@ public function colorsList(
102102
public function statesList(
103103
Request $request,
104104
Response $response,
105-
string $option = null,
106-
string|int $value = null
105+
?string $option = null,
106+
string|int|null $value = null
107107
): Response {
108108
return $this->propertiesList($request, $response, 'states', $option, $value);
109109
}
@@ -121,8 +121,8 @@ public function statesList(
121121
public function finitionsList(
122122
Request $request,
123123
Response $response,
124-
string $option = null,
125-
string|int $value = null
124+
?string $option = null,
125+
string|int|null $value = null
126126
): Response {
127127
return $this->propertiesList($request, $response, 'finitions', $option, $value);
128128
}
@@ -140,8 +140,8 @@ public function finitionsList(
140140
public function bodiesList(
141141
Request $request,
142142
Response $response,
143-
string $option = null,
144-
string|int $value = null
143+
?string $option = null,
144+
string|int|null $value = null
145145
): Response {
146146
return $this->propertiesList($request, $response, 'bodies', $option, $value);
147147
}
@@ -159,8 +159,8 @@ public function bodiesList(
159159
public function transmissionsList(
160160
Request $request,
161161
Response $response,
162-
string $option = null,
163-
string|int $value = null
162+
?string $option = null,
163+
string|int|null $value = null
164164
): Response {
165165
return $this->propertiesList($request, $response, 'transmissions', $option, $value);
166166
}
@@ -180,8 +180,8 @@ protected function propertiesList(
180180
Request $request,
181181
Response $response,
182182
string $property,
183-
string $option = null,
184-
string|int $value = null
183+
?string $option = null,
184+
string|int|null $value = null
185185
): Response {
186186
$get = $request->getQueryParams();
187187

@@ -324,7 +324,7 @@ public function propertyAdd(Request $request, Response $response, string $proper
324324
*
325325
* @return Response
326326
*/
327-
public function propertyEdit(Request $request, Response $response, string $property, int $id = null, string $action = 'edit'): Response
327+
public function propertyEdit(Request $request, Response $response, string $property, ?int $id = null, string $action = 'edit'): Response
328328
{
329329
$is_new = ($action === 'add');
330330

@@ -395,7 +395,7 @@ public function doPropertyEdit(
395395
Request $request,
396396
Response $response,
397397
string $property,
398-
int $id = null,
398+
?int $id = null,
399399
string $action = 'edit',
400400
): Response {
401401
$classname = AbstractObject::getClassForPropName($property);
@@ -575,7 +575,7 @@ public function removeProperty(Request $request, Response $response, string $pro
575575
*
576576
* @return Response
577577
*/
578-
public function doRemoveProperty(Request $request, Response $response, string $property, int $id = null): Response
578+
public function doRemoveProperty(Request $request, Response $response, string $property, ?int $id = null): Response
579579
{
580580
$post = $request->getParsedBody();
581581
$ajax = isset($post['ajax']) && $post['ajax'] === 'true';

‎lib/GaletteAuto/Finition.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Finition extends AbstractObject
4343
* @param Db $zdb Database instance
4444
* @param ?integer $id finition's id to load. Defaults to null
4545
*/
46-
public function __construct(Db $zdb, int $id = null)
46+
public function __construct(Db $zdb, ?int $id = null)
4747
{
4848
parent::__construct(
4949
$zdb,

‎lib/GaletteAuto/History.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ class History
6767
* @param Db $zdb Database instance
6868
* @param ?integer $id history entry's id to load. Defaults to null
6969
*/
70-
public function __construct(Db $zdb, int $id = null)
70+
public function __construct(Db $zdb, ?int $id = null)
7171
{
7272
$this->zdb = $zdb;
73-
if ($id != null && is_int($id)) {
73+
if ($id !== null) {
7474
$this->load($id);
7575
}
7676
}

‎lib/GaletteAuto/Model.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Model
5757
* @param Db $zdb Database instance
5858
* @param ArrayObject|int|null $args model's id to load or ResultSet. Defaults to null
5959
*/
60-
public function __construct(Db $zdb, ArrayObject|int $args = null)
60+
public function __construct(Db $zdb, ArrayObject|int|null $args = null)
6161
{
6262
$this->zdb = $zdb;
6363
$this->brand = new Brand($zdb);

‎lib/GaletteAuto/Repository/Models.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ public function __construct(Db $zdb, Preferences $preferences, Login $login, Mod
6565
/**
6666
* Get the list of all models
6767
*
68-
* @param integer $brandId Optional brand we want models for
69-
* @param boolean $as_object Whether to return an array of objects or a ResultSet
68+
* @param ?integer $brandId Optional brand we want models for
69+
* @param boolean $as_object Whether to return an array of objects or a ResultSet
7070
*
7171
* @return array<int, Model>|ResultSet
7272
*/
73-
public function getList(int $brandId = null, bool $as_object = true): array|ResultSet
73+
public function getList(?int $brandId = null, bool $as_object = true): array|ResultSet
7474
{
7575
$select = $this->buildSelect();
7676

‎lib/GaletteAuto/State.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class State extends AbstractObject
4343
* @param Db $zdb Database instance
4444
* @param ?integer $id state's id to load. Defaults to null
4545
*/
46-
public function __construct(Db $zdb, int $id = null)
46+
public function __construct(Db $zdb, ?int $id = null)
4747
{
4848
parent::__construct(
4949
$zdb,

‎lib/GaletteAuto/Transmission.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Transmission extends AbstractObject
4343
* @param Db $zdb Database instance
4444
* @param ?integer $id transmission's id to load. Defaults to null
4545
*/
46-
public function __construct(Db $zdb, int $id = null)
46+
public function __construct(Db $zdb, ?int $id = null)
4747
{
4848
parent::__construct(
4949
$zdb,

0 commit comments

Comments
 (0)