From 3815570f74d3429e027b252637b3a3c98de6bfb7 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 28 Dec 2024 09:51:03 +0100 Subject: [PATCH] Fix implicit nullables --- .../Controllers/Crud/ActivitiesController.php | 6 +++--- .../Controllers/Crud/SubscriptionsController.php | 8 ++++---- lib/GaletteActivities/Entity/Activity.php | 2 +- lib/GaletteActivities/Filters/SubscriptionsList.php | 10 +++++----- lib/GaletteActivities/Repository/Activities.php | 4 ++-- lib/GaletteActivities/Repository/Subscriptions.php | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php b/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php index eb2c10b..b81e945 100644 --- a/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php +++ b/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php @@ -87,7 +87,7 @@ public function doAdd(Request $request, Response $response): Response * * @return Response */ - public function list(Request $request, Response $response, string $option = null, string|int $value = null): Response + public function list(Request $request, Response $response, ?string $option = null, string|int|null $value = null): Response { $filter_name = $this->getFilterName($this->getDefaultFilterName()); if (isset($this->session->$filter_name)) { @@ -182,7 +182,7 @@ public function filter(Request $request, Response $response): Response * * @return Response */ - public function edit(Request $request, Response $response, int $id = null, string $action = 'edit'): Response + public function edit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response { if ($this->session->activity !== null) { $activity = $this->session->activity; @@ -233,7 +233,7 @@ public function edit(Request $request, Response $response, int $id = null, strin * * @return Response */ - public function doEdit(Request $request, Response $response, int $id = null, string $action = 'edit'): Response + public function doEdit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response { $post = $request->getParsedBody(); $activity = new Activity($this->zdb); diff --git a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php index e00181f..c41e1f8 100644 --- a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php +++ b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php @@ -61,7 +61,7 @@ class SubscriptionsController extends AbstractPluginController * * @return Response */ - public function add(Request $request, Response $response, int $id_adh = null): Response + public function add(Request $request, Response $response, ?int $id_adh = null): Response { return $this->edit($request, $response, null, 'add', $id_adh); } @@ -92,7 +92,7 @@ public function doAdd(Request $request, Response $response): Response * * @return Response */ - public function list(Request $request, Response $response, string $option = null, string|int $value = null): Response + public function list(Request $request, Response $response, ?string $option = null, string|int|null $value = null): Response { $filters = $this->session->{$this->getFilterName($this->getDefaultFilterName())} ?? new SubscriptionsList(); @@ -250,7 +250,7 @@ public function filter(Request $request, Response $response): Response * * @return Response */ - public function edit(Request $request, Response $response, int $id = null, string $action = 'edit', int $id_adh = null): Response + public function edit(Request $request, Response $response, ?int $id = null, string $action = 'edit', ?int $id_adh = null): Response { $route_params = []; @@ -332,7 +332,7 @@ public function edit(Request $request, Response $response, int $id = null, strin * * @return Response */ - public function doEdit(Request $request, Response $response, int $id = null, string $action = 'edit'): Response + public function doEdit(Request $request, Response $response, ?int $id = null, string $action = 'edit'): Response { $post = $request->getParsedBody(); $subscription = new Subscription($this->zdb); diff --git a/lib/GaletteActivities/Entity/Activity.php b/lib/GaletteActivities/Entity/Activity.php index 8b58f2b..652d5c6 100644 --- a/lib/GaletteActivities/Entity/Activity.php +++ b/lib/GaletteActivities/Entity/Activity.php @@ -64,7 +64,7 @@ class Activity * a specific activity, or null to just * instanciate object */ - public function __construct(Db $zdb, int|ArrayObject $args = null) + public function __construct(Db $zdb, int|ArrayObject|null $args = null) { $this->zdb = $zdb; $this->setFields(); diff --git a/lib/GaletteActivities/Filters/SubscriptionsList.php b/lib/GaletteActivities/Filters/SubscriptionsList.php index 4de350c..08be4b8 100644 --- a/lib/GaletteActivities/Filters/SubscriptionsList.php +++ b/lib/GaletteActivities/Filters/SubscriptionsList.php @@ -53,14 +53,14 @@ class SubscriptionsList extends Pagination public const DATE_SUBSCRIPTION = 1; public const DATE_CREATION = 2; //filters - private string|int|null $activity_filter; - private string|int|null $member_filter; + private string|int|null $activity_filter; //@phpstan-ignore-line + private string|int|null $member_filter; //@phpstan-ignore-line - private int|string $paid_filter; + private int|string $paid_filter; //@phpstan-ignore-line private int $payment_type_filter; private ?int $date_field = null; - private ?string $start_date_filter; - private ?string $end_date_filter; + private ?string $start_date_filter; //@phpstan-ignore-line + private ?string $end_date_filter; //@phpstan-ignore-line /** @var array */ private array $selected; diff --git a/lib/GaletteActivities/Repository/Activities.php b/lib/GaletteActivities/Repository/Activities.php index 19fc532..ca5de2c 100644 --- a/lib/GaletteActivities/Repository/Activities.php +++ b/lib/GaletteActivities/Repository/Activities.php @@ -54,7 +54,7 @@ class Activities extends Repository * @param Preferences $preferences Preferences instance * @param ?ActivitiesList $filters Filtering */ - public function __construct(Db $zdb, Login $login, Preferences $preferences, ActivitiesList $filters = null) + public function __construct(Db $zdb, Login $login, Preferences $preferences, ?ActivitiesList $filters = null) { $this->zdb = $zdb; $this->login = $login; @@ -108,7 +108,7 @@ public function getList(): array|ResultSet * * @return array SQL ORDER clauses */ - private function buildOrderClause(array $fields = null): array + private function buildOrderClause(?array $fields = null): array { $order = array(); diff --git a/lib/GaletteActivities/Repository/Subscriptions.php b/lib/GaletteActivities/Repository/Subscriptions.php index 5a4bea3..5be1e91 100644 --- a/lib/GaletteActivities/Repository/Subscriptions.php +++ b/lib/GaletteActivities/Repository/Subscriptions.php @@ -61,7 +61,7 @@ class Subscriptions * @param Db $zdb Database instance * @param ?SubscriptionsList $filters Filtering */ - public function __construct(Db $zdb, SubscriptionsList $filters = null) + public function __construct(Db $zdb, ?SubscriptionsList $filters = null) { $this->zdb = $zdb; @@ -319,7 +319,7 @@ private function canOrderBy(string $field_name, ?array $fields): bool * * @return array SQL ORDER clauses */ - private function buildOrderClause(array $fields = null): array + private function buildOrderClause(?array $fields = null): array { $order = array();