Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions lib/GaletteEvents/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private function loadFromRS(ArrayObject $r): void
/**
* Remove specified event
*
* @return boolean
* @return bool
*/
public function remove(): bool
{
Expand Down Expand Up @@ -164,7 +164,7 @@ public function remove(): bool
* @param array<string, mixed> $values All values to check, basically the $_POST array
* after sending the form
*
* @return boolean
* @return bool
*/
public function check(array $values): bool
{
Expand Down Expand Up @@ -205,7 +205,7 @@ public function check(array $values): bool
/**
* Store the activity
*
* @return boolean
* @return bool
*/
public function store(): bool
{
Expand Down Expand Up @@ -282,7 +282,7 @@ public function store(): bool
/**
* Get event id
*
* @return ?integer
* @return ?int
*/
public function getId(): ?int
{
Expand All @@ -302,8 +302,8 @@ public function getName(): string
/**
* Get date
*
* @param string $prop Property to use
* @param boolean $formatted Return date formatted, raw if false
* @param string $prop Property to use
* @param bool $formatted Return date formatted, raw if false
*
* @return string
*/
Expand All @@ -324,7 +324,7 @@ private function getDate(string $prop, bool $formatted = true): string
/**
* Get creation date
*
* @param boolean $formatted Return date formatted, raw if false
* @param bool $formatted Return date formatted, raw if false
*
* @return string
*/
Expand All @@ -336,7 +336,7 @@ public function getCreationDate(bool $formatted = true): string
/**
* Is actvity active?
*
* @return boolean
* @return bool
*/
public function isActive(): bool
{
Expand Down Expand Up @@ -366,7 +366,7 @@ public function getComment(): string
/**
* Count number of events using this Activity
*
* @return integer
* @return int
*/
public function countEvents(): int
{
Expand Down
28 changes: 14 additions & 14 deletions lib/GaletteEvents/Booking.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private function loadFromRS(ArrayObject $r): void
/**
* Remove specified event
*
* @return boolean
* @return bool
*/
public function remove(): bool
{
Expand Down Expand Up @@ -352,7 +352,7 @@ public function check(array $values): array|bool
/**
* Store the booking
*
* @return boolean
* @return bool
*/
public function store(): bool
{
Expand Down Expand Up @@ -549,7 +549,7 @@ public function store(): bool
/**
* Get event id
*
* @return ?integer
* @return ?int
*/
public function getId(): ?int
{
Expand All @@ -559,7 +559,7 @@ public function getId(): ?int
/**
* Get event id
*
* @return ?integer
* @return ?int
*/
public function getEventId(): ?int
{
Expand All @@ -582,7 +582,7 @@ public function getEvent(): ?Event
/**
* Get member id
*
* @return ?integer
* @return ?int
*/
public function getMemberId(): ?int
{
Expand All @@ -602,7 +602,7 @@ public function getMember(): Adherent
/**
* Get date
*
* @param boolean $formatted Return date formatted, raw if false
* @param bool $formatted Return date formatted, raw if false
*
* @return string
*/
Expand All @@ -619,7 +619,7 @@ public function getDate(bool $formatted = true): string
/**
* Is booking paid?
*
* @return boolean
* @return bool
*/
public function isPaid(): bool
{
Expand All @@ -639,7 +639,7 @@ public function getAmount(): ?float
/**
* Get payment method
*
* @return integer
* @return int
*/
public function getPaymentMethod(): int
{
Expand Down Expand Up @@ -680,7 +680,7 @@ public function getCheckNumber(): ?string
/**
* Get number of persons
*
* @return integer
* @return int
*/
public function getNumberPeople(): int
{
Expand All @@ -690,7 +690,7 @@ public function getNumberPeople(): int
/**
* Get creation date
*
* @param boolean $formatted Return date formatted, raw if false
* @param bool $formatted Return date formatted, raw if false
*
* @return string
*/
Expand All @@ -707,7 +707,7 @@ public function getCreationDate(bool $formatted = true): string
/**
* Set event
*
* @param integer $event Event id
* @param int $event Event id
*
* @return self
*/
Expand All @@ -720,7 +720,7 @@ public function setEvent(int $event): self
/**
* Set member
*
* @param integer $member Member id
* @param int $member Member id
*
* @return self
*/
Expand Down Expand Up @@ -755,7 +755,7 @@ public function getComment(): string
*
* @param int $activity Activity
*
* @return boolean
* @return bool
*/
public function has(int $activity): bool
{
Expand Down Expand Up @@ -797,7 +797,7 @@ public function getActivities(): array
/**
* Get row class related to current fee status
*
* @param boolean $public we want the class for public pages
* @param bool $public we want the class for public pages
*
* @return string the class to apply
*/
Expand Down
11 changes: 5 additions & 6 deletions lib/GaletteEvents/Controllers/Crud/ActivitiesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ public function doAdd(Request $request, Response $response): Response
/**
* List page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|integer|null $value Value of the option
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|int|null $value Value of the option
*
* @return Response
*/
Expand Down Expand Up @@ -230,7 +230,6 @@ public function doEdit(Request $request, Response $response, ?int $id = null, st
}

$success_detected = [];
$warning_detected = [];
$error_detected = [];

// Validation
Expand Down Expand Up @@ -352,7 +351,7 @@ public function confirmRemoveTitle(array $args): string
* @param array $args Route arguments
* @param array $post POST values
*
* @return boolean
* @return bool
*/
protected function doDelete(array $args, array $post): bool
{
Expand Down
32 changes: 16 additions & 16 deletions lib/GaletteEvents/Controllers/Crud/BookingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ class BookingsController extends AbstractPluginController
/**
* Add page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param integer|null $id_adh Member id
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param int|null $id_adh Member id
*
* @return Response
*/
Expand Down Expand Up @@ -86,10 +86,10 @@ public function doAdd(Request $request, Response $response): Response
/**
* List page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|integer|null $value Value of the option
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|int|null $value Value of the option
*
* @return Response
*/
Expand All @@ -102,11 +102,11 @@ public function list(Request $request, Response $response, ?string $option = nul
/**
* List page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|integer $event Linked event. May be an event ID, 'all' or 'guess'.
* @param string|null $option One of 'page' or 'order'
* @param string|integer|null $value Value of the option
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|int $event Linked event. May be an event ID, 'all' or 'guess'.
* @param string|null $option One of 'page' or 'order'
* @param string|int|null $value Value of the option
*
* @return Response
*/
Expand Down Expand Up @@ -192,9 +192,9 @@ public function filter(Request $request, Response $response): Response
/**
* Filtering
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|integer $event Linked event. May be an event ID, 'all' or 'guess'.
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|int $event Linked event. May be an event ID, 'all' or 'guess'.
*
* @return Response
*/
Expand Down Expand Up @@ -635,7 +635,7 @@ public function confirmRemoveTitle(array $args): string
* @param array $args Route arguments
* @param array $post POST values
*
* @return boolean
* @return bool
*/
protected function doDelete(array $args, array $post): bool
{
Expand Down
18 changes: 9 additions & 9 deletions lib/GaletteEvents/Controllers/Crud/EventsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ public function doAdd(Request $request, Response $response): Response
/**
* List page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|integer|null $value Value of the option
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|int|null $value Value of the option
*
* @return Response
*/
Expand Down Expand Up @@ -140,10 +140,10 @@ public function list(Request $request, Response $response, ?string $option = nul
/**
* Calendar view
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|integer|null $value Value of the option
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param string|null $option One of 'page' or 'order'
* @param string|int|null $value Value of the option
*
* @return Response
*/
Expand Down Expand Up @@ -512,7 +512,7 @@ public function confirmRemoveTitle(array $args): string
* @param array $args Route arguments
* @param array $post POST values
*
* @return boolean
* @return bool
*/
protected function doDelete(array $args, array $post): bool
{
Expand Down
2 changes: 1 addition & 1 deletion lib/GaletteEvents/Controllers/CsvController.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function bookingsExport(Request $request, Response $response, ?int $id =
$filepath = CsvOut::DEFAULT_DIRECTORY . $filename;
$fp = fopen($filepath, 'w');
if ($fp) {
$res = $csv->export(
$csv->export(
$list,
Csv::DEFAULT_SEPARATOR,
Csv::DEFAULT_QUOTE,
Expand Down
Loading