Merge pull request #2776 from nextcloud/dependabot/composer/vendor-bin/cs-fixer/stable5/nextcloud/coding-standard-1.4.0

susnux · web-flow · commit b4aedaac38b9 · 2025-06-25T19:19:19.000+02:00
Chore(deps): Bump nextcloud/coding-standard from 1.3.2 to 1.4.0 in /vendor-bin/cs-fixer
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -16,7 +16,7 @@
 use OCP\Share\IShare;
 
 class ActivityManager {
-	
+
 	public function __construct(
 		protected string $appName,
 		private ?string $userId,
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -297,9 +297,9 @@ public function updateForm(int $formId, array $keyValuePairs): DataResponse {
 
 		// Don't allow to change params id, hash, ownerId, created, lastUpdated, fileId
 		if (
-			key_exists('id', $keyValuePairs) || key_exists('hash', $keyValuePairs) ||
-			key_exists('ownerId', $keyValuePairs) || key_exists('created', $keyValuePairs) ||
-			isset($keyValuePairs['fileId']) || key_exists('lastUpdated', $keyValuePairs)
+			key_exists('id', $keyValuePairs) || key_exists('hash', $keyValuePairs)
+			|| key_exists('ownerId', $keyValuePairs) || key_exists('created', $keyValuePairs)
+			|| isset($keyValuePairs['fileId']) || key_exists('lastUpdated', $keyValuePairs)
 		) {
 			$this->logger->info('Not allowed to update id, hash, ownerId, created, fileId or lastUpdated');
 			throw new OCSForbiddenException('Not allowed to update id, hash, ownerId, created, fileId or lastUpdated');
diff --git a/lib/Db/FormMapper.php b/lib/Db/FormMapper.php
@@ -34,7 +34,7 @@ public function __construct(
 		parent::__construct($db, 'forms_v2_forms', Form::class);
 	}
 
-	
+
 	/**
 	 * @param Entity $entity
 	 * @psalm-param Form $entity
diff --git a/lib/FormsMigrator.php b/lib/FormsMigrator.php
@@ -94,8 +94,8 @@ public function export(IUser $user, IExportDestination $exportDestination, Outpu
 				// Mark userIds with instance.
 				foreach ($formData['submissions'] as $sKey => $submission) {
 					// Anonymous submission or already migrated, just keep it.
-					if (substr($submission['userId'], 0, 10) === 'anon-user-' ||
-						substr($submission['userId'], 0, 8) === 'unknown~') {
+					if (substr($submission['userId'], 0, 10) === 'anon-user-'
+						|| substr($submission['userId'], 0, 8) === 'unknown~') {
 						continue;
 					}
 
@@ -147,7 +147,7 @@ public function import(IUser $user, IImportSource $importSource, OutputInterface
 				$form->setIsAnonymous($formData['isAnonymous']);
 				$form->setSubmitMultiple($formData['submitMultiple']);
 				$form->setShowExpiration($formData['showExpiration']);
-				
+
 				$this->formMapper->insert($form);
 
 				$questionIdMap = [];
diff --git a/lib/Migration/Version020300Date20210406114130.php b/lib/Migration/Version020300Date20210406114130.php
@@ -46,7 +46,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 
diff --git a/lib/Migration/Version020300Date20210406133704.php b/lib/Migration/Version020300Date20210406133704.php
@@ -24,12 +24,12 @@ class Version020300Date20210406133704 extends SimpleMigrationStep {
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
-		
+
 		$table = $schema->getTable('forms_v2_questions');
-		
+
 		if ($table->hasColumn('mandatory') && $table->hasColumn('is_required')) {
 			$table->dropColumn('mandatory');
-		
+
 			return $schema;
 		}
 
diff --git a/lib/Migration/Version030000Date20220414203511.php b/lib/Migration/Version030000Date20220414203511.php
@@ -34,7 +34,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 }
diff --git a/lib/Migration/Version030000Date20220705192811.php b/lib/Migration/Version030000Date20220705192811.php
@@ -45,7 +45,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 
diff --git a/lib/Migration/Version030000Date20220707130109.php b/lib/Migration/Version030000Date20220707130109.php
@@ -25,7 +25,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$schema = $schemaClosure();
 
 		$table = $schema->getTable('forms_v2_forms');
-		
+
 		if ($table->hasColumn('submit_once') && $table->hasColumn('submit_multiple')) {
 			$table->dropColumn('submit_once');
 			return $schema;
diff --git a/lib/Migration/Version030000Date20220831195000.php b/lib/Migration/Version030000Date20220831195000.php
@@ -32,7 +32,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 }
diff --git a/lib/Migration/Version030100Date20221231100426.php b/lib/Migration/Version030100Date20221231100426.php
@@ -38,7 +38,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 }
diff --git a/lib/Migration/Version030100Date20230123182700.php b/lib/Migration/Version030100Date20230123182700.php
@@ -34,7 +34,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			return $schema;
 		}
-		
+
 		return null;
 	}
 }
diff --git a/lib/Migration/Version040200Date20240402200139.php b/lib/Migration/Version040200Date20240402200139.php
@@ -70,7 +70,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 		$qbUpdate->update('forms_v2_forms')
 			->set('access_enum', $qbUpdate->createParameter('access_enum'))
 			->where($qbUpdate->expr()->eq('id', $qbUpdate->createParameter('id')));
-		
+
 		// Fetch Forms...
 		$cursor = $qbFetch->executeQuery();
 
diff --git a/lib/Migration/Version040200Date20240402224725.php b/lib/Migration/Version040200Date20240402224725.php
@@ -30,7 +30,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$schema = $schemaClosure();
 
 		$table = $schema->getTable('forms_v2_forms');
-		
+
 		if ($table->hasColumn('access_json') && $table->hasColumn('access_enum')) {
 			$table->dropColumn('access_json');
 			return $schema;
diff --git a/lib/Migration/Version050000Date20241005173955.php b/lib/Migration/Version050000Date20241005173955.php
@@ -22,7 +22,7 @@ public function __construct(
 		protected IDBConnection $db,
 	) {
 	}
-	
+
 	/**
 	 * @param IOutput $output
 	 * @param Closure(): ISchemaWrapper $schemaClosure
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -18,7 +18,7 @@
 
 class ConfigService {
 	private ?IUser $currentUser;
-		
+
 	public function __construct(
 		protected string $appName,
 		private IConfig $config,
diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
@@ -353,8 +353,8 @@ public function canSubmit(Form $form): bool {
 
 		// Refuse access, if SubmitMultiple is not set and user already has taken part.
 		if (
-			!$form->getSubmitMultiple() &&
-			$this->submissionMapper->hasFormSubmissionsByUser($form, $this->currentUser->getUID())
+			!$form->getSubmitMultiple()
+			&& $this->submissionMapper->hasFormSubmissionsByUser($form, $this->currentUser->getUID())
 		) {
 			return false;
 		}
@@ -446,10 +446,10 @@ private function isSharedFormShown(Form $form): bool {
 		}
 
 		// Shown if permitall and showntoall are both set.
-		if ($form->getAccess()['permitAllUsers'] &&
-			$form->getAccess()['showToAllUsers'] &&
-			$this->configService->getAllowPermitAll() &&
-			$this->configService->getAllowShowToAll()) {
+		if ($form->getAccess()['permitAllUsers']
+			&& $form->getAccess()['showToAllUsers']
+			&& $this->configService->getAllowPermitAll()
+			&& $this->configService->getAllowShowToAll()) {
 
 			return true;
 		}
diff --git a/lib/Service/SubmissionService.php b/lib/Service/SubmissionService.php
@@ -248,8 +248,8 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 				function (array $carry, Answer $answer) use ($questionPerQuestionId) {
 					$questionId = $answer->getQuestionId();
 
-					if (isset($questionPerQuestionId[$questionId]) &&
-						$questionPerQuestionId[$questionId]->getType() === Constants::ANSWER_TYPE_FILE) {
+					if (isset($questionPerQuestionId[$questionId])
+						&& $questionPerQuestionId[$questionId]->getType() === Constants::ANSWER_TYPE_FILE) {
 						if (array_key_exists($questionId, $carry)) {
 							$carry[$questionId]['label'] .= "; \n" . $answer->getText();
 						} else {
@@ -346,17 +346,17 @@ public function validateSubmission(array $questions, array $answers, string $for
 			$questionAnswered = array_key_exists($questionId, $answers);
 
 			// Check if all required questions have an answer
-			if ($question['isRequired'] &&
-				(!$questionAnswered ||
-				!array_filter($answers[$questionId], static function (string|array $value): bool {
+			if ($question['isRequired']
+				&& (!$questionAnswered
+				|| !array_filter($answers[$questionId], static function (string|array $value): bool {
 					// file type
 					if (is_array($value)) {
 						return !empty($value['uploadedFileId']);
 					}
 
 					return $value !== '';
-				}) ||
-				(!empty($question['extraSettings']['allowOtherAnswer']) && !array_filter($answers[$questionId], fn ($value) => $value !== Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX)))
+				})
+				|| (!empty($question['extraSettings']['allowOtherAnswer']) && !array_filter($answers[$questionId], fn ($value) => $value !== Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX)))
 			) {
 				throw new \InvalidArgumentException(sprintf('Question "%s" is required.', $question['text']));
 			}
@@ -463,8 +463,8 @@ private function validateDateTime(array $answers, string $format, ?string $text
 			$previousDate = $d;
 
 			if ($extraSettings) {
-				if ((isset($extraSettings['dateMin']) && $d < (new DateTime())->setTimestamp($extraSettings['dateMin'])) ||
-					(isset($extraSettings['dateMax']) && $d > (new DateTime())->setTimestamp($extraSettings['dateMax']))
+				if ((isset($extraSettings['dateMin']) && $d < (new DateTime())->setTimestamp($extraSettings['dateMin']))
+					|| (isset($extraSettings['dateMax']) && $d > (new DateTime())->setTimestamp($extraSettings['dateMax']))
 				) {
 					throw new \InvalidArgumentException(sprintf('Date is not in the allowed range for question "%s".', $text));
 				}
diff --git a/tests/Unit/Activity/ActivityManagerTest.php b/tests/Unit/Activity/ActivityManagerTest.php
@@ -79,7 +79,7 @@ public function testPublishNewGroupShare() {
 		$form->setTitle('TestForm-Title');
 		$form->setHash('abcdefg12345');
 		$groupId = 'sharedGroup';
-		
+
 		$group = $this->createMock(IGroup::class);
 		$user = $this->createMock(IUser::class);
 
@@ -154,7 +154,7 @@ public function testPublishNewCircleShare() {
 
 	public function testPublishNewCircleShare_circlesDisabled() {
 		$form = $this->createMock(Form::class);
-		
+
 		$this->circlesService->expects($this->once())
 			->method('getCircleUsers')
 			->with('circle')
diff --git a/tests/Unit/Activity/ProviderTest.php b/tests/Unit/Activity/ProviderTest.php
@@ -73,7 +73,7 @@ public function setUp(): void {
 		$this->l10nFactory = $this->createMock(IFactory::class);
 		$this->validator = $this->createMock(IValidator::class);
 		$this->circlesService = $this->createMock(CirclesService::class);
-		
+
 		$this->urlGenerator->expects($this->any())
 			->method('linkToRouteAbsolute')
 			->with('forms.page.index')
diff --git a/tests/Unit/Controller/ConfigControllerTest.php b/tests/Unit/Controller/ConfigControllerTest.php
@@ -60,7 +60,7 @@ public function testGetAppConfig() {
 				'allow' => 'someConfig',
 				'permit' => 'all'
 			]);
-		
+
 		$this->assertEquals(new DataResponse([
 			'allow' => 'someConfig',
 			'permit' => 'all'
@@ -99,7 +99,7 @@ public function dataUpdateAppConfig() {
 	public function testUpdateAppConfig(string $configKey, $configValue, string $strConfig) {
 		$this->logger->expects($this->once())
 			->method('debug');
-		
+
 		$this->config->expects($this->once())
 			->method('setAppValue')
 			->with('forms', $configKey, $strConfig);
@@ -110,7 +110,7 @@ public function testUpdateAppConfig(string $configKey, $configValue, string $str
 	public function testUpdateAppConfig_unknownKey() {
 		$this->logger->expects($this->once())
 			->method('debug');
-		
+
 		$this->config->expects($this->never())
 			->method('setAppValue');
 
diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
@@ -47,16 +47,16 @@ class PageControllerTest extends TestCase {
 
 	/** @var IAccountManager|MockObject */
 	private $accountManager;
- 
+
 	/** @var IInitialState|MockObject */
 	private $initialState;
 
 	/** @var IL10N|MockObject */
 	private $l10n;
- 
+
 	/** @var IURLGenerator|MockObject */
 	private $urlGenerator;
- 
+
 	/** @var IUserManager|MockObject */
 	private $userManager;
 
diff --git a/tests/Unit/Db/SubmissionMapperTest.php b/tests/Unit/Db/SubmissionMapperTest.php
@@ -13,7 +13,7 @@
 use Test\TestCase;
 
 class SubmissionMapperTest extends TestCase {
-	
+
 	private SubmissionMapper $mockSubmissionMapper;
 
 
@@ -36,7 +36,7 @@ public function testHasMultipleFormSubmissionsByUser(int $numberOfSubmissions, b
 
 		$form = new Form();
 		$form->setId(1);
-		
+
 		$this->assertEquals($expected, $this->mockSubmissionMapper->hasMultipleFormSubmissionsByUser($form, 'user1'));
 	}
 
@@ -71,7 +71,7 @@ public function testHasFormSubmissionsByUser(int $numberOfSubmissions, bool $exp
 
 		$form = new Form();
 		$form->setId(1);
-		
+
 		$this->assertEquals($expected, $this->mockSubmissionMapper->hasFormSubmissionsByUser($form, 'user1'));
 	}
 
diff --git a/tests/Unit/Service/CirclesServiceTest.php b/tests/Unit/Service/CirclesServiceTest.php
@@ -121,7 +121,7 @@ public function testGetCircleUsers_circlesDisabled() {
 			->onlyMethods(['getCircle'])
 			->setConstructorArgs([$this->appManager, $this->container, $this->logger])
 			->getMock();
-		
+
 		$circlesService->expects($this->never())
 			->method('getCircle');
 
@@ -138,7 +138,7 @@ public function testGetCircleUsers_circleNotFound() {
 			->onlyMethods(['getCircle'])
 			->setConstructorArgs([$this->appManager, $this->container, $this->logger])
 			->getMock();
-		
+
 		$circlesService->expects($this->once())
 			->method('getCircle')
 			->with('noCircle')
@@ -173,7 +173,7 @@ public function testGetCircleUsers() {
 			->onlyMethods(['getCircle'])
 			->setConstructorArgs([$this->appManager, $this->container, $this->logger])
 			->getMock();
-		
+
 		$circlesService->expects($this->once())
 			->method('getCircle')
 			->with('circle')
diff --git a/tests/Unit/Service/ConfigServiceTest.php b/tests/Unit/Service/ConfigServiceTest.php
@@ -202,7 +202,7 @@ public function testCanCreateForms(array $config, bool $expected) {
 			->method('getUserGroupIds')
 			->with($this->currentUser)
 			->willReturn(['usersGroup']);
-		
+
 		$this->assertEquals($expected, $this->configService->canCreateForms());
 	}
 }
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(`
`34`	`34`	`parent::__construct($db, 'forms_v2_forms', Form::class);`
`35`	`35`	`}`
`36`	`36`
`37`		`-`
	`37`	`+`
`38`	`38`	`/**`
`39`	`39`	`* @param Entity $entity`
`40`	`40`	`* @psalm-param Form $entity`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt`
`46`	`46`
`47`	`47`	`return $schema;`
`48`	`48`	`}`
`49`		`-`
	`49`	`+`
`50`	`50`	`return null;`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt`
`34`	`34`
`35`	`35`	`return $schema;`
`36`	`36`	`}`
`37`		`-`
	`37`	`+`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt`
`45`	`45`
`46`	`46`	`return $schema;`
`47`	`47`	`}`
`48`		`-`
	`48`	`+`
`49`	`49`	`return null;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt`
`32`	`32`
`33`	`33`	`return $schema;`
`34`	`34`	`}`
`35`		`-`
	`35`	`+`
`36`	`36`	`return null;`
`37`	`37`	`}`
`38`	`38`	`}`