[pull] develop from LibreBooking:develop

Domain/Access/ScheduleRepository.php

@@ -282,7 +282,6 @@ public function GetLayout($scheduleId, ILayoutFactory $layoutFactory)
     {
         $reader = ServiceLocator::GetDatabase()->Query(new GetLayoutCommand($scheduleId));
 
-        /** @var ScheduleLayout $layout */
         $layout = null;
 
         while ($row = $reader->GetRow()) {
@@ -309,6 +308,10 @@ public function GetLayout($scheduleId, ILayoutFactory $layoutFactory)
         }
         $reader->Free();
 
+        if ($layout == null) {
+            $layout = $layoutFactory->CreateLayout();
+        }
+
         $reader = ServiceLocator::GetDatabase()->Query(new GetPeakTimesCommand($scheduleId));
         if ($row = $reader->GetRow()) {
             $layout->ChangePeakTimes(PeakTimes::FromRow($row));

Domain/PaymentGateway.php

@@ -588,10 +588,12 @@ public function Charge(CreditCartSession $cart, $email, $token, IPaymentTransact
                 Log::Debug('Stripe charge response %s', json_encode($charge));
             }
 
+            $chargeData = $charge->toArray();
+
             $logger->LogPayment(
                 $cart->UserId,
                 $charge->status,
-                $charge->invoice,
+                $chargeData['invoice'] ?? null,
                 $charge->id,
                 $currency->FromStripe($charge->amount),
                 $currency->FromStripe($charge->balance_transaction->fee),

Domain/RepeatOptions.php

@@ -301,6 +301,10 @@ public function ConfigurationString()
 
     public function HasSameConfigurationAs(IRepeatOptions $repeatOptions)
     {
+        if (!$repeatOptions instanceof self) {
+            return false;
+        }
+
         return parent::HasSameConfigurationAs($repeatOptions) && $this->_daysOfWeek == $repeatOptions->_daysOfWeek;
     }
 }

Domain/ReservationItemView.php

@@ -120,6 +120,8 @@ public function GetLabel();
      * @return int
      */
     public function GetScheduleId();
+
+    public function IsUserParticipating(int $userId): bool;
 }
 
 class ReservationItemView implements IReservedItemView
@@ -785,7 +787,7 @@ public function IsUserOwner($userId)
      * @param $userId int
      * @return bool
      */
-    public function IsUserParticipating($userId)
+    public function IsUserParticipating(int $userId): bool
     {
         return in_array($userId, $this->ParticipantIds);
     }

Domain/ScheduleLayout.php

@@ -979,9 +979,9 @@ class LayoutPeriod
     public $End;
 
     /**
-     * @var PeriodTypes
+     * @var int
      */
-    public $PeriodType;
+    public int $PeriodType;
 
     /**
      * @var string

Pages/SchedulePage.php

@@ -120,6 +120,8 @@ public function GetOwnerText();
      */
     public function GetParticipantId();
 
+    public function GetGroupId(): int|null;
+
     /**
      * @return string
      */
@@ -666,6 +668,16 @@ public function GetParticipantId()
         return intval($id);
     }
 
+    public function GetGroupId(): int|null
+    {
+        $id = $this->GetQuerystring(QueryStringKeys::GROUP_ID);
+        if (empty($id)) {
+            return null;
+        }
+
+        return intval($id);
+    }
+
     public function GetOwnerText()
     {
         return $this->GetQuerystring(FormKeys::OWNER_TEXT);

Presenters/Admin/Import/ICalImportPresenter.php

@@ -93,7 +93,7 @@ public function Import()
             die('Invalid import file: ' . $e->getMessage());
         }
 
