fix psalm issues and run cs:fix

Signed-off-by: Julien Veyssier <[email protected]>
julien-nc · Oct 20, 2024 · 21e4a4d · 21e4a4d
1 parent bab0a6f
commit 21e4a4d
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 69 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Activity/CospendProvider.php b/lib/Activity/CospendProvider.php
@@ -41,14 +41,14 @@ class CospendProvider implements IProvider {
 	private array $projectNames;
 
 	public function __construct(
-		private IURLGenerator       $urlGenerator,
-		private ActivityManager     $activityManager,
-		private IUserManager        $userManager,
-		private IGroupManager       $groupManager,
-		private IAppManager         $appManager,
-		private IL10N               $l10n,
+		private IURLGenerator $urlGenerator,
+		private ActivityManager $activityManager,
+		private IUserManager $userManager,
+		private IGroupManager $groupManager,
+		private IAppManager $appManager,
+		private IL10N $l10n,
 		private LocalProjectService $projectService,
-		private ?string             $userId,
+		private ?string $userId,
 	) {
 		$this->projectNames = [];
 		if (!is_null($userId)) {

diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -214,7 +214,7 @@ public function getProjectInfo(string $projectId): DataResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['Projects'])]
 	#[SupportFederatedProject]
 	public function editProject(
-		string  $projectId, ?string $name = null,
+		string $projectId, ?string $name = null,
 		?string $autoExport = null, ?string $currencyName = null, ?bool $deletionDisabled = null,
 		?string $categorySort = null, ?string $paymentModeSort = null, ?int $archivedTs = null,
 	): DataResponse {

diff --git a/lib/Controller/OldApiController.php b/lib/Controller/OldApiController.php
@@ -311,7 +311,7 @@ public function apiv2GetBills(string $token, ?int $lastchanged = null, ?int $del
 	#[CospendPublicAuth(minimumLevel: Application::ACCESS_LEVEL_MAINTAINER)]
 	#[BruteForceProtection(action: 'CospendPublicAddMember')]
 	public function apiAddMember(string $token, string $name,
-		float  $weight = 1, int $active = 1, ?string $color = null): DataResponse {
+		float $weight = 1, int $active = 1, ?string $color = null): DataResponse {
 		$publicShareInfo = $this->localProjectService->getLinkShareInfoFromShareToken($token);
 		try {
 			$member = $this->localProjectService->createMember(
@@ -404,7 +404,7 @@ public function apiAddBill(string $token, ?string $date = null, ?string $what =
 	#[CORS]
 	#[NoCSRFRequired]
 	#[CospendUserPermissions(minimumLevel: Application::ACCESS_LEVEL_PARTICIPANT)]
-	public function apiPrivAddBill(string  $projectId, ?string $date = null, ?string $what = null, ?int $payer = null,
+	public function apiPrivAddBill(string $projectId, ?string $date = null, ?string $what = null, ?int $payer = null,
 		?string $payed_for = null, ?float $amount = null, string $repeat = 'n',
 		?string $paymentmode = null, ?int $paymentmodeid = null,
 		?int $categoryid = null, int $repeatallactive = 0, ?string $repeatuntil = null, ?int $timestamp = null,
@@ -448,7 +448,7 @@ public function apiRepeatBill(string $token, int $billId): DataResponse {
 	#[CospendPublicAuth(minimumLevel: Application::ACCESS_LEVEL_PARTICIPANT)]
 	#[BruteForceProtection(action: 'CospendPublicEditBill')]
 	public function apiEditBill(
-		string  $token, int $billid, ?string $date = null, ?string $what = null,
+		string $token, int $billid, ?string $date = null, ?string $what = null,
 		?int $payer = null, ?string $payed_for = null, ?float $amount = null, string $repeat = 'n',
 		?string $paymentmode = null, ?int $paymentmodeid = null,
 		?int $categoryid = null, ?int $repeatallactive = null,

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -45,15 +45,15 @@
 class PageController extends Controller {
 
 	public function __construct(
-		string                      $appName,
-		IRequest                    $request,
-		private IL10N               $trans,
+		string $appName,
+		IRequest $request,
+		private IL10N $trans,
 		private LocalProjectService $projectService,
-		private IInitialState       $initialStateService,
-		private IAppManager         $appManager,
-		private IEventDispatcher    $eventDispatcher,
-		private IConfig             $config,
-		private ?string             $userId,
+		private IInitialState $initialStateService,
+		private IAppManager $appManager,
+		private IEventDispatcher $eventDispatcher,
+		private IConfig $config,
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
 	}

diff --git a/lib/Controller/PublicApiController.php b/lib/Controller/PublicApiController.php
@@ -257,7 +257,7 @@ public function publicGetProjectInfo(string $token): DataResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['Public-API_Projects'])]
 	public function publicGetProjectStatistics(
 		string $token, ?int $tsMin = null, ?int $tsMax = null,
-		?int   $paymentModeId = null, ?int $categoryId = null,
+		?int $paymentModeId = null, ?int $categoryId = null,
 		?float $amountMin = null, ?float $amountMax = null,
 		string $showDisabled = '1', ?int $currencyId = null, ?int $payerId = null,
 	): DataResponse {
@@ -894,7 +894,7 @@ public function publicCreateCategory(string $token, string $name, ?string $icon,
 	#[BruteForceProtection(action: 'CospendPublicEditCat')]
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT, tags: ['Public-API_Categories'])]
 	public function publicEditCategory(
-		string  $token, int $categoryId,
+		string $token, int $categoryId,
 		?string $name = null, ?string $icon = null, ?string $color = null,
 	): DataResponse {
 		try {

diff --git a/lib/Db/BillMapper.php b/lib/Db/BillMapper.php
@@ -316,7 +316,7 @@ public function getBillsToRepeat(?int $billId = null): array {
 	 * @throws \OCP\DB\Exception
 	 */
 	public function getBillsClassic(
-		string  $projectId, ?int $tsMin = null, ?int $tsMax = null,
+		string $projectId, ?int $tsMin = null, ?int $tsMax = null,
 		?string $paymentMode = null, ?int $paymentModeId = null,
 		?int $category = null, ?float $amountMin = null, ?float $amountMax = null,
 		?int $lastchanged = null, ?int $limit = null,

diff --git a/lib/Db/Category.php b/lib/Db/Category.php
@@ -35,7 +35,7 @@ public function __construct() {
 		$this->addType('name', 'string');
 		$this->addType('color', 'string');
 		$this->addType('encoded_icon', 'string');
-		$this->addType('order', 'int');
+		$this->addType('order', 'integer');
 	}
 
 	public function jsonSerialize(): array {

diff --git a/lib/Db/Invitation.php b/lib/Db/Invitation.php
@@ -44,7 +44,7 @@ class Invitation extends Entity implements \JsonSerializable {
 
 	public function __construct() {
 		$this->addType('userId', 'string');
-		$this->addType('state', 'int');
+		$this->addType('state', 'integer');
 		$this->addType('accessToken', 'string');
 		$this->addType('remoteProjectId', 'string');
 		$this->addType('remoteProjectName', 'string');

diff --git a/lib/Db/PaymentMode.php b/lib/Db/PaymentMode.php
@@ -38,7 +38,7 @@ public function __construct() {
 		$this->addType('name', 'string');
 		$this->addType('color', 'string');
 		$this->addType('encoded_icon', 'string');
-		$this->addType('order', 'int');
+		$this->addType('order', 'integer');
 		$this->addType('old_id', 'string');
 	}
 

diff --git a/lib/Search/CospendSearchProvider.php b/lib/Search/CospendSearchProvider.php
@@ -42,12 +42,12 @@
 class CospendSearchProvider implements IProvider {
 
 	public function __construct(
-		private IAppManager         $appManager,
-		private IL10N               $l10n,
-		private IURLGenerator       $urlGenerator,
-		private IDateTimeFormatter  $dateFormatter,
+		private IAppManager $appManager,
+		private IL10N $l10n,
+		private IURLGenerator $urlGenerator,
+		private IDateTimeFormatter $dateFormatter,
 		private LocalProjectService $projectService,
-		private BillMapper          $billMapper,
+		private BillMapper $billMapper,
 	) {
 	}
 

diff --git a/lib/Service/FederatedProjectService.php b/lib/Service/FederatedProjectService.php
@@ -294,7 +294,7 @@ public function getProjectSettlement(string $projectId, ?int $centeredOn = null,
 	}
 
 	public function editProject(
-		string  $projectId, ?string $name = null, ?string $contact_email = null,
+		string $projectId, ?string $name = null, ?string $contact_email = null,
 		?string $autoExport = null, ?string $currencyName = null, ?bool $deletionDisabled = null,
 		?string $categorySort = null, ?string $paymentModeSort = null, ?int $archivedTs = null,
 	): void {

diff --git a/lib/Service/IProjectService.php b/lib/Service/IProjectService.php
@@ -110,7 +110,7 @@ public function editMember(
 	 * @return void
 	 */
 	public function editProject(
-		string  $projectId, ?string $name = null, ?string $contact_email = null,
+		string $projectId, ?string $name = null, ?string $contact_email = null,
 		?string $autoExport = null, ?string $currencyName = null, ?bool $deletionDisabled = null,
 		?string $categorySort = null, ?string $paymentModeSort = null, ?int $archivedTs = null,
 	): void;

diff --git a/lib/Service/LocalProjectService.php b/lib/Service/LocalProjectService.php
@@ -1396,7 +1396,7 @@ public function editMember(
 	}
 
 	public function editProject(
-		string  $projectId, ?string $name = null, ?string $contact_email = null,
+		string $projectId, ?string $name = null, ?string $contact_email = null,
 		?string $autoExport = null, ?string $currencyName = null, ?bool $deletionDisabled = null,
 		?string $categorySort = null, ?string $paymentModeSort = null, ?int $archivedTs = null,
 	): void {