style: fix phpstan errors

leibniz-psychology · Jan 21, 2025 · 507e55e · 507e55e
1 parent 48f562f
commit 507e55e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 43 deletions.
diff --git a/src/Controller/CodebookController.php b/src/Controller/CodebookController.php
@@ -125,7 +125,7 @@ public function datasetMatrixAction(Request $request, string $uuid): JsonRespons
     private function codebookCollectionToJsonArray(?Collection $codebook): ?array
     {
         $jsonCodebook = null;
-        if ($codebook && is_iterable($codebook)) {
+        if ($codebook) {
             $jsonCodebook = [];
             foreach ($codebook as $var) {
                 $jsonCodebook['variables'][] = [

diff --git a/src/Controller/FileManagementController.php b/src/Controller/FileManagementController.php
@@ -49,32 +49,36 @@ public function submitSavAction(string $fileId): JsonResponse
         $this->logger->debug("Enter FileManagementController::previewSavAction with [FileId: {$fileId}]");
         $dataset = $this->em->find(Dataset::class, $fileId);
         $data = null;
+
         if ($dataset) {
             $data = $this->savImportable->savToArray($dataset);
         }
-        if (isset($dataset, $data) && !empty($data)) {
-            if (is_iterable($data) && key_exists('codebook', $data)) {
-                foreach ($data['codebook'] as $var) {
-                    $this->em->persist(
-                        DatasetVariables::createNew(
-                            $dataset,
-                            $var['id'],
-                            $var['name'],
-                            $var['label'],
-                            $var['itemText'],
-                            $var['values'],
-                            $var['missings'],
-                        )
-                    );
-                }
-                $this->em->flush();
-                if (key_exists('records', $data)) {
-                    $this->crud->saveDatasetMatrix($data['records'], $dataset->getId());
-                }
+
+        if (!isset($dataset) or empty($data)) {
+            return new JsonResponse([], Response::HTTP_UNPROCESSABLE_ENTITY);
+        }
+
+        if (key_exists('codebook', $data)) {
+            foreach ($data['codebook'] as $var) {
+                $this->em->persist(
+                    DatasetVariables::createNew(
+                        $dataset,
+                        $var['id'],
+                        $var['name'],
+                        $var['label'],
+                        $var['itemText'],
+                        $var['values'],
+                        $var['missings'],
+                    )
+                );
+            }
+            $this->em->flush();
+            if (key_exists('records', $data)) {
+                $this->crud->saveDatasetMatrix($data['records'], $dataset->getId());
             }
         }
 
-        return new JsonResponse($data ?? [], $data != null ? Response::HTTP_OK : Response::HTTP_UNPROCESSABLE_ENTITY);
+        return new JsonResponse($data, Response::HTTP_OK);
     }
 
     #[Route(path: '/preview/csv/{fileId}', name: 'preview-csv', methods: ['POST'])]

diff --git a/src/Controller/StudyController.php b/src/Controller/StudyController.php
@@ -116,11 +116,11 @@ public function documentationAction(string $uuid, Request $request): Response
 
         $formData = $form->getData();
         $currentCreators = $this->em->getRepository(CreatorMetaDataGroup::class)->findBy(['basicInformation' => $basicInformation]);
-        if (is_iterable($currentCreators)) {
-            foreach ($currentCreators as $currentCreator) {
-                $this->em->remove($currentCreator);
-            }
+
+        foreach ($currentCreators as $currentCreator) {
+            $this->em->remove($currentCreator);
         }
+
         $newCreators = $formData->getCreators();
         if (!$form->getData()->getCreators() instanceof Collection) {
             throw new \Error('Creators is not a collection');

diff --git a/src/Security/Authentication/OauthAuthenticator.php b/src/Security/Authentication/OauthAuthenticator.php
@@ -40,25 +40,23 @@ public function authenticate(Request $request): SelfValidatingPassport
                 $user = $this->crud->readById(DataWizUser::class, $keycloakUser->getId());
                 $kcArray = $keycloakUser->toArray();
 
-                if (is_iterable($kcArray)) {
-                    if ($user === null) {
-                        $user = new DataWizUser();
-                        $user->setId(new Uuid($keycloakUser->getId()));
-                        $user->setRoles([UserRoles::USER]);
-                        $user->setDateRegistered(new \DateTime());
-                    }
-                    if (key_exists('email', $kcArray)) {
-                        $user->setEmail($kcArray['email']);
-                    }
-                    if (key_exists('given_name', $kcArray)) {
-                        $user->setFirstname($kcArray['given_name']);
-                    }
-                    if (key_exists('family_name', $kcArray)) {
-                        $user->setLastname($kcArray['family_name']);
-                    }
-                    $user->setLastLogin(new \DateTime());
-                    $this->crud->update($user);
+                if ($user === null) {
+                    $user = new DataWizUser();
+                    $user->setId(new Uuid($keycloakUser->getId()));
+                    $user->setRoles([UserRoles::USER]);
+                    $user->setDateRegistered(new \DateTime());
                 }
+                if (key_exists('email', $kcArray)) {
+                    $user->setEmail($kcArray['email']);
+                }
+                if (key_exists('given_name', $kcArray)) {
+                    $user->setFirstname($kcArray['given_name']);
+                }
+                if (key_exists('family_name', $kcArray)) {
+                    $user->setLastname($kcArray['family_name']);
+                }
+                $user->setLastLogin(new \DateTime());
+                $this->crud->update($user);
 
                 return $user;
             })