-        $events = $vcalendar->VEVENT;
+        $events = $vcalendar->select('VEVENT');
         Log::Debug('Found %s events in ics file', count($events));
 
         foreach ($events as $event) {

Presenters/ParticipationPresenter.php

@@ -80,13 +80,15 @@ private function HandleInvitationAction($invitationAction)
 
         $series = $this->reservationRepository->LoadByReferenceNumber($referenceNumber);
 
+        /** @var IReservationValidationRule[] $rules */
+        $rules = [];
+
         if ($invitationAction == InvitationAction::Join || $invitationAction == InvitationAction::CancelInstance) {
             $rules = [new ReservationStartTimeRule(new ScheduleRepository()), new ResourceMinimumNoticeCurrentInstanceRuleUpdate($user), new ResourceMaximumNoticeCurrentInstanceRule($user)];
         } else {
             $rules = [new ReservationStartTimeRule(new ScheduleRepository()), new ResourceMinimumNoticeRuleAdd($user), new ResourceMaximumNoticeRule($user)];
         }
 
-        /** @var IReservationValidationRule $rule */
         foreach ($rules as $rule) {
             $ruleResult = $rule->Validate($series, null);
 

Presenters/ResourceDisplayPresenter.php

@@ -197,7 +197,7 @@ public function DisplayResource($resourcePublicId, $startDate)
 
         $reservationList = $reservations->OnDateForResource($reservationDate, $resource->GetId());
 
-        /** @var ReservationListItem $next */
+        /** @var ReservationListItem|null $next */
         $next = null;
 
         /** @var ReservationListItem[] $upcoming */

Presenters/ViewSchedulesPresenter.php

@@ -4,10 +4,7 @@
 
 class ViewSchedulesPresenter
 {
-    /**
-     * @var ResourceViewerViewResourcesPage
-     */
-    private $page;
+    private ScheduleViewerViewSchedulesPage $page;
 
     /**
      * @var IResourceRepository

WebServices/SchedulesWebService.php

@@ -317,7 +317,7 @@ public function SetScheduleStyle($direction)
         // no op
     }
 
-    public function GetGroupId()
+    public function GetGroupId(): int|null
     {
         return null;
     }

WebServices/Validators/AccountRequestValidator.php

@@ -76,11 +76,12 @@ public function ValidateUpdate($request, WebServiceUserSession $session)
 
     public function ValidatePasswordUpdate($request, WebServiceUserSession $session)
     {
+        /** @var IValidator[] $validators */
+        $validators = [];
         $validators[] = new PasswordComplexityValidator($request->newPassword);
         $validators[] = new PasswordValidator($request->currentPassword, $this->userRepository->LoadById($session->UserId));
 
         $errors = [];
-        /** @var IValidator $validator */
         foreach ($validators as $validator) {
             $validator->Validate();
             if (!$validator->IsValid()) {

WebServices/Validators/ResourceRequestValidator.php

@@ -56,6 +56,8 @@ private function ValidateCommon($request)
         }
         $errors = [];
 
+        /** @var IValidator[] $validators */
+        $validators = [];
         $validators[] = new RequestRequiredValueValidator($request->name, 'name');
         $validators[] = new RequestRequiredValueValidator($request->scheduleId, 'scheduleId');
         $validators[] = new TimeIntervalValidator($request->minLength, 'minLength');
@@ -70,7 +72,6 @@ private function ValidateCommon($request)
         $validators[] = new AttributeValidator($this->attributeService, CustomAttributeCategory::RESOURCE, $attributes);
 
 
-        /** @var IValidator $validator */
         foreach ($validators as $validator) {
             $validator->Validate();
             if (!$validator->IsValid()) {

composer.json

@@ -8,12 +8,13 @@
         "squizlabs/php_codesniffer": "^3.7.1",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "phpunit/phpunit": "^11.3",
-        "phpstan/phpstan": "^2.1"
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "require": {
         "php": ">=8.2",
         "smarty/smarty": "^5.5",
-        "stripe/stripe-php": "^10.2",
+        "stripe/stripe-php": "^19.3",
         "monolog/monolog": "^3.10",
         "google/recaptcha": "1.3.*",
         "gregwar/captcha": "^1.3",

lib/Application/Reservation/ReservationComponentBinder.php

@@ -178,7 +178,7 @@ public function Bind(IReservationComponentInitializer $initializer)
         $resources = $groups->GetAllResources();
         if (empty($requestedResourceId) && count($resources) > 0) {
             $first = reset($resources);
-            $requestedResourceId = $first->Id;
+            $requestedResourceId = $first->GetId();
         }
 
         $bindableResourceData = $this->GetBindableResourceData($resources, $requestedResourceId);

lib/Application/Reservation/ResourceTypeFilter.php

@@ -25,6 +25,10 @@ public function __construct($resourcetypename)
      */
     public function ShouldInclude($assignment)
     {
+        if (!$assignment instanceof IBookableResource) {
+            return false;
+        }
+
         return in_array($assignment->GetResourceTypeId(), $this->resourcetypeids);
     }
 }