made $userId more strict type-wise

ibexa · Jun 3, 2024 · 9cd39ca · 9cd39ca
1 parent 10da034
commit 9cd39ca
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 221 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1731,67 +1731,17 @@ parameters:
 			path: src/lib/Server/Controller/URLWildcard.php
 
 		-
-			message: "#^Dead catch \\- Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Exceptions\\\\NotFoundException is never thrown in the try block\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Expression \"\\$this\\-\\>loadUsers\\(\\$request\\)\\-\\>users\" on a separate line does not do anything\\.$#"
+			message: "#^Access to an undefined property Ibexa\\\\Rest\\\\Value\\:\\:\\$users\\.$#"
 			count: 1
 			path: src/lib/Server/Controller/User.php
 
 		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:assignUserToUserGroup\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:createUser\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:createUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:deleteUser\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:deleteUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadSubUserGroups\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadSubUserGroups\\(\\) should return Ibexa\\\\Rest\\\\Server\\\\Values\\\\UserGroupList\\|Ibexa\\\\Rest\\\\Server\\\\Values\\\\UserGroupRefList but returns Ibexa\\\\Rest\\\\Server\\\\Values\\\\CachedValue\\.$#"
-			count: 2
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUser\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUser\\(\\) should return Ibexa\\\\Rest\\\\Server\\\\Values\\\\RestUser but returns Ibexa\\\\Rest\\\\Server\\\\Values\\\\CachedValue\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUserDrafts\\(\\) has parameter \\$userId with no type specified\\.$#"
+			message: "#^Dead catch \\- Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Exceptions\\\\NotFoundException is never thrown in the try block\\.$#"
 			count: 1
 			path: src/lib/Server/Controller/User.php
 
 		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
+			message: "#^Expression \"\\$this\\-\\>loadUsers\\(\\$request\\)\\-\\>users\" on a separate line does not do anything\\.$#"
 			count: 1
 			path: src/lib/Server/Controller/User.php
 
@@ -1800,56 +1750,6 @@ parameters:
 			count: 1
 			path: src/lib/Server/Controller/User.php
 
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUserGroupsOfUser\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUserGroupsOfUser\\(\\) should return Ibexa\\\\Rest\\\\Server\\\\Values\\\\UserGroupRefList but returns Ibexa\\\\Rest\\\\Server\\\\Values\\\\CachedValue\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUsersFromGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:loadUsersFromGroup\\(\\) should return Ibexa\\\\Rest\\\\Server\\\\Values\\\\UserList\\|Ibexa\\\\Rest\\\\Server\\\\Values\\\\UserRefList but returns Ibexa\\\\Rest\\\\Server\\\\Values\\\\CachedValue\\.$#"
-			count: 2
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:moveUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:unassignUserFromUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:unassignUserFromUserGroup\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:updateUser\\(\\) has parameter \\$userId with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:updateUserGroup\\(\\) has parameter \\$groupPath with no type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
-		-
-			message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:verifyUsers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
 		-
 			message: "#^Parameter \\#1 \\$href of method Ibexa\\\\Rest\\\\RequestParser\\:\\:parseHref\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
@@ -1865,11 +1765,6 @@ parameters:
 			count: 14
 			path: src/lib/Server/Controller/User.php
 
-		-
-			message: "#^Parameter \\#1 \\$locationId of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\LocationService\\:\\:loadLocation\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/lib/Server/Controller/User.php
-
 		-
 			message: "#^Parameter \\#1 \\$path of method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\User\\:\\:extractLocationIdFromPath\\(\\) expects string, string\\|null given\\.$#"
 			count: 1