test(phpstan): enable PHPStan level 3 for Pages/Ajax/

JohnVillalovos · JohnVillalovos · commit c1616b9eaf18 · 2026-02-17T16:21:54.000-08:00
Resolve PHPStan level 3 issues found when enabling checking of the
`Pages/Ajax/` directory.
diff --git a/Pages/Ajax/ReservationAttributesPage.php b/Pages/Ajax/ReservationAttributesPage.php
@@ -67,7 +67,7 @@ public function SetAttributes($attributes)
      */
     public function GetRequestedUserId()
     {
-        return $this->GetQuerystring(QueryStringKeys::USER_ID);
+        return (int)$this->GetQuerystring(QueryStringKeys::USER_ID);
     }
 
     /**
diff --git a/Pages/Ajax/ReservationAttributesPrintPage.php b/Pages/Ajax/ReservationAttributesPrintPage.php
@@ -67,7 +67,7 @@ public function SetAttributes($attributes)
      */
     public function GetRequestedUserId()
     {
-        return $this->GetQuerystring(QueryStringKeys::USER_ID);
+        return (int)$this->GetQuerystring(QueryStringKeys::USER_ID);
     }
 
     /**
diff --git a/Pages/Ajax/ReservationCreditsPage.php b/Pages/Ajax/ReservationCreditsPage.php
@@ -80,12 +80,12 @@ public function PageLoad()
 
     public function GetUserId()
     {
-        return $this->GetForm(FormKeys::USER_ID);
+        return (int)$this->GetForm(FormKeys::USER_ID);
     }
 
     public function GetResourceId()
     {
-        return $this->GetForm(FormKeys::RESOURCE_ID);
+        return (int)$this->GetForm(FormKeys::RESOURCE_ID);
     }
 
     public function GetStartDate()
@@ -116,10 +116,17 @@ public function GetResources()
         }
 
         if (!is_array($resources)) {
-            return [$resources];
+            $resources = [$resources];
         }
 
-        return $resources;
+        $resourceIds = [];
+        foreach ($resources as $resourceId) {
+            if (is_scalar($resourceId)) {
+                $resourceIds[] = (int)$resourceId;
+            }
+        }
+
+        return $resourceIds;
     }
 
     public function GetRepeatType()
diff --git a/Pages/Ajax/ReservationMovePage.php b/Pages/Ajax/ReservationMovePage.php
@@ -73,12 +73,12 @@ public function GetReferenceNumber()
 
     public function GetResourceId()
     {
-        return $this->GetForm(FormKeys::RESOURCE_ID);
+        return (int)$this->GetForm(FormKeys::RESOURCE_ID);
     }
 
     public function GetOriginalResourceId()
     {
-        return $this->GetForm(FormKeys::ORIGINAL_RESOURCE_ID);
+        return (int)$this->GetForm(FormKeys::ORIGINAL_RESOURCE_ID);
     }
 
     public function SetSaveSuccessfulMessage($succeeded)
diff --git a/Pages/Ajax/ReservationSavePage.php b/Pages/Ajax/ReservationSavePage.php
@@ -215,12 +215,12 @@ public function GetReferenceNumber()
 
     public function GetUserId()
     {
-        return $this->GetForm(FormKeys::USER_ID);
+        return (int)$this->GetForm(FormKeys::USER_ID);
     }
 
     public function GetResourceId()
     {
-        return $this->GetForm(FormKeys::RESOURCE_ID);
+        return (int)$this->GetForm(FormKeys::RESOURCE_ID);
     }
 
     public function GetTitle()
@@ -261,10 +261,17 @@ public function GetResources()
         }
 
         if (!is_array($resources)) {
-            return [$resources];
+            $resources = [$resources];
         }
 
-        return $resources;
+        $resourceIds = [];
+        foreach ($resources as $resourceId) {
+            if (is_scalar($resourceId)) {
+                $resourceIds[] = (int)$resourceId;
+            }
+        }
+
+        return $resourceIds;
     }
 
 
@@ -480,7 +487,9 @@ public function SetRetryParameters($retryParameters)
 
     public function GetRetryParameters()
     {
-        return ReservationRetryParameter::GetParamsFromForm($this->GetForm(FormKeys::RESERVATION_RETRY_PREFIX));
+        /** @var ReservationRetryParameter[] $retryParameters */
+        $retryParameters = ReservationRetryParameter::GetParamsFromForm($this->GetForm(FormKeys::RESERVATION_RETRY_PREFIX));
+        return $retryParameters;
     }
 
     public function SetRetryMessages($messages)
diff --git a/Pages/Ajax/ReservationUpdatePage.php b/Pages/Ajax/ReservationUpdatePage.php
@@ -11,7 +11,7 @@ interface IReservationUpdatePage extends IReservationSavePage
     public function GetReferenceNumber();
 
     /**
-     * @return SeriesUpdateScope
+     * @return string One of SeriesUpdateScope::ThisInstance, ::FullSeries, ::FutureInstances
      */
     public function GetSeriesUpdateScope();
 
@@ -89,7 +89,12 @@ public function GetReservationId()
 
     public function GetSeriesUpdateScope()
     {
-        return $this->GetForm(FormKeys::SERIES_UPDATE_SCOPE);
+        $scope = $this->GetForm(FormKeys::SERIES_UPDATE_SCOPE);
+        if (empty($scope)) {
+            return SeriesUpdateScope::FullSeries;
+        }
+
+        return (string)$scope;
     }
 
     public function GetRemovedAttachmentIds()
diff --git a/Pages/Ajax/ReservationUserAvailabilityPage.php b/Pages/Ajax/ReservationUserAvailabilityPage.php
@@ -99,7 +99,7 @@ public function GetParticipantIds()
 
     public function GetScheduleId()
     {
-        return $this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);
+        return (int)$this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);
     }
 
     public function Bind($dailyLayout, $resources, $user, $participants, $invitees, $dateRange)
diff --git a/Pages/Ajax/ReservationWaitlistPage.php b/Pages/Ajax/ReservationWaitlistPage.php
@@ -141,7 +141,7 @@ public function SetCanJoinWaitList($canJoinWaitlist)
 
     public function GetUserId()
     {
-        return $this->GetForm(FormKeys::USER_ID);
+        return (int)$this->GetForm(FormKeys::USER_ID);
     }
 
     public function GetStartDate()
@@ -166,6 +166,6 @@ public function GetEndTime()
 
     public function GetResourceId()
     {
-        return $this->GetForm(FormKeys::RESOURCE_ID);
+        return (int)$this->GetForm(FormKeys::RESOURCE_ID);
     }
 }
diff --git a/Pages/Ajax/ResourceDetailsPage.php b/Pages/Ajax/ResourceDetailsPage.php
@@ -61,7 +61,7 @@ public function BindAttributes($attributes)
 
     public function GetResourceId()
     {
-        return ServiceLocator::GetServer()->GetQuerystring(QueryStringKeys::RESOURCE_ID);
+        return (int)ServiceLocator::GetServer()->GetQuerystring(QueryStringKeys::RESOURCE_ID);
     }
 
     /**
@@ -102,7 +102,7 @@ public function GetResourceId();
 class ResourceDetailsPresenter
 {
     /**
-     * @var ResourceRepository
+     * @var IResourceRepository
      */
     private $resourceRepository;
 
diff --git a/Pages/Ajax/UnavailableResourcesPage.php b/Pages/Ajax/UnavailableResourcesPage.php
@@ -76,6 +76,6 @@ public function BindUnavailable($unavailableResourceIds)
 
     public function GetScheduleId()
     {
-        return $this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);
+        return (int)$this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);
     }
 }
diff --git a/lib/Application/Reservation/ReservationRetryParameter.php b/lib/Application/Reservation/ReservationRetryParameter.php
@@ -19,7 +19,7 @@ public function __construct($name, $value)
     /**
      * @static
      * @param $params string|string[]|null The result of $this->GetForm(FormKeys::RESERVATION_RETRY_PREFIX)
-     * @return array|AttributeFormElement[]
+     * @return array|ReservationRetryParameter[]
      */
     public static function GetParamsFromForm($params)
     {
diff --git a/phpstan_next.neon b/phpstan_next.neon
@@ -37,7 +37,6 @@ parameters:
             # area is fixed for the current target level.
             - Domain/
             - Pages/Admin/
-            - Pages/Ajax/
             - Presenters/
             - lib/
     bootstrapFiles:

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function SetAttributes($attributes)`
`67`	`67`	`*/`
`68`	`68`	`public function GetRequestedUserId()`
`69`	`69`	`{`
`70`		`- return $this->GetQuerystring(QueryStringKeys::USER_ID);`
	`70`	`+ return (int)$this->GetQuerystring(QueryStringKeys::USER_ID);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ public function PageLoad()`
`80`	`80`
`81`	`81`	`public function GetUserId()`
`82`	`82`	`{`
`83`		`- return $this->GetForm(FormKeys::USER_ID);`
	`83`	`+ return (int)$this->GetForm(FormKeys::USER_ID);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public function GetResourceId()`
`87`	`87`	`{`
`88`		`- return $this->GetForm(FormKeys::RESOURCE_ID);`
	`88`	`+ return (int)$this->GetForm(FormKeys::RESOURCE_ID);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public function GetStartDate()`
`@@ -116,10 +116,17 @@ public function GetResources()`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if (!is_array($resources)) {`
`119`		`- return [$resources];`
	`119`	`+ $resources = [$resources];`
`120`	`120`	`}`
`121`	`121`
`122`		`- return $resources;`
	`122`	`+ $resourceIds = [];`
	`123`	`+ foreach ($resources as $resourceId) {`
	`124`	`+ if (is_scalar($resourceId)) {`
	`125`	`+ $resourceIds[] = (int)$resourceId;`
	`126`	`+ }`
	`127`	`+ }`
	`128`	`+`
	`129`	`+ return $resourceIds;`
`123`	`130`	`}`
`124`	`131`
`125`	`132`	`public function GetRepeatType()`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ public function GetReferenceNumber()`
`73`	`73`
`74`	`74`	`public function GetResourceId()`
`75`	`75`	`{`
`76`		`- return $this->GetForm(FormKeys::RESOURCE_ID);`
	`76`	`+ return (int)$this->GetForm(FormKeys::RESOURCE_ID);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public function GetOriginalResourceId()`
`80`	`80`	`{`
`81`		`- return $this->GetForm(FormKeys::ORIGINAL_RESOURCE_ID);`
	`81`	`+ return (int)$this->GetForm(FormKeys::ORIGINAL_RESOURCE_ID);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function SetSaveSuccessfulMessage($succeeded)`
Original file line number	Diff line number	Diff line change
`@@ -215,12 +215,12 @@ public function GetReferenceNumber()`
`215`	`215`
`216`	`216`	`public function GetUserId()`
`217`	`217`	`{`
`218`		`- return $this->GetForm(FormKeys::USER_ID);`
	`218`	`+ return (int)$this->GetForm(FormKeys::USER_ID);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`public function GetResourceId()`
`222`	`222`	`{`
`223`		`- return $this->GetForm(FormKeys::RESOURCE_ID);`
	`223`	`+ return (int)$this->GetForm(FormKeys::RESOURCE_ID);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`public function GetTitle()`
`@@ -261,10 +261,17 @@ public function GetResources()`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`if (!is_array($resources)) {`
`264`		`- return [$resources];`
	`264`	`+ $resources = [$resources];`
`265`	`265`	`}`
`266`	`266`
`267`		`- return $resources;`
	`267`	`+ $resourceIds = [];`
	`268`	`+ foreach ($resources as $resourceId) {`
	`269`	`+ if (is_scalar($resourceId)) {`
	`270`	`+ $resourceIds[] = (int)$resourceId;`
	`271`	`+ }`
	`272`	`+ }`
	`273`	`+`
	`274`	`+ return $resourceIds;`
`268`	`275`	`}`
`269`	`276`
`270`	`277`
`@@ -480,7 +487,9 @@ public function SetRetryParameters($retryParameters)`
`480`	`487`
`481`	`488`	`public function GetRetryParameters()`
`482`	`489`	`{`
`483`		`- return ReservationRetryParameter::GetParamsFromForm($this->GetForm(FormKeys::RESERVATION_RETRY_PREFIX));`
	`490`	`+ /** @var ReservationRetryParameter[] $retryParameters */`
	`491`	`+ $retryParameters = ReservationRetryParameter::GetParamsFromForm($this->GetForm(FormKeys::RESERVATION_RETRY_PREFIX));`
	`492`	`+ return $retryParameters;`
`484`	`493`	`}`
`485`	`494`
`486`	`495`	`public function SetRetryMessages($messages)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function GetParticipantIds()`
`99`	`99`
`100`	`100`	`public function GetScheduleId()`
`101`	`101`	`{`
`102`		`- return $this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);`
	`102`	`+ return (int)$this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public function Bind($dailyLayout, $resources, $user, $participants, $invitees, $dateRange)`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function SetCanJoinWaitList($canJoinWaitlist)`
`141`	`141`
`142`	`142`	`public function GetUserId()`
`143`	`143`	`{`
`144`		`- return $this->GetForm(FormKeys::USER_ID);`
	`144`	`+ return (int)$this->GetForm(FormKeys::USER_ID);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public function GetStartDate()`
`@@ -166,6 +166,6 @@ public function GetEndTime()`
`166`	`166`
`167`	`167`	`public function GetResourceId()`
`168`	`168`	`{`
`169`		`- return $this->GetForm(FormKeys::RESOURCE_ID);`
	`169`	`+ return (int)$this->GetForm(FormKeys::RESOURCE_ID);`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function BindAttributes($attributes)`
`61`	`61`
`62`	`62`	`public function GetResourceId()`
`63`	`63`	`{`
`64`		`- return ServiceLocator::GetServer()->GetQuerystring(QueryStringKeys::RESOURCE_ID);`
	`64`	`+ return (int)ServiceLocator::GetServer()->GetQuerystring(QueryStringKeys::RESOURCE_ID);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`@@ -102,7 +102,7 @@ public function GetResourceId();`
`102`	`102`	`class ResourceDetailsPresenter`
`103`	`103`	`{`
`104`	`104`	`/**`
`105`		`- * @var ResourceRepository`
	`105`	`+ * @var IResourceRepository`
`106`	`106`	`*/`
`107`	`107`	`private $resourceRepository;`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ public function BindUnavailable($unavailableResourceIds)`
`76`	`76`
`77`	`77`	`public function GetScheduleId()`
`78`	`78`	`{`
`79`		`- return $this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);`
	`79`	`+ return (int)$this->GetQuerystring(QueryStringKeys::SCHEDULE_ID);`
`80`	`80`	`}`
`81`	`81`	`}